Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_34031325
engine
提交
628b174c
E
engine
项目概览
qq_34031325
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
628b174c
编写于
7月 01, 2019
作者:
M
Matt Carroll
提交者:
GitHub
7月 01, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes a plugin overwrite bug in the plugin shim system. (#9589)
上级
345d350a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
86 addition
and
1 deletion
+86
-1
shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java
...ter/embedding/engine/plugins/shim/ShimPluginRegistry.java
+86
-1
未找到文件。
shell/platform/android/io/flutter/embedding/engine/plugins/shim/ShimPluginRegistry.java
浏览文件 @
628b174c
...
...
@@ -8,10 +8,15 @@ import android.app.Activity;
import
android.support.annotation.NonNull
;
import
java.util.HashMap
;
import
java.util.HashSet
;
import
java.util.Map
;
import
java.util.Set
;
import
io.flutter.Log
;
import
io.flutter.embedding.engine.FlutterEngine
;
import
io.flutter.embedding.engine.plugins.FlutterPlugin
;
import
io.flutter.embedding.engine.plugins.activity.ActivityAware
;
import
io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
;
import
io.flutter.plugin.common.PluginRegistry
;
import
io.flutter.plugin.platform.PlatformViewsController
;
import
io.flutter.view.FlutterView
;
...
...
@@ -38,6 +43,7 @@ public class ShimPluginRegistry implements PluginRegistry {
private
final
FlutterEngine
flutterEngine
;
private
final
PlatformViewsController
platformViewsController
;
private
final
Map
<
String
,
Object
>
pluginMap
=
new
HashMap
<>();
private
final
ShimRegistrarAggregate
shimRegistrarAggregate
;
private
final
FlutterEngine
.
EngineLifecycleListener
engineLifecycleListener
=
new
FlutterEngine
.
EngineLifecycleListener
()
{
@Override
public
void
onPreEngineRestart
()
{
...
...
@@ -53,6 +59,8 @@ public class ShimPluginRegistry implements PluginRegistry {
this
.
flutterEngine
=
flutterEngine
;
this
.
flutterEngine
.
addEngineLifecycleListener
(
engineLifecycleListener
);
this
.
platformViewsController
=
platformViewsController
;
this
.
shimRegistrarAggregate
=
new
ShimRegistrarAggregate
();
this
.
flutterEngine
.
getPlugins
().
add
(
shimRegistrarAggregate
);
}
@Override
...
...
@@ -63,7 +71,7 @@ public class ShimPluginRegistry implements PluginRegistry {
}
pluginMap
.
put
(
pluginKey
,
null
);
ShimRegistrar
registrar
=
new
ShimRegistrar
(
pluginKey
,
pluginMap
);
flutterEngine
.
getPlugins
().
add
(
registrar
);
shimRegistrarAggregate
.
addPlugin
(
registrar
);
return
registrar
;
}
...
...
@@ -97,4 +105,81 @@ public class ShimPluginRegistry implements PluginRegistry {
public
PlatformViewsController
getPlatformViewsController
()
{
return
platformViewsController
;
}
/**
* Aggregates all {@link ShimRegistrar}s within one single {@link FlutterPlugin}.
* <p>
* The reason we need this aggregate is because the new embedding uniquely identifies
* plugins by their plugin class, but the plugin shim system represents every plugin
* with a {@link ShimRegistrar}. Therefore, every plugin we would register after the first
* plugin, would overwrite the previous plugin, because they're all {@link ShimRegistrar}
* instances.
* <p>
* {@code ShimRegistrarAggregate} multiplexes {@link FlutterPlugin} and {@link ActivityAware}
* calls so that we can register just one {@code ShimRegistrarAggregate} with a
* {@link FlutterEngine}, while forwarding the relevant plugin resources to any number
* of {@link ShimRegistrar}s within this {@code ShimRegistrarAggregate}.
*/
private
static
class
ShimRegistrarAggregate
implements
FlutterPlugin
,
ActivityAware
{
private
final
Set
<
ShimRegistrar
>
shimRegistrars
=
new
HashSet
<>();
private
FlutterPluginBinding
flutterPluginBinding
;
private
ActivityPluginBinding
activityPluginBinding
;
public
void
addPlugin
(
@NonNull
ShimRegistrar
shimRegistrar
)
{
shimRegistrars
.
add
(
shimRegistrar
);
if
(
flutterPluginBinding
!=
null
)
{
shimRegistrar
.
onAttachedToEngine
(
flutterPluginBinding
);
}
if
(
activityPluginBinding
!=
null
)
{
shimRegistrar
.
onAttachedToActivity
(
activityPluginBinding
);
}
}
@Override
public
void
onAttachedToEngine
(
@NonNull
FlutterPluginBinding
binding
)
{
flutterPluginBinding
=
binding
;
for
(
ShimRegistrar
shimRegistrar
:
shimRegistrars
)
{
shimRegistrar
.
onAttachedToEngine
(
binding
);
}
}
@Override
public
void
onDetachedFromEngine
(
@NonNull
FlutterPluginBinding
binding
)
{
for
(
ShimRegistrar
shimRegistrar
:
shimRegistrars
)
{
shimRegistrar
.
onDetachedFromEngine
(
binding
);
}
flutterPluginBinding
=
null
;
}
@Override
public
void
onAttachedToActivity
(
@NonNull
ActivityPluginBinding
binding
)
{
activityPluginBinding
=
binding
;
for
(
ShimRegistrar
shimRegistrar
:
shimRegistrars
)
{
shimRegistrar
.
onAttachedToActivity
(
binding
);
}
}
@Override
public
void
onDetachedFromActivityForConfigChanges
()
{
for
(
ShimRegistrar
shimRegistrar
:
shimRegistrars
)
{
shimRegistrar
.
onDetachedFromActivity
();
}
activityPluginBinding
=
null
;
}
@Override
public
void
onReattachedToActivityForConfigChanges
(
@NonNull
ActivityPluginBinding
binding
)
{
for
(
ShimRegistrar
shimRegistrar
:
shimRegistrars
)
{
shimRegistrar
.
onReattachedToActivityForConfigChanges
(
binding
);
}
}
@Override
public
void
onDetachedFromActivity
()
{
for
(
ShimRegistrar
shimRegistrar
:
shimRegistrars
)
{
shimRegistrar
.
onDetachedFromActivity
();
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录