From 6afd80fb9c96850a93690f60c02fe9296bdaebf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E7=8E=A0?= <xujian.xj@alibaba-inc.com>
Date: Wed, 11 Sep 2019 10:02:12 +0800
Subject: [PATCH] fix merge error
---
example/ios/Runner.xcodeproj/project.pbxproj | 25 ++++++++++++++++---
example/ios/Runner/DemoRouter.m | 4 +--
.../container/FLBFlutterViewContainer.h | 2 +-
.../container/FLBFlutterViewContainer.m | 2 +-
4 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
index dadb897..06a3068 100644
--- a/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -180,6 +180,7 @@
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
3FC74F80EA9D039C70D1F681 /* [CP] Embed Pods Frameworks */,
+ D49B04E67D494964A3A713AC /* [CP] Copy Pods Resources */,
);
buildRules = (
);
@@ -201,7 +202,7 @@
TargetAttributes = {
97C146ED1CF9000F007C117D = {
CreatedOnToolsVersion = 7.3.1;
- DevelopmentTeam = HH6T699A6Z;
+ DevelopmentTeam = XZJYP6FM9P;
};
};
};
@@ -210,6 +211,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
+ English,
en,
Base,
);
@@ -301,7 +303,22 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+ shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
+ showEnvVarsInLog = 0;
+ };
+ D49B04E67D494964A3A713AC /* [CP] Copy Pods Resources */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "[CP] Copy Pods Resources";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -449,7 +466,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = HH6T699A6Z;
+ DEVELOPMENT_TEAM = XZJYP6FM9P;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -474,7 +491,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = HH6T699A6Z;
+ DEVELOPMENT_TEAM = XZJYP6FM9P;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
diff --git a/example/ios/Runner/DemoRouter.m b/example/ios/Runner/DemoRouter.m
index 2d4ef86..3b6730e 100755
--- a/example/ios/Runner/DemoRouter.m
+++ b/example/ios/Runner/DemoRouter.m
@@ -21,7 +21,7 @@
return instance;
}
-#pragma mark - Boost 2
+#pragma mark - Boost 1.5
- (void)open:(NSString *)name
urlParams:(NSDictionary *)params
exts:(NSDictionary *)exts
@@ -57,7 +57,7 @@
}
}
-#pragma mark - Boost 1
+#pragma mark - Boost 1.0 - deprecated~
- (void)openPage:(NSString *)name
params:(NSDictionary *)params
animated:(BOOL)animated
diff --git a/ios/Classes/container/FLBFlutterViewContainer.h b/ios/Classes/container/FLBFlutterViewContainer.h
index f568d7a..4af0bca 100755
--- a/ios/Classes/container/FLBFlutterViewContainer.h
+++ b/ios/Classes/container/FLBFlutterViewContainer.h
@@ -27,7 +27,7 @@
#import "FLBFlutterContainer.h"
NS_ASSUME_NONNULL_BEGIN
-@interface FLB2FlutterViewContainer : FlutterViewController<FLBFlutterContainer>
+@interface FLBFlutterViewContainer : FlutterViewController<FLBFlutterContainer>
@property (nonatomic,copy,readwrite) NSString *name;
- (void)surfaceUpdated:(BOOL)appeared;
- (void)setEnableForRunnersBatch:(BOOL)enable;
diff --git a/ios/Classes/container/FLBFlutterViewContainer.m b/ios/Classes/container/FLBFlutterViewContainer.m
index bf1c924..6078b9c 100755
--- a/ios/Classes/container/FLBFlutterViewContainer.m
+++ b/ios/Classes/container/FLBFlutterViewContainer.m
@@ -32,7 +32,7 @@
#define FLUTTER_VIEW FLUTTER_APP.flutterViewController.view
#define FLUTTER_VC FLUTTER_APP.flutterViewController
-@interface FLB2FlutterViewContainer ()
+@interface FLBFlutterViewContainer ()
@property (nonatomic,strong,readwrite) NSDictionary *params;
@property (nonatomic,assign) long long identifier;
@end
--
2.26.2