Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
c02dd8f9
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,发现更多精彩内容 >>
未验证
提交
c02dd8f9
编写于
11月 16, 2018
作者:
D
Dan Field
提交者:
GitHub
11月 16, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Don't load a splash screen by default (#6883)
上级
8a42213d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
33 addition
and
27 deletion
+33
-27
shell/platform/darwin/ios/framework/Headers/FlutterViewController.h
...form/darwin/ios/framework/Headers/FlutterViewController.h
+11
-7
shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
...form/darwin/ios/framework/Source/FlutterViewController.mm
+22
-20
未找到文件。
shell/platform/darwin/ios/framework/Headers/FlutterViewController.h
浏览文件 @
c02dd8f9
...
...
@@ -88,7 +88,7 @@ FLUTTER_EXPORT
*
* @param asset The name of the asset. The name can be hierarchical.
* @param package The name of the package from which the asset originates.
* @return
s:
The file name to be used for lookup in the main bundle.
* @return The file name to be used for lookup in the main bundle.
*/
-
(
NSString
*
)
lookupKeyForAsset
:(
NSString
*
)
asset
fromPackage
:(
NSString
*
)
package
;
...
...
@@ -129,15 +129,19 @@ FLUTTER_EXPORT
* a replacement until the first frame is rendered.
*
* The view used should be appropriate for multiple sizes; an autoresizing mask to
* have a flexible
* width and height will be applied automatically.
*
* If not specified, uses a view generated from `UILaunchStoryboardName` from the
* main bundle's
* `Info.plist` file.
* have a flexible width and height will be applied automatically.
*/
@property
(
strong
,
nonatomic
)
UIView
*
splashScreenView
;
/**
* Attempts to set the `splashScreenView` property from the `UILaunchStoryboardName` from the
* main bundle's `Info.plist` file. This method will not change the value of `splashScreenView`
* if it cannot find a default one from a storyboard or nib.
*
* @return `YES` if successful, `NO` otherwise.
*/
-
(
BOOL
)
loadDefaultSplashScreenView
;
/**
* Controls whether the created view will be opaque or not.
*
...
...
shell/platform/darwin/ios/framework/Source/FlutterViewController.mm
浏览文件 @
c02dd8f9
...
...
@@ -239,7 +239,7 @@
-
(
void
)
installSplashScreenViewIfNecessary
{
// Show the launch screen view again on top of the FlutterView if available.
// This launch screen view will be removed once the first Flutter frame is rendered.
if
(
self
.
isBeingPresented
||
self
.
isMovingToParentViewController
)
{
if
(
_splashScreenView
&&
(
self
.
isBeingPresented
||
self
.
isMovingToParentViewController
)
)
{
[
_splashScreenView
.
get
()
removeFromSuperview
];
_splashScreenView
.
reset
();
return
;
...
...
@@ -305,21 +305,29 @@
}
-
(
UIView
*
)
splashScreenView
{
if
(
_splashScreenView
==
nullptr
)
{
NSString
*
launchscreenName
=
[[[
NSBundle
mainBundle
]
infoDictionary
]
objectForKey
:
@"UILaunchStoryboardName"
];
if
(
launchscreenName
==
nil
)
{
return
nil
;
}
UIView
*
splashView
=
[
self
splashScreenFromStoryboard
:
launchscreenName
];
if
(
!
splashView
)
{
splashView
=
[
self
splashScreenFromXib
:
launchscreenName
];
}
self
.
splashScreenView
=
splashView
;
if
(
!
_splashScreenView
)
{
return
nil
;
}
return
_splashScreenView
.
get
();
}
-
(
BOOL
)
loadDefaultSplashScreenView
{
NSString
*
launchscreenName
=
[[[
NSBundle
mainBundle
]
infoDictionary
]
objectForKey
:
@"UILaunchStoryboardName"
];
if
(
launchscreenName
==
nil
)
{
return
NO
;
}
UIView
*
splashView
=
[
self
splashScreenFromStoryboard
:
launchscreenName
];
if
(
!
splashView
)
{
splashView
=
[
self
splashScreenFromXib
:
launchscreenName
];
}
if
(
!
splashView
)
{
return
NO
;
}
self
.
splashScreenView
=
splashView
;
return
YES
;
}
-
(
UIView
*
)
splashScreenFromStoryboard
:(
NSString
*
)
name
{
UIStoryboard
*
storyboard
=
nil
;
@try
{
...
...
@@ -347,16 +355,10 @@
if
(
!
view
)
{
// Special case: user wants to remove the splash screen view.
[
self
removeSplashScreenViewIfPresent
];
}
else
if
(
_splashScreenView
)
{
FML_LOG
(
ERROR
)
<<
"Attempt to set the FlutterViewController's splash screen multiple times was "
"ignored. The FlutterViewController's splash screen can only be set once. "
"This condition can occur if a running FlutterEngine instance has been "
"passed into the FlutterViewController and a consumer later called "
"[FlutterViewController setSplashScreen:]. Setting the splash screen on a "
"FlutterViewController with an already running engine is not supported, as "
"the rasterizer will already be running by the time the view is shown."
;
_splashScreenView
.
reset
();
return
;
}
_splashScreenView
.
reset
([
view
retain
]);
_splashScreenView
.
get
().
autoresizingMask
=
UIViewAutoresizingFlexibleWidth
|
UIViewAutoresizingFlexibleHeight
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录