Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_43355755
engine
提交
74373462
E
engine
项目概览
weixin_43355755
/
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,发现更多精彩内容 >>
未验证
提交
74373462
编写于
8月 10, 2018
作者:
S
Stanislav Baranov
提交者:
GitHub
8月 10, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix codepush breakage caused by #5954. (#5996)
上级
a389dc59
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
21 addition
and
24 deletion
+21
-24
shell/platform/android/io/flutter/view/FlutterNativeView.java
...l/platform/android/io/flutter/view/FlutterNativeView.java
+8
-10
shell/platform/android/io/flutter/view/FlutterRunArguments.java
...platform/android/io/flutter/view/FlutterRunArguments.java
+1
-1
shell/platform/android/io/flutter/view/FlutterView.java
shell/platform/android/io/flutter/view/FlutterView.java
+10
-11
shell/platform/android/platform_view_android_jni.cc
shell/platform/android/platform_view_android_jni.cc
+2
-2
未找到文件。
shell/platform/android/io/flutter/view/FlutterNativeView.java
浏览文件 @
74373462
...
...
@@ -81,30 +81,28 @@ public class FlutterNativeView implements BinaryMessenger {
}
else
if
(
args
.
entrypoint
==
null
)
{
throw
new
AssertionError
(
"An entrypoint must be specified"
);
}
runFromBundleInternal
(
args
.
bundlePath
,
args
.
entrypoint
,
args
.
libraryPath
,
null
);
runFromBundleInternal
(
args
.
bundlePath
,
args
.
entrypoint
,
args
.
libraryPath
,
args
.
defaultPath
);
}
/**
* @deprecated
* Please use runFromBundle with `FlutterRunArguments`.
Parameters
*
`snapshotOverride` and `reuseRuntimeController` have
no effect.
* Please use runFromBundle with `FlutterRunArguments`.
*
Parameter `reuseRuntimeController` has
no effect.
*/
@Deprecated
public
void
runFromBundle
(
String
bundlePath
,
String
snapshotOverride
,
String
entrypoint
,
public
void
runFromBundle
(
String
bundlePath
,
String
defaultPath
,
String
entrypoint
,
boolean
reuseRuntimeController
)
{
runFromBundleInternal
(
bundlePath
,
entrypoint
,
null
,
null
);
runFromBundleInternal
(
bundlePath
,
entrypoint
,
null
,
defaultPath
);
}
private
void
runFromBundleInternal
(
String
bundlePath
,
String
entrypoint
,
String
libraryPath
,
String
snapshotOverride
)
{
String
libraryPath
,
String
defaultPath
)
{
assertAttached
();
if
(
applicationIsRunning
)
throw
new
AssertionError
(
"This Flutter engine instance is already running an application"
);
nativeRunBundleAndSnapshotFromLibrary
(
mNativePlatformView
,
bundlePath
,
snapshotOverride
,
entrypoint
,
libraryPath
,
mContext
.
getResources
().
getAssets
());
defaultPath
,
entrypoint
,
libraryPath
,
mContext
.
getResources
().
getAssets
());
applicationIsRunning
=
true
;
}
...
...
@@ -238,7 +236,7 @@ public class FlutterNativeView implements BinaryMessenger {
private
static
native
void
nativeRunBundleAndSnapshotFromLibrary
(
long
nativePlatformViewAndroid
,
String
bundlePath
,
String
snapshotOverride
,
String
entrypoint
,
String
libraryUrl
,
String
defaultPath
,
String
entrypoint
,
String
libraryUrl
,
AssetManager
manager
);
private
static
native
String
nativeGetObservatoryUri
();
...
...
shell/platform/android/io/flutter/view/FlutterRunArguments.java
浏览文件 @
74373462
...
...
@@ -12,5 +12,5 @@ public class FlutterRunArguments {
public
String
bundlePath
;
public
String
entrypoint
;
public
String
libraryPath
;
public
String
snapshotOverride
;
public
String
defaultPath
;
}
shell/platform/android/io/flutter/view/FlutterView.java
浏览文件 @
74373462
...
...
@@ -611,34 +611,33 @@ public class FlutterView extends SurfaceView
/**
* @deprecated
* Please use runFromBundle with `FlutterRunArguments`. Parameter
* `snapshotOverride` has no effect.
* Please use runFromBundle with `FlutterRunArguments`.
*/
@Deprecated
public
void
runFromBundle
(
String
bundlePath
,
String
snapshotOverride
)
{
runFromBundle
(
bundlePath
,
snapshotOverride
,
"main"
,
false
);
public
void
runFromBundle
(
String
bundlePath
,
String
defaultPath
)
{
runFromBundle
(
bundlePath
,
defaultPath
,
"main"
,
false
);
}
/**
* @deprecated
* Please use runFromBundle with `FlutterRunArguments`. Parameter
* `snapshotOverride` has no effect.
* Please use runFromBundle with `FlutterRunArguments`.
*/
@Deprecated
public
void
runFromBundle
(
String
bundlePath
,
String
snapshotOverride
,
String
entrypoint
)
{
runFromBundle
(
bundlePath
,
snapshotOverride
,
entrypoint
,
false
);
public
void
runFromBundle
(
String
bundlePath
,
String
defaultPath
,
String
entrypoint
)
{
runFromBundle
(
bundlePath
,
defaultPath
,
entrypoint
,
false
);
}
/**
* @deprecated
* Please use runFromBundle with `FlutterRunArguments`.
Parameters
*
`snapshotOverride` and `reuseRuntimeController` have
no effect.
* Please use runFromBundle with `FlutterRunArguments`.
*
Parameter `reuseRuntimeController` has
no effect.
*/
@Deprecated
public
void
runFromBundle
(
String
bundlePath
,
String
snapshotOverride
,
String
entrypoint
,
boolean
reuseRuntimeController
)
{
public
void
runFromBundle
(
String
bundlePath
,
String
defaultPath
,
String
entrypoint
,
boolean
reuseRuntimeController
)
{
FlutterRunArguments
args
=
new
FlutterRunArguments
();
args
.
bundlePath
=
bundlePath
;
args
.
entrypoint
=
entrypoint
;
args
.
defaultPath
=
defaultPath
;
runFromBundle
(
args
);
}
...
...
shell/platform/android/platform_view_android_jni.cc
浏览文件 @
74373462
...
...
@@ -241,7 +241,7 @@ static void RunBundleAndSnapshotFromLibrary(JNIEnv* env,
jobject
jcaller
,
jlong
shell_holder
,
jstring
jbundlepath
,
jstring
j
snapshotOverride
,
jstring
j
defaultPath
,
jstring
jEntrypoint
,
jstring
jLibraryUrl
,
jobject
jAssetManager
)
{
...
...
@@ -275,7 +275,7 @@ static void RunBundleAndSnapshotFromLibrary(JNIEnv* env,
}
}
const
auto
defaultpath
=
fml
::
jni
::
JavaStringToString
(
env
,
j
snapshotOverride
);
const
auto
defaultpath
=
fml
::
jni
::
JavaStringToString
(
env
,
j
defaultPath
);
if
(
defaultpath
.
size
()
>
0
)
{
asset_manager
->
PushBack
(
std
::
make_unique
<
blink
::
DirectoryAssetBundle
>
(
fml
::
OpenFile
(
defaultpath
.
c_str
(),
fml
::
OpenPermission
::
kRead
,
true
)));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录