Merge pull request #9 from szuwest/main

change: 修改QWeather的集成方式为cocoapods，支持模拟器调试开发
fluttercandies · Jan 28, 2023 · 5e8bed7 · 5e8bed7
2 parents e01d691 + 6a1c5da
commit 5e8bed7
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>
diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+# platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -18,6 +18,9 @@ PODS:
   - flutter_qweather (0.0.1):
     - AFNetworking (~> 4.0.0)
     - Flutter
+    - QWeather-SDK
+  - QWeather-SDK (4.10):
+    - AFNetworking (~> 4.0.1)
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
@@ -26,6 +29,7 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - AFNetworking
+    - QWeather-SDK
 
 EXTERNAL SOURCES:
   Flutter:
@@ -35,9 +39,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
-  flutter_qweather: c1a5fbf39bd3f91440d5300c60f15b76496a254d
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  flutter_qweather: ca1274d27d146b749e5a617193d7acec763a4bb0
+  QWeather-SDK: 20ef99647726903bb1583ceedee1d418176cedd4
 
-PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
+PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
 COCOAPODS: 1.11.3
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -339,7 +339,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
@@ -418,7 +418,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;
@@ -467,7 +467,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = iphoneos;

diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist
@@ -41,5 +41,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 </dict>
 </plist>
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -61,7 +61,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.0.9"
+    version: "0.0.10"
   flutter_test:
     dependency: "direct dev"
     description: flutter

diff --git a/ios/flutter_qweather.podspec b/ios/flutter_qweather.podspec
@@ -14,13 +14,13 @@ A qweather Flutter plugin.
   s.author           = { 'Your Company' => '[email protected]' }
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
-#  s.preserve_paths = 'Frameworks/*.framework'
-  s.vendored_frameworks = 'QWeather.framework'
-#  s.xcconfig = { 'OTHER_LDFLAGS' => '-framework QWeather' }
+#  s.vendored_frameworks = 'QWeather.framework'
   s.xcconfig = { 'OTHER_LDFLAGS' => '-ObjC' }
   s.dependency 'AFNetworking','~>4.0.0'
   s.dependency 'Flutter'
-  s.platform = :ios, '8.0'
+  s.dependency 'QWeather-SDK'
+  s.platform = :ios, '9.0'
+  s.static_framework = true
 
   # Flutter.framework does not contain a i386 slice.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }