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
1
Merge Requests
1
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
f6c10426
Commit
f6c10426
authored
Jul 10, 2019
by
ColdPaleLight
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix iOS Example project compilation problem
parent
524b6601
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
22 deletions
+21
-22
example/ios/Runner/AppDelegate.h
example/ios/Runner/AppDelegate.h
+2
-2
example/ios/Runner/AppDelegate.m
example/ios/Runner/AppDelegate.m
+3
-3
example/ios/Runner/DemoRouter.h
example/ios/Runner/DemoRouter.h
+1
-1
example/ios/Runner/DemoRouter.m
example/ios/Runner/DemoRouter.m
+6
-6
example/ios/Runner/UIViewControllerDemo.m
example/ios/Runner/UIViewControllerDemo.m
+9
-10
No files found.
example/ios/Runner/AppDelegate.h
View file @
f6c10426
...
...
@@ -7,9 +7,9 @@
//
#import <UIKit/UIKit.h>
#import <flutter_boost
/FlutterBoost
.h>
#import <flutter_boost
2/FlutterBoost2
.h>
@interface
AppDelegate
:
FLBFlutterAppDelegate
<
UIApplicationDelegate
>
@interface
AppDelegate
:
FLB
2
FlutterAppDelegate
<
UIApplicationDelegate
>
@property
(
strong
,
nonatomic
)
UIWindow
*
window
;
...
...
example/ios/Runner/AppDelegate.m
View file @
f6c10426
...
...
@@ -9,7 +9,7 @@
#import "AppDelegate.h"
#import "UIViewControllerDemo.h"
#import "DemoRouter.h"
#import <flutter_boost
/FlutterBoost
.h>
#import <flutter_boost
2/FlutterBoost2
.h>
@interface
AppDelegate
()
...
...
@@ -20,7 +20,7 @@
-
(
BOOL
)
application
:(
UIApplication
*
)
application
didFinishLaunchingWithOptions
:(
NSDictionary
*
)
launchOptions
{
DemoRouter
*
router
=
[
DemoRouter
sharedRouter
];
[
FlutterBoostPlugin
.
sharedInstance
startFlutterWithPlatform
:
router
[
FlutterBoostPlugin
2
.
sharedInstance
startFlutterWithPlatform
:
router
onStart:
^
(
FlutterEngine
*
fvc
)
{
}];
...
...
@@ -35,7 +35,7 @@
vc
.
tabBarItem
=
[[
UITabBarItem
alloc
]
initWithTitle
:
@"hybrid"
image
:
nil
tag
:
0
];
FLB
FlutterViewContainer
*
fvc
=
FLB
FlutterViewContainer
.
new
;
FLB
2FlutterViewContainer
*
fvc
=
FLB2
FlutterViewContainer
.
new
;
[
fvc
setName
:
@"tab"
params
:@{}];
fvc
.
tabBarItem
=
[[
UITabBarItem
alloc
]
initWithTitle
:
@"flutter_tab"
image
:
nil
tag
:
1
];
...
...
example/ios/Runner/DemoRouter.h
View file @
f6c10426
...
...
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import <flutter_boost
/FlutterBoost
.h>
#import <flutter_boost
2/FlutterBoost2
.h>
NS_ASSUME_NONNULL_BEGIN
...
...
example/ios/Runner/DemoRouter.m
View file @
f6c10426
...
...
@@ -7,7 +7,7 @@
//
#import "DemoRouter.h"
#import <flutter_boost
/FlutterBoost
.h>
#import <flutter_boost
2/FlutterBoost2
.h>
@implementation
DemoRouter
...
...
@@ -56,7 +56,7 @@
{
BOOL
animated
=
[
exts
[
@"animated"
]
boolValue
];
animated
=
YES
;
FLBFlutterViewContainer
*
vc
=
(
id
)
self
.
navigationController
.
presentedViewController
;
FLB
2
FlutterViewContainer
*
vc
=
(
id
)
self
.
navigationController
.
presentedViewController
;
if
([
vc
isKindOfClass
:
FLB2FlutterViewContainer
.
class
]
&&
[
vc
.
uniqueIDString
isEqual
:
uid
]){
[
vc
dismissViewControllerAnimated
:
animated
completion
:
^
{}];
}
else
{
...
...
@@ -80,13 +80,13 @@
}
if
([
params
[
@"present"
]
boolValue
]){
FLB
FlutterViewContainer
*
vc
=
FLB
FlutterViewContainer
.
new
;
FLB
2FlutterViewContainer
*
vc
=
FLB2
FlutterViewContainer
.
new
;
[
vc
setName
:
name
params
:
params
];
[
self
.
navigationController
presentViewController
:
vc
animated
:
animated
completion
:^
{
if
(
completion
)
completion
(
YES
);
}];
}
else
{
FLB
FlutterViewContainer
*
vc
=
FLB
FlutterViewContainer
.
new
;
FLB
2FlutterViewContainer
*
vc
=
FLB2
FlutterViewContainer
.
new
;
[
vc
setName
:
name
params
:
params
];
[
self
.
navigationController
pushViewController
:
vc
animated
:
animated
];
if
(
completion
)
completion
(
YES
);
...
...
@@ -103,8 +103,8 @@
return
;
}
FLBFlutterViewContainer
*
vc
=
(
id
)
self
.
navigationController
.
presentedViewController
;
if
([
vc
isKindOfClass
:
FLBFlutterViewContainer
.
class
]
&&
[
vc
.
uniqueIDString
isEqual
:
uid
]){
FLB
2
FlutterViewContainer
*
vc
=
(
id
)
self
.
navigationController
.
presentedViewController
;
if
([
vc
isKindOfClass
:
FLB
2
FlutterViewContainer
.
class
]
&&
[
vc
.
uniqueIDString
isEqual
:
uid
]){
[
vc
dismissViewControllerAnimated
:
animated
completion
:
^
{}];
}
else
{
[
self
.
navigationController
popViewControllerAnimated
:
animated
];
...
...
example/ios/Runner/UIViewControllerDemo.m
View file @
f6c10426
...
...
@@ -9,7 +9,7 @@
#import "UIViewControllerDemo.h"
#import <Flutter/Flutter.h>
#import "DemoRouter.h"
#import <flutter_boost
/FlutterBoostPlugin
.h>
#import <flutter_boost
2/FlutterBoostPlugin2
.h>
@interface
UIViewControllerDemo
()
...
...
@@ -23,20 +23,19 @@
// Do any additional setup after loading the view from its nib.
}
-
(
IBAction
)
pushFlutterPage
:(
id
)
sender
{
[
DemoRouter
.
sharedRouter
open
Page
:
@"first"
p
arams:
@{}
animated:
YES
[
DemoRouter
.
sharedRouter
open
:
@"first"
urlP
arams:
@{}
exts:
@{
@"animated"
:
@
(
YES
)}
completion:
^
(
BOOL
f
){
}];
}
-
(
IBAction
)
present
:(
id
)
sender
{
[
DemoRouter
.
sharedRouter
open
Page
:
@"second"
p
arams:
@{
@"present"
:
@
(
YES
)}
animated:
YES
[
DemoRouter
.
sharedRouter
open
:
@"second"
urlP
arams:
@{
@"present"
:
@
(
YES
)}
exts:
@{
@"animated"
:
@
(
YES
)}
completion:
^
(
BOOL
f
){}];
// [self dismissViewControllerAnimated:YES completion:completion];
}
...
...
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