Skip to content

G
GMFlutterSDK
Commit 9dc8aed7 authored by 朱璇's avatar 朱璇
Browse files
Options

Merge branch 'master' of git.wanmeizhensuo.com:gengmeiios/GMFlutterSDK into zx/flutterSdk

parents 3886049e bea82462
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 9 deletions
Example/Podfile.lock
View file @ 9dc8aed7
...@@ -141,7 +141,7 @@ SPEC CHECKSUMS: ...@@ -141,7 +141,7 @@ SPEC CHECKSUMS:
Alamofire: 907e0a98eb68cdb7f9d1f541a563d6ac5dc77b25 Alamofire: 907e0a98eb68cdb7f9d1f541a563d6ac5dc77b25
GMBase: 8233aa9d51177f1c25d3b5bec479789cc304f6cb GMBase: 8233aa9d51177f1c25d3b5bec479789cc304f6cb
GMCache: b78d8e46db864405e91d226ce640cc80d966c611 GMCache: b78d8e46db864405e91d226ce640cc80d966c611
GMFlutterSDK: 0a062ebe24c3318b7de8682ceeed8173684593b3 GMFlutterSDK: 7fdedb842c536754d30fedffe87f14da91c1e02e
GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682 GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682
GMHud: feca48b3eda4f3a6f617f4bbaa3657316a245c1f GMHud: feca48b3eda4f3a6f617f4bbaa3657316a245c1f
GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be
......
Example/Pods/Local Podspecs/GMFlutterSDK.podspec.json
View file @ 9dc8aed7
...@@ -27,8 +27,5 @@ ...@@ -27,8 +27,5 @@
] ]
}, },
"source_files": "GMFlutterSDK/Classes/**/*", "source_files": "GMFlutterSDK/Classes/**/*"
"pod_target_xcconfig": {
"VALID_ARCHS": "arm64 armv7 x86_64 i386"
}
} }
Example/Pods/Manifest.lock
View file @ 9dc8aed7
...@@ -141,7 +141,7 @@ SPEC CHECKSUMS: ...@@ -141,7 +141,7 @@ SPEC CHECKSUMS:
Alamofire: 907e0a98eb68cdb7f9d1f541a563d6ac5dc77b25 Alamofire: 907e0a98eb68cdb7f9d1f541a563d6ac5dc77b25
GMBase: 8233aa9d51177f1c25d3b5bec479789cc304f6cb GMBase: 8233aa9d51177f1c25d3b5bec479789cc304f6cb
GMCache: b78d8e46db864405e91d226ce640cc80d966c611 GMCache: b78d8e46db864405e91d226ce640cc80d966c611
GMFlutterSDK: 0a062ebe24c3318b7de8682ceeed8173684593b3 GMFlutterSDK: 7fdedb842c536754d30fedffe87f14da91c1e02e
GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682 GMFoundation: e9f7fd9c6e5f133e09009b0ee5de4fce60ac5682
GMHud: feca48b3eda4f3a6f617f4bbaa3657316a245c1f GMHud: feca48b3eda4f3a6f617f4bbaa3657316a245c1f
GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be GMJSONModel: 5e81a98de668e9f93cf6ff77869f77b0d1a806be
......
Example/Pods/Pods.xcodeproj/project.pbxproj
View file @ 9dc8aed7
This source diff could not be displayed because it is too large. You can view the blob instead.
Example/Pods/Target Support Files/GMFlutterSDK/GMFlutterSDK.debug.xcconfig
View file @ 9dc8aed7
...@@ -9,4 +9,3 @@ PODS_TARGET_SRCROOT = ${PODS_ROOT}/../.. ...@@ -9,4 +9,3 @@ PODS_TARGET_SRCROOT = ${PODS_ROOT}/../..
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES SKIP_INSTALL = YES
USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES
VALID_ARCHS = arm64 armv7 x86_64 i386
Example/Pods/Target Support Files/GMFlutterSDK/GMFlutterSDK.release.xcconfig
View file @ 9dc8aed7
...@@ -9,4 +9,3 @@ PODS_TARGET_SRCROOT = ${PODS_ROOT}/../.. ...@@ -9,4 +9,3 @@ PODS_TARGET_SRCROOT = ${PODS_ROOT}/../..
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES SKIP_INSTALL = YES
USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES USE_RECURSIVE_SCRIPT_INPUTS_IN_SCRIPT_PHASES = YES
VALID_ARCHS = arm64 armv7 x86_64 i386
GMFlutterSDK/Classes/GMFlutterBaseContainerViewController.m
View file @ 9dc8aed7
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
self.fd_interactivePopDisabled = YES; // self.fd_interactivePopDisabled = YES;
} }
@end @end
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