Skip to content

F
flutter_boost_1.22.4
Commit 32d6b643 authored by 余玠's avatar 余玠
Browse files
Options

更多注释和接触warning

parent f5629d29
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 84 deletions
example/ios/Runner.xcodeproj/project.pbxproj
View file @ 32d6b643
......@@ -23,7 +23,7 @@
DF544AA62177253600931378 /* UIViewControllerDemo.m in Sources */ = {isa = PBXBuildFile; fileRef = DF544AA42177253600931378 /* UIViewControllerDemo.m */; };
DF544AA72177253600931378 /* UIViewControllerDemo.xib in Resources */ = {isa = PBXBuildFile; fileRef = DF544AA52177253600931378 /* UIViewControllerDemo.xib */; };
DF544AD4217838EF00931378 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DF544AD3217838EF00931378 /* libc++.tbd */; };
DFD80BFA217DF95400E3F036 /* DemoRouter.m in Sources */ = {isa = PBXBuildFile; fileRef = DFD80BF9217DF95400E3F036 /* DemoRouter.m */; };
DFD80BFA217DF95400E3F036 /* PlatformRouterImp.m in Sources */ = {isa = PBXBuildFile; fileRef = DFD80BF9217DF95400E3F036 /* PlatformRouterImp.m */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
......@@ -66,8 +66,8 @@
DF544AA52177253600931378 /* UIViewControllerDemo.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UIViewControllerDemo.xib; sourceTree = "<group>"; };
DF544ACF217836F600931378 /* libstdc++.6.0.9.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libstdc++.6.0.9.tbd"; path = "usr/lib/libstdc++.6.0.9.tbd"; sourceTree = SDKROOT; };
DF544AD3217838EF00931378 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
DFD80BF8217DF95400E3F036 /* DemoRouter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DemoRouter.h; sourceTree = "<group>"; };
DFD80BF9217DF95400E3F036 /* DemoRouter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DemoRouter.m; sourceTree = "<group>"; };
DFD80BF8217DF95400E3F036 /* PlatformRouterImp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformRouterImp.h; sourceTree = "<group>"; };
DFD80BF9217DF95400E3F036 /* PlatformRouterImp.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PlatformRouterImp.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -142,8 +142,8 @@
DF544AA32177253600931378 /* UIViewControllerDemo.h */,
DF544AA42177253600931378 /* UIViewControllerDemo.m */,
DF544AA52177253600931378 /* UIViewControllerDemo.xib */,
DFD80BF8217DF95400E3F036 /* DemoRouter.h */,
DFD80BF9217DF95400E3F036 /* DemoRouter.m */,
DFD80BF8217DF95400E3F036 /* PlatformRouterImp.h */,
DFD80BF9217DF95400E3F036 /* PlatformRouterImp.m */,
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */,
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */,
97C146FA1CF9000F007C117D /* Main.storyboard */,
......@@ -328,7 +328,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
DFD80BFA217DF95400E3F036 /* DemoRouter.m in Sources */,
DFD80BFA217DF95400E3F036 /* PlatformRouterImp.m in Sources */,
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */,
97C146F31CF9000F007C117D /* main.m in Sources */,
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
......@@ -472,6 +472,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
......@@ -497,6 +498,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
......
example/ios/Runner/AppDelegate.m
View file @ 32d6b643
......@@ -8,7 +8,7 @@
#import "AppDelegate.h"
#import "UIViewControllerDemo.h"
#import "DemoRouter.h"
#import "PlatformRouterImp.h"
#import <flutter_boost/FlutterBoost.h>
@interface AppDelegate ()
......@@ -19,7 +19,7 @@
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
DemoRouter *router = [DemoRouter new];
PlatformRouterImp *router = [PlatformRouterImp new];
[FlutterBoostPlugin.sharedInstance startFlutterWithPlatform:router
onStart:^(FlutterEngine *engine) {
......
example/ios/Runner/DemoRouter.h deleted 100755 → 0
View file @ f5629d29
//
// DemoRouter.h
// Runner
//
// Created by Jidong Chen on 2018/10/22.
// Copyright © 2018年 The Chromium Authors. All rights reserved.
//
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import <flutter_boost/FlutterBoost.h>
NS_ASSUME_NONNULL_BEGIN
@protocol FLBPlatform;
@interface DemoRouter : NSObject<FLBPlatform>
@property (nonatomic,strong) UINavigationController *navigationController;
@end
NS_ASSUME_NONNULL_END
example/ios/Runner/DemoRouter.m deleted 100755 → 0
View file @ f5629d29
//
// DemoRouter.m
// Runner
//
// Created by Jidong Chen on 2018/10/22.
// Copyright © 2018年 The Chromium Authors. All rights reserved.
//
#import "DemoRouter.h"
#import <flutter_boost/FlutterBoost.h>
@interface DemoRouter()
@end
@implementation DemoRouter
#pragma mark - Boost 1.5
- (void)open:(NSString *)name
urlParams:(NSDictionary *)params
exts:(NSDictionary *)exts
completion:(void (^)(BOOL))completion
{
BOOL animated = [exts[@"animated"] boolValue];
if([params[@"present"] boolValue]){
FLBFlutterViewContainer *vc = FLBFlutterViewContainer.new;
[vc setName:name params:params];
[self.navigationController presentViewController:vc animated:animated completion:^{
if(completion) completion(YES);
}];
}else{
FLBFlutterViewContainer *vc = FLBFlutterViewContainer.new;
[vc setName:name params:params];
[self.navigationController pushViewController:vc animated:animated];
if(completion) completion(YES);
}
}
- (void)close:(NSString *)uid
result:(NSDictionary *)result
exts:(NSDictionary *)exts
completion:(void (^)(BOOL))completion
{
BOOL animated = [exts[@"animated"] boolValue];
animated = YES;
FLBFlutterViewContainer *vc = (id)self.navigationController.presentedViewController;
if([vc isKindOfClass:FLBFlutterViewContainer.class] && [vc.uniqueIDString isEqual: uid]){
[vc dismissViewControllerAnimated:animated completion:^{}];
}else{
[self.navigationController popViewControllerAnimated:animated];
}
}
@end
example/ios/Runner/UIViewControllerDemo.m
View file @ 32d6b643
......@@ -8,7 +8,6 @@
#import "UIViewControllerDemo.h"
#import <Flutter/Flutter.h>
#import "DemoRouter.h"
#import <flutter_boost/FlutterBoostPlugin.h>
......
ios/Classes/Boost/FLBPlatform.h
View file @ 32d6b643
......@@ -27,16 +27,38 @@
#define kPageCallBackId @"__callback_id__"
NS_ASSUME_NONNULL_BEGIN
/**
* 定义协议：平台侧的页面打开和关闭，不建议直接使用该协议的实现来页面打开/关闭，建议使用FlutterBoostPlugin中的open和close方法来打开或关闭页面；
* FlutterBoostPlugin带有页面返回数据的能力
*/
@protocol FLBPlatform <NSObject>
@optional
- (NSString *)entryForDart;
@required
/**
* 基于Native平台实现页面打开，Dart层的页面打开能力依赖于这个函数实现；Native或者Dart侧不建议直接使用这个函数。应直接使用FlutterBoost封装的函数
*
* @param url 打开的页面资源定位符
* @param urlParams 传人页面的参数, 注意
* @param exts 额外参数
* @param completion 打开页面的即时回调，页面一旦打开即回调
*/
- (void)open:(NSString *)url
urlParams:(NSDictionary *)urlParams
exts:(NSDictionary *)exts
completion:(void (^)(BOOL finished))completion;
/**
* 基于Native平台实现页面打开，Dart层的页面关闭能力依赖于这个函数实现；Native或者Dart侧不建议直接使用这个函数。应直接使用FlutterBoost封装的函数
*
* @param uid 打开的页面唯一ID符
* @param result 页面要返回的结果（给上一个页面），会作为页面返回函数的回调参数
* @param exts 额外参数
* @param completion 关闭页面的即时回调，页面一旦关闭即回调
*/
- (void)close:(NSString *)uid
result:(NSDictionary *)result
exts:(NSDictionary *)exts
......
ios/Classes/Engine/FLBFlutterEngine.h
View file @ 32d6b643
......@@ -28,6 +28,6 @@
NS_ASSUME_NONNULL_BEGIN
@interface FLBFlutterEngine : NSObject<FLBFlutterProvider>
- (instancetype)initWithPlatform:(id<FLBPlatform>)platform;
- (instancetype)initWithPlatform:(id<FLBPlatform>_Nullable)platform;
@end
NS_ASSUME_NONNULL_END
ios/Classes/Engine/FLBFlutterEngine.m
View file @ 32d6b643
......@@ -35,7 +35,7 @@
@implementation FLBFlutterEngine
- (instancetype)initWithPlatform:(id<FLBPlatform>)platform
- (instancetype)initWithPlatform:(id<FLBPlatform> _Nullable)platform
{
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
......
ios/Classes/container/FLBFlutterViewContainer.m
View file @ 32d6b643
......@@ -37,6 +37,8 @@
@property (nonatomic,assign) long long identifier;
@end
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wincomplete-implementation"
@implementation FLBFlutterViewContainer
- (instancetype)init
......@@ -236,3 +238,4 @@ static NSUInteger kInstanceCounter = 0;
@end
#pragma clang diagnostic pop
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment