Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
flutter_boost_1.22.4
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
谢冠章
flutter_boost_1.22.4
Commits
18d347fe
Commit
18d347fe
authored
Mar 31, 2020
by
ColdPaleLight
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix #625 on v1.12.13-hotfixes
parent
9961047f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
11 deletions
+28
-11
ios/Classes/Engine/FLBFlutterApplication.m
ios/Classes/Engine/FLBFlutterApplication.m
+3
-1
ios/Classes/container/FLBFlutterViewContainer.m
ios/Classes/container/FLBFlutterViewContainer.m
+25
-10
No files found.
ios/Classes/Engine/FLBFlutterApplication.m
View file @
18d347fe
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
#import "FlutterBoost.h"
#import "FlutterBoost.h"
#import "FLBFlutterContainerManager.h"
#import "FLBFlutterContainerManager.h"
#import "FLBFlutterEngine.h"
#import "FLBFlutterEngine.h"
#import "FLBFlutterViewContainer.h"
@interface
FLBFlutterApplication
()
@interface
FLBFlutterApplication
()
@property
(
nonatomic
,
strong
)
FLBFlutterContainerManager
*
manager
;
@property
(
nonatomic
,
strong
)
FLBFlutterContainerManager
*
manager
;
...
@@ -231,7 +232,8 @@
...
@@ -231,7 +232,8 @@
NSString
*
oldName
=
params
[
@"oldName"
];
NSString
*
oldName
=
params
[
@"oldName"
];
NSString
*
newName
=
params
[
@"newName"
];
NSString
*
newName
=
params
[
@"newName"
];
if
(
oldName
!=
nil
&&
[
newName
isEqualToString
:
@"default"
])
{
if
(
oldName
!=
nil
&&
[
newName
isEqualToString
:
@"default"
])
{
[
self
.
flutterProvider
detach
];
FLBFlutterViewContainer
*
viewController
=
(
FLBFlutterViewContainer
*
)
self
.
flutterProvider
.
engine
.
viewController
;
[
viewController
surfaceUpdated
:
NO
];
}
}
}
}
...
...
ios/Classes/container/FLBFlutterViewContainer.m
View file @
18d347fe
...
@@ -118,10 +118,6 @@
...
@@ -118,10 +118,6 @@
if
(
!
_name
&&
name
){
if
(
!
_name
&&
name
){
_name
=
name
;
_name
=
name
;
_params
=
params
;
_params
=
params
;
[
BoostMessageChannel
didInitPageContainer
:
^
(
NSNumber
*
r
)
{}
pageName:
name
params:
params
uniqueId:
[
self
uniqueIDString
]];
}
}
}
}
...
@@ -160,9 +156,28 @@ static NSUInteger kInstanceCounter = 0;
...
@@ -160,9 +156,28 @@ static NSUInteger kInstanceCounter = 0;
[
self
.
class
instanceCounterIncrease
];
[
self
.
class
instanceCounterIncrease
];
}
}
-
(
void
)
willMoveToParentViewController
:(
UIViewController
*
)
parent
{
if
(
parent
)
{
[
BoostMessageChannel
didInitPageContainer
:
^
(
NSNumber
*
r
)
{}
pageName:
_name
params:
_params
uniqueId:
[
self
uniqueIDString
]];
}
}
-
(
void
)
didMoveToParentViewController
:(
UIViewController
*
)
parent
{
if
(
!
parent
)
{
[
self
notifyWillDealloc
];
}
}
-
(
void
)
dismissViewControllerAnimated
:(
BOOL
)
flag
completion
:(
void
(
^
)(
void
))
completion
{
[
self
notifyWillDealloc
];
[
super
dismissViewControllerAnimated
:
flag
completion
:
completion
];
}
-
(
void
)
dealloc
-
(
void
)
dealloc
{
{
[
self
notifyWillDealloc
];
[
NSNotificationCenter
.
defaultCenter
removeObserver
:
self
];
[
NSNotificationCenter
.
defaultCenter
removeObserver
:
self
];
}
}
...
@@ -262,11 +277,11 @@ static NSUInteger kInstanceCounter = 0;
...
@@ -262,11 +277,11 @@ static NSUInteger kInstanceCounter = 0;
pageName:
_name
pageName:
_name
params:
_params
params:
_params
uniqueId:
self
.
uniqueIDString
];
uniqueId:
self
.
uniqueIDString
];
//
如果当前不可见vc和engine所持有的vc一致。在FlutterVC在混合栈中是最后一张页面,如tab中的页面
//
如果当前不可见vc和engine所持有的vc一致。在FlutterVC在混合栈中是最后一张页面,如tab中的页面
//
if (self == FLUTTER_VC)
//
if (self == FLUTTER_VC)
//
{
//
{
//
[self surfaceUpdated:NO];
//
[self surfaceUpdated:NO];
//
}
//
}
[
super
bridge_viewDidDisappear
:
animated
];
[
super
bridge_viewDidDisappear
:
animated
];
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment