Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
4c6948a8
E
engine
项目概览
sxychenjing
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
未验证
提交
4c6948a8
编写于
7月 30, 2019
作者:
M
Matt Carroll
提交者:
GitHub
7月 30, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Android Embedding Refactor 38: Removed AssetManager from DartEntrypoint. (#10250)
上级
b18105f5
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
20 addition
and
13 deletion
+20
-13
shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java
...embedding/android/FlutterActivityAndFragmentDelegate.java
+0
-1
shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java
...rm/android/io/flutter/embedding/engine/FlutterEngine.java
+1
-1
shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java
...ndroid/io/flutter/embedding/engine/dart/DartExecutor.java
+12
-9
shell/platform/android/io/flutter/view/FlutterMain.java
shell/platform/android/io/flutter/view/FlutterMain.java
+6
-0
shell/platform/android/io/flutter/view/FlutterNativeView.java
...l/platform/android/io/flutter/view/FlutterNativeView.java
+1
-1
shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java
...dding/android/FlutterActivityAndFragmentDelegateTest.java
+0
-1
未找到文件。
shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java
浏览文件 @
4c6948a8
...
...
@@ -293,7 +293,6 @@ import static android.content.ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW;
// Configure the Dart entrypoint and execute it.
DartExecutor
.
DartEntrypoint
entrypoint
=
new
DartExecutor
.
DartEntrypoint
(
host
.
getContext
().
getResources
().
getAssets
(),
host
.
getAppBundlePath
(),
host
.
getDartEntrypointFunctionName
()
);
...
...
shell/platform/android/io/flutter/embedding/engine/FlutterEngine.java
浏览文件 @
4c6948a8
...
...
@@ -128,7 +128,7 @@ public class FlutterEngine implements LifecycleOwner {
flutterJNI
.
addEngineLifecycleListener
(
engineLifecycleListener
);
attachToJni
();
this
.
dartExecutor
=
new
DartExecutor
(
flutterJNI
);
this
.
dartExecutor
=
new
DartExecutor
(
flutterJNI
,
context
.
getAssets
()
);
this
.
dartExecutor
.
onAttachedToJNI
();
// TODO(mattcarroll): FlutterRenderer is temporally coupled to attach(). Remove that coupling if possible.
...
...
shell/platform/android/io/flutter/embedding/engine/dart/DartExecutor.java
浏览文件 @
4c6948a8
...
...
@@ -10,13 +10,13 @@ import android.support.annotation.Nullable;
import
android.support.annotation.UiThread
;
import
java.nio.ByteBuffer
;
import
java.util.Objects
;
import
io.flutter.Log
;
import
io.flutter.embedding.engine.FlutterJNI
;
import
io.flutter.plugin.common.BinaryMessenger
;
import
io.flutter.plugin.common.StringCodec
;
import
io.flutter.view.FlutterCallbackInformation
;
import
io.flutter.view.FlutterMain
;
/**
* Configures, bootstraps, and starts executing Dart code.
...
...
@@ -44,6 +44,8 @@ public class DartExecutor implements BinaryMessenger {
@NonNull
private
final
FlutterJNI
flutterJNI
;
@NonNull
private
final
AssetManager
assetManager
;
@NonNull
private
final
DartMessenger
messenger
;
private
boolean
isApplicationRunning
=
false
;
@Nullable
...
...
@@ -62,8 +64,9 @@ public class DartExecutor implements BinaryMessenger {
}
};
public
DartExecutor
(
@NonNull
FlutterJNI
flutterJNI
)
{
public
DartExecutor
(
@NonNull
FlutterJNI
flutterJNI
,
@NonNull
AssetManager
assetManager
)
{
this
.
flutterJNI
=
flutterJNI
;
this
.
assetManager
=
assetManager
;
this
.
messenger
=
new
DartMessenger
(
flutterJNI
);
messenger
.
setMessageHandler
(
"flutter/isolate"
,
isolateChannelMessageHandler
);
}
...
...
@@ -124,7 +127,7 @@ public class DartExecutor implements BinaryMessenger {
dartEntrypoint
.
pathToBundle
,
dartEntrypoint
.
dartEntrypointFunctionName
,
null
,
dartEntrypoint
.
androidA
ssetManager
a
ssetManager
);
isApplicationRunning
=
true
;
...
...
@@ -251,11 +254,13 @@ public class DartExecutor implements BinaryMessenger {
* to find that entrypoint and other assets required for Dart execution.
*/
public
static
class
DartEntrypoint
{
/**
* Standard Android AssetManager, provided from some {@code Context} or {@code Resources}.
*/
@NonNull
public
final
AssetManager
androidAssetManager
;
public
static
DartEntrypoint
createDefault
()
{
return
new
DartEntrypoint
(
FlutterMain
.
findAppBundlePath
(),
"main"
);
}
/**
* The path within the AssetManager where the app will look for assets.
...
...
@@ -270,11 +275,9 @@ public class DartExecutor implements BinaryMessenger {
public
final
String
dartEntrypointFunctionName
;
public
DartEntrypoint
(
@NonNull
AssetManager
androidAssetManager
,
@NonNull
String
pathToBundle
,
@NonNull
String
dartEntrypointFunctionName
)
{
this
.
androidAssetManager
=
androidAssetManager
;
this
.
pathToBundle
=
pathToBundle
;
this
.
dartEntrypointFunctionName
=
dartEntrypointFunctionName
;
}
...
...
shell/platform/android/io/flutter/view/FlutterMain.java
浏览文件 @
4c6948a8
...
...
@@ -315,6 +315,12 @@ public class FlutterMain {
}
}
@NonNull
public
static
String
findAppBundlePath
()
{
return
sFlutterAssetsDir
;
}
@Deprecated
@Nullable
public
static
String
findAppBundlePath
(
@NonNull
Context
applicationContext
)
{
return
sFlutterAssetsDir
;
...
...
shell/platform/android/io/flutter/view/FlutterNativeView.java
浏览文件 @
4c6948a8
...
...
@@ -43,7 +43,7 @@ public class FlutterNativeView implements BinaryMessenger {
mPluginRegistry
=
new
FlutterPluginRegistry
(
this
,
context
);
mFlutterJNI
=
new
FlutterJNI
();
mFlutterJNI
.
setRenderSurface
(
new
RenderSurfaceImpl
());
this
.
dartExecutor
=
new
DartExecutor
(
mFlutterJNI
);
this
.
dartExecutor
=
new
DartExecutor
(
mFlutterJNI
,
context
.
getAssets
()
);
mFlutterJNI
.
addEngineLifecycleListener
(
new
EngineLifecycleListenerImpl
());
attach
(
this
,
isBackgroundView
);
assertAttached
();
...
...
shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java
浏览文件 @
4c6948a8
...
...
@@ -172,7 +172,6 @@ public class FlutterActivityAndFragmentDelegateTest {
// Create the DartEntrypoint that we expect to be executed.
DartExecutor
.
DartEntrypoint
dartEntrypoint
=
new
DartExecutor
.
DartEntrypoint
(
RuntimeEnvironment
.
application
.
getAssets
(),
"/my/bundle/path"
,
"myEntrypoint"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录