fix bug

websocket地址更改

.fvm/fvm_config.json

@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "2.2.0",
+  "flutterSdkVersion": "2.8.0",
   "flavors": {}
 }

android/app/build.gradle

@@ -27,12 +27,12 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 def keystoreProperties = new Properties()
-   def keystorePropertiesFile = rootProject.file('key.properties')
+def keystorePropertiesFile = rootProject.file('key.properties')
-   if (keystorePropertiesFile.exists()) {
+if (keystorePropertiesFile.exists()) {
-       keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-   }
+}
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -48,51 +48,53 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
         ndk {
-           abiFilters 'arm64-v8a'
+            abiFilters 'arm64-v8a'
-           abiFilters 'armeabi-v7a'
+            abiFilters 'armeabi-v7a'
         }
         manifestPlaceholders = [
-            JPUSH_PKGNAME : applicationId,
+                JPUSH_PKGNAME: applicationId,
-            JPUSH_APPKEY : "028adb7b9eda661fefdf3072", //极光开发平台上注册的包名对应的appkey.
+                JPUSH_APPKEY : "028adb7b9eda661fefdf3072", //极光开发平台上注册的包名对应的appkey.
-            JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
+                JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可.
         ]
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
 
     signingConfigs {
-       release {
+        release {
-           keyAlias keystoreProperties['keyAlias']
+            keyAlias keystoreProperties['keyAlias']
-           keyPassword keystoreProperties['keyPassword']
+            keyPassword keystoreProperties['keyPassword']
-           storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-           storePassword keystoreProperties['storePassword']
+            storePassword keystoreProperties['storePassword']
-       }
+        }
-   }
+    }
-   buildTypes {
+    buildTypes {
-       release {
+        release {
             minifyEnabled true
             useProguard true
             multiDexEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-           signingConfig signingConfigs.release
+            ndk { abiFilters "armeabi" }
-       }
+            signingConfig signingConfigs.release
-       debug {
-           minifyEnabled true
-           useProguard true
-           multiDexEnabled true
-           proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 
-           signingConfig signingConfigs.release
+        }
-       }
+        debug {
-       profile{
+            minifyEnabled true
-           minifyEnabled true
+            useProguard true
-           useProguard true
+            multiDexEnabled true
-           multiDexEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-           proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            ndk { abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86" }
+            signingConfig signingConfigs.release
+        }
+        profile {
+            minifyEnabled true
+            useProguard true
+            multiDexEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 
-           signingConfig signingConfigs.release
+            signingConfig signingConfigs.release
-       }
+        }
-   }
+    }
 }
 
 flutter {
@@ -101,9 +103,9 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-   // implementation platform('com.google.firebase:firebase-bom:27.0.0')
+    // implementation platform('com.google.firebase:firebase-bom:27.0.0')
     //implementation 'com.google.firebase:firebase-analytics'
-    //implementation 'com.amap.api:3dmap:latest.integration'
+    implementation 'com.amap.api:3dmap:latest.integration'
-    implementation 'com.amap.api:location:5.2.0'
+//    implementation 'com.amap.api:location:5.2.0'
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'com.android.support:multidex:2.0.1'
 }

android/app/proguard-rules.pro

@@ -15,4 +15,12 @@
 ## AMap Location
 -keep class com.amap.api.location.**{*;}
 -keep class com.amap.api.fence.**{*;}
+-keep class com.loc.**{*;}
 -keep class com.autonavi.aps.amapapi.model.**{*;}
+
+##搜索
+-keep   class com.amap.api.services.**{*;}
+
+##2D地图
+-keep class com.amap.api.maps2d.**{*;}
+-keep class com.amap.api.mapcore2d.**{*;}

android/app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
            In most cases you can leave this as-is, but you if you want to provide
            additional functionality it is fine to subclass or reimplement
            FlutterApplication and put your custom class here. -->
-    <application android:name="io.flutter.app.FlutterApplication" android:label="小蜜蜂智慧小区管家端"
+    <application android:label="小蜜蜂智慧生活管家端"
                  android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
         <service android:name="com.amap.api.location.APSService"/>
         <meta-data android:name="com.amap.api.v2.apikey" android:value="0c11d9ba47089d971dc4d889b66593ab"/>

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
+    <item android:drawable="@color/bee" />
-
+    <item>
-    <!-- You can insert your own image assets here -->
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
-    <!-- <item>
+    </item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
 </layer-list>

android/app/src/main/res/drawable/launch_background.xml

@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
+    <item android:drawable="@color/bee" />
-
-    <!-- You can insert your own image assets here -->
     <item>
-        <bitmap
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
-            android:gravity="center"
-            android:src="@drawable/ic_launcher_foreground" />
     </item>
 </layer-list>

android/app/src/main/res/values-night/colors.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="bee">#FFFFFF</color>
+    <color name="transparent">#00000000</color>
+</resources>

android/app/src/main/res/values/colors.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<color name="bee">#FFFFFF</color>
+<color name="transparent">#00000000</color>
+</resources>

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.10'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.5'
     }

android/gradle.properties

@@ -2,3 +2,4 @@ org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
 android.enableR8=true
+systemProp.https.protocols=TLSv1.3

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip

ios/.gitignore

@@ -1,3 +1,4 @@
+**/dgph
 *.mode1v3
 *.mode2v3
 *.moved-aside
@@ -18,6 +19,7 @@ Flutter/App.framework
 Flutter/Flutter.framework
 Flutter/Flutter.podspec
 Flutter/Generated.xcconfig
+Flutter/ephemeral/
 Flutter/app.flx
 Flutter/app.zip
 Flutter/flutter_assets/

ios/Flutter/AppFrameworkInfo.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
   <key>CFBundleDevelopmentRegion</key>
-  <string>$(DEVELOPMENT_LANGUAGE)</string>
+  <string>en</string>
   <key>CFBundleExecutable</key>
   <string>App</string>
   <key>CFBundleIdentifier</key>

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '10.0'
+# platform :ios, '9.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Podfile.lock

@@ -1,60 +1,18 @@
 PODS:
-  - AMap3DMap (8.0.0):
+  - AMap3DMap (9.2.1):
-    - AMapFoundation (~> 1.6.8)
+    - AMapFoundation (~> 1.6.9)
   - amap_flutter_location (0.0.1):
-    - AMapLocation (~> 2.6.7)
+    - AMapLocation
     - Flutter
   - amap_flutter_map (0.0.1):
     - AMap3DMap
     - Flutter
-  - AMapFoundation (1.6.8)
+  - AMapFoundation (1.6.9)
-  - AMapLocation (2.6.9):
+  - AMapLocation (2.8.0):
-    - AMapFoundation (~> 1.6.8)
+    - AMapFoundation (~> 1.6.9)
   - device_info_plus (0.0.1):
     - Flutter
-  - Firebase/CoreOnly (7.11.0):
-    - FirebaseCore (= 7.11.0)
-  - Firebase/Crashlytics (7.11.0):
-    - Firebase/CoreOnly
-    - FirebaseCrashlytics (~> 7.11.0)
-  - firebase_core (1.1.1):
-    - Firebase/CoreOnly (= 7.11.0)
-    - Flutter
-  - firebase_crashlytics (2.0.3):
-    - Firebase/Crashlytics (= 7.11.0)
-    - firebase_core
-    - Flutter
-  - FirebaseCore (7.11.0):
-    - FirebaseCoreDiagnostics (~> 7.4)
-    - GoogleUtilities/Environment (~> 7.0)
-    - GoogleUtilities/Logger (~> 7.0)
-  - FirebaseCoreDiagnostics (7.11.0):
-    - GoogleDataTransport (~> 8.4)
-    - GoogleUtilities/Environment (~> 7.0)
-    - GoogleUtilities/Logger (~> 7.0)
-    - nanopb (~> 2.30908.0)
-  - FirebaseCrashlytics (7.11.0):
-    - FirebaseCore (~> 7.0)
-    - FirebaseInstallations (~> 7.0)
-    - GoogleDataTransport (~> 8.4)
-    - nanopb (~> 2.30908.0)
-    - PromisesObjC (~> 1.2)
-  - FirebaseInstallations (7.11.0):
-    - FirebaseCore (~> 7.0)
-    - GoogleUtilities/Environment (~> 7.0)
-    - GoogleUtilities/UserDefaults (~> 7.0)
-    - PromisesObjC (~> 1.2)
   - Flutter (1.0.0)
-  - GoogleDataTransport (8.4.0):
-    - GoogleUtilities/Environment (~> 7.2)
-    - nanopb (~> 2.30908.0)
-    - PromisesObjC (~> 1.2)
-  - GoogleUtilities/Environment (7.5.2):
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.5.2):
-    - GoogleUtilities/Environment
-  - GoogleUtilities/UserDefaults (7.5.2):
-    - GoogleUtilities/Logger
   - image_picker (0.0.1):
     - Flutter
   - JCore (2.4.0)
@@ -65,59 +23,45 @@ PODS:
     - JCore (= 2.4.0)
     - JPush (= 3.4.0)
   - MTBBarcodeScanner (5.0.11)
-  - nanopb (2.30908.0):
-    - nanopb/decode (= 2.30908.0)
-    - nanopb/encode (= 2.30908.0)
-  - nanopb/decode (2.30908.0)
-  - nanopb/encode (2.30908.0)
   - open_file (0.0.1):
     - Flutter
   - package_info_plus (0.4.5):
     - Flutter
-  - path_provider (0.0.1):
+  - path_provider_ios (0.0.1):
     - Flutter
   - "permission_handler (5.1.0+2)":
     - Flutter
-  - PromisesObjC (1.2.12)
   - qr_code_scanner (0.2.0):
     - Flutter
     - MTBBarcodeScanner
-  - url_launcher (0.0.1):
+  - sms_autofill (0.0.1):
+    - Flutter
+  - url_launcher_ios (0.0.1):
     - Flutter
 
 DEPENDENCIES:
   - amap_flutter_location (from `.symlinks/plugins/amap_flutter_location/ios`)
   - amap_flutter_map (from `.symlinks/plugins/amap_flutter_map/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
-  - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
-  - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
   - Flutter (from `Flutter`)
   - image_picker (from `.symlinks/plugins/image_picker/ios`)
   - jpush_flutter (from `.symlinks/plugins/jpush_flutter/ios`)
   - open_file (from `.symlinks/plugins/open_file/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
-  - path_provider (from `.symlinks/plugins/path_provider/ios`)
+  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
   - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
   - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
-  - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
+  - sms_autofill (from `.symlinks/plugins/sms_autofill/ios`)
+  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
 SPEC REPOS:
   trunk:
     - AMap3DMap
     - AMapFoundation
     - AMapLocation
-    - Firebase
-    - FirebaseCore
-    - FirebaseCoreDiagnostics
-    - FirebaseCrashlytics
-    - FirebaseInstallations
-    - GoogleDataTransport
-    - GoogleUtilities
     - JCore
     - JPush
     - MTBBarcodeScanner
-    - nanopb
-    - PromisesObjC
 
 EXTERNAL SOURCES:
   amap_flutter_location:
@@ -126,10 +70,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/amap_flutter_map/ios"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
-  firebase_core:
-    :path: ".symlinks/plugins/firebase_core/ios"
-  firebase_crashlytics:
-    :path: ".symlinks/plugins/firebase_crashlytics/ios"
   Flutter:
     :path: Flutter
   image_picker:
@@ -140,46 +80,38 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/open_file/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
-  path_provider:
+  path_provider_ios:
-    :path: ".symlinks/plugins/path_provider/ios"
+    :path: ".symlinks/plugins/path_provider_ios/ios"
   permission_handler:
     :path: ".symlinks/plugins/permission_handler/ios"
   qr_code_scanner:
     :path: ".symlinks/plugins/qr_code_scanner/ios"
-  url_launcher:
+  sms_autofill:
-    :path: ".symlinks/plugins/url_launcher/ios"
+    :path: ".symlinks/plugins/sms_autofill/ios"
+  url_launcher_ios:
+    :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  AMap3DMap: 89b82eaad00f9246f59d2a6103eff18be5b9dd4f
+  AMap3DMap: 0de590972bfbe2852fe63109bc11b485d7d848fa
-  amap_flutter_location: 3e33b57f1aad80b0dfb4b399de857a1a9f071e62
+  amap_flutter_location: 44ff5beb64f42e0bf5feb402fe299dac0013af6f
   amap_flutter_map: 979e54d227cedac6c7504a2151bfbf3bcf96760a
-  AMapFoundation: 32e9a0264ee62f5aa2aaf82bdafdda7985ce09c7
+  AMapFoundation: 8d8ecbb0b2e9ce5487995360d26c885d94642bfd
-  AMapLocation: 3ec0e9bf53800b40cceb313cbd047743f75e2483
+  AMapLocation: 5ef44a1117be7dc541cb7a7d43d03c5ee91e4387
   device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
-  Firebase: c121feb35e4126c0b355e3313fa9b487d47319fd
+  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
-  firebase_core: 54856a8a39b8f3e35f34fdd3373f3b92a1daa68b
-  firebase_crashlytics: 1e72fe7a913faa6bc73f75794a5f68947e26623e
-  FirebaseCore: 907447d8917a4d3eb0cce2829c5a0ad21d90b432
-  FirebaseCoreDiagnostics: 68ad972f99206cef818230f3f3179d52ccfb7f8c
-  FirebaseCrashlytics: 272b675aa9d1e9bae1f9e1449fcc1f2cf6042806
-  FirebaseInstallations: a58d4f72ec5861840b84df489f2668d970df558a
-  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
-  GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7
-  GoogleUtilities: 8de2a97a17e15b6b98e38e8770e2d129a57c0040
   image_picker: 50e7c7ff960e5f58faa4d1f4af84a771c671bc4a
   JCore: a29e4b0ee54e1301446dc02d8e1c350404108b34
   JPush: defaa108c38806f6efdcfaf4c416854d25fca8e5
   jpush_flutter: 364b245849348e05377d67295d0896ddd664a896
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
-  nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
   open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
-  path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
+  path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
   permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
-  PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
   qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
-  url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
+  sms_autofill: c461043483362c3f1709ee76eaae6eb570b31686
+  url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
 
-PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea
+PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
 
-COCOAPODS: 1.11.0
+COCOAPODS: 1.11.3

ios/Runner.xcodeproj/project.pbxproj

@@ -9,11 +9,11 @@
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		67940941BFBAD0133AAC170C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E157A5CEF18CB6C6457B21E /* Pods_Runner.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-		CF074B03259ACF97A4D9678C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C87529B7C63E61100F93BB8 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -32,11 +32,10 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		14F672331E5943D83C113F31 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		2329A27C8F61B5784B5FFF23 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		36B722CE353764B6A5E21BE5 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		686A183B2716B3CC00B82E2F /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
+		5E157A5CEF18CB6C6457B21E /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		6C87529B7C63E61100F93BB8 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		68E57D2A282B5310001BC3E3 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -47,7 +46,8 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		ED1D4F2FE370AB2654D117DD /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		BCEE1D106A9E3D962A13556D /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		BEE48FEA7ABEDF4B32F6EDE2 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -55,31 +55,21 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CF074B03259ACF97A4D9678C /* Pods_Runner.framework in Frameworks */,
+				67940941BFBAD0133AAC170C /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		46828B928A0C5D568F005526 /* Frameworks */ = {
+		3F5DCF05D8164AF3C59BAF15 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				6C87529B7C63E61100F93BB8 /* Pods_Runner.framework */,
+				5E157A5CEF18CB6C6457B21E /* Pods_Runner.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		8625925C0B05FD302FD6FB81 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				14F672331E5943D83C113F31 /* Pods-Runner.debug.xcconfig */,
-				36B722CE353764B6A5E21BE5 /* Pods-Runner.release.xcconfig */,
-				ED1D4F2FE370AB2654D117DD /* Pods-Runner.profile.xcconfig */,
-			);
-			path = Pods;
-			sourceTree = "<group>";
-		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -97,8 +87,8 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
-				8625925C0B05FD302FD6FB81 /* Pods */,
+				B867D465C4893F069094C734 /* Pods */,
-				46828B928A0C5D568F005526 /* Frameworks */,
+				3F5DCF05D8164AF3C59BAF15 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -113,7 +103,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
-				686A183B2716B3CC00B82E2F /* Runner.entitlements */,
+				68E57D2A282B5310001BC3E3 /* Runner.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -126,6 +116,16 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
+		B867D465C4893F069094C734 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				BEE48FEA7ABEDF4B32F6EDE2 /* Pods-Runner.debug.xcconfig */,
+				2329A27C8F61B5784B5FFF23 /* Pods-Runner.release.xcconfig */,
+				BCEE1D106A9E3D962A13556D /* Pods-Runner.profile.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -133,15 +133,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				16A70F614A564E70F7F57EBB /* [CP] Check Pods Manifest.lock */,
+				C1CAC9500466F946802E9AC0 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				03800E59642E580EF220C3BB /* [CP] Embed Pods Frameworks */,
+				BFE171D6DCA344F6700C0F7F /* [CP] Embed Pods Frameworks */,
-				1AC62B98D6950EDE79B5D25D /* [CP] Copy Pods Resources */,
+				7EA053C8F999C9E14568F31D /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -158,7 +158,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -200,89 +200,89 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		03800E59642E580EF220C3BB /* [CP] Embed Pods Frameworks */ = {
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
+			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			name = "Thin Binary";
-			outputFileListPaths = (
+			outputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
-			showEnvVarsInLog = 0;
 		};
-		16A70F614A564E70F7F57EBB /* [CP] Check Pods Manifest.lock */ = {
+		7EA053C8F999C9E14568F31D /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
+			name = "[CP] Copy Pods Resources";
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-			);
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
 			);
 			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 = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		1AC62B98D6950EDE79B5D25D /* [CP] Copy Pods Resources */ = {
+		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
+			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Copy Pods Resources";
+			name = "Run Script";
-			outputFileListPaths = (
+			outputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
-			showEnvVarsInLog = 0;
 		};
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+		BFE171D6DCA344F6700C0F7F /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "Thin Binary";
+			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
 		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
+		C1CAC9500466F946802E9AC0 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
 			);
-			name = "Run Script";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			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";
+			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -341,6 +341,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -359,7 +360,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 = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -415,6 +416,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -439,7 +441,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 = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -470,6 +472,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -488,7 +491,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 = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
+      <Testables>
-      </AdditionalOptions>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +1,122 @@
 {
-    "images": [
+  "images" : [
-        {
+    {
-            "size": "20x20",
+      "filename" : "Icon-App-20x20@2x.png",
-            "idiom": "iphone",
+      "idiom" : "iphone",
-            "filename": "icon-20@2x.png",
+      "scale" : "2x",
-            "scale": "2x"
+      "size" : "20x20"
-        },
+    },
-        {
+    {
-            "size": "20x20",
+      "filename" : "Icon-App-20x20@3x.png",
-            "idiom": "iphone",
+      "idiom" : "iphone",
-            "filename": "icon-20@3x.png",
+      "scale" : "3x",
-            "scale": "3x"
+      "size" : "20x20"
-        },
+    },
-        {
+    {
-            "size": "29x29",
+      "filename" : "Icon-App-29x29@1x.png",
-            "idiom": "iphone",
+      "idiom" : "iphone",
-            "filename": "icon-29.png",
+      "scale" : "1x",
-            "scale": "1x"
+      "size" : "29x29"
-        },
+    },
-        {
+    {
-            "size": "29x29",
+      "filename" : "Icon-App-29x29@2x.png",
-            "idiom": "iphone",
+      "idiom" : "iphone",
-            "filename": "icon-29@2x.png",
+      "scale" : "2x",
-            "scale": "2x"
+      "size" : "29x29"
-        },
+    },
-        {
+    {
-            "size": "29x29",
+      "filename" : "Icon-App-29x29@3x.png",
-            "idiom": "iphone",
+      "idiom" : "iphone",
-            "filename": "icon-29@3x.png",
+      "scale" : "3x",
-            "scale": "3x"
+      "size" : "29x29"
-        },
+    },
-        {
+    {
-            "size": "40x40",
+      "filename" : "Icon-App-40x40@2x.png",
-            "idiom": "iphone",
+      "idiom" : "iphone",
-            "filename": "icon-40@2x.png",
+      "scale" : "2x",
-            "scale": "2x"
+      "size" : "40x40"
-        },
+    },
-        {
+    {
-            "size": "40x40",
+      "filename" : "Icon-App-40x40@3x.png",
-            "idiom": "iphone",
+      "idiom" : "iphone",
-            "filename": "icon-40@3x.png",
+      "scale" : "3x",
-            "scale": "3x"
+      "size" : "40x40"
-        },
+    },
-        {
+    {
-            "size": "60x60",
+      "filename" : "Icon-App-60x60@2x.png",
-            "idiom": "iphone",
+      "idiom" : "iphone",
-            "filename": "icon-60@2x.png",
+      "scale" : "2x",
-            "scale": "2x"
+      "size" : "60x60"
-        },
+    },
-        {
+    {
-            "size": "60x60",
+      "filename" : "Icon-App-60x60@3x.png",
-            "idiom": "iphone",
+      "idiom" : "iphone",
-            "filename": "icon-60@3x.png",
+      "scale" : "3x",
-            "scale": "3x"
+      "size" : "60x60"
-        },
+    },
-        {
+    {
-            "size": "20x20",
+      "filename" : "Icon-App-20x20@1x.png",
-            "idiom": "ipad",
+      "idiom" : "ipad",
-            "filename": "icon-20-ipad.png",
+      "scale" : "1x",
-            "scale": "1x"
+      "size" : "20x20"
-        },
+    },
-        {
+    {
-            "size": "20x20",
+      "filename" : "Icon-App-20x20@2x.png",
-            "idiom": "ipad",
+      "idiom" : "ipad",
-            "filename": "icon-20@2x-ipad.png",
+      "scale" : "2x",
-            "scale": "2x"
+      "size" : "20x20"
-        },
+    },
-        {
+    {
-            "size": "29x29",
+      "filename" : "Icon-App-29x29@1x.png",
-            "idiom": "ipad",
+      "idiom" : "ipad",
-            "filename": "icon-29-ipad.png",
+      "scale" : "1x",
-            "scale": "1x"
+      "size" : "29x29"
-        },
+    },
-        {
+    {
-            "size": "29x29",
+      "filename" : "Icon-App-29x29@2x.png",
-            "idiom": "ipad",
+      "idiom" : "ipad",
-            "filename": "icon-29@2x-ipad.png",
+      "scale" : "2x",
-            "scale": "2x"
+      "size" : "29x29"
-        },
+    },
-        {
+    {
-            "size": "40x40",
+      "filename" : "Icon-App-40x40@1x.png",
-            "idiom": "ipad",
+      "idiom" : "ipad",
-            "filename": "icon-40.png",
+      "scale" : "1x",
-            "scale": "1x"
+      "size" : "40x40"
-        },
+    },
-        {
+    {
-            "size": "40x40",
+      "filename" : "Icon-App-40x40@2x.png",
-            "idiom": "ipad",
+      "idiom" : "ipad",
-            "filename": "icon-40@2x.png",
+      "scale" : "2x",
-            "scale": "2x"
+      "size" : "40x40"
-        },
+    },
-        {
+    {
-            "size": "76x76",
+      "filename" : "Icon-App-76x76@1x.png",
-            "idiom": "ipad",
+      "idiom" : "ipad",
-            "filename": "icon-76.png",
+      "scale" : "1x",
-            "scale": "1x"
+      "size" : "76x76"
-        },
+    },
-        {
+    {
-            "size": "76x76",
+      "filename" : "Icon-App-76x76@2x.png",
-            "idiom": "ipad",
+      "idiom" : "ipad",
-            "filename": "icon-76@2x.png",
+      "scale" : "2x",
-            "scale": "2x"
+      "size" : "76x76"
-        },
+    },
-        {
+    {
-            "size": "83.5x83.5",
+      "filename" : "Icon-App-83.5x83.5@2x.png",
-            "idiom": "ipad",
+      "idiom" : "ipad",
-            "filename": "icon-83.5@2x.png",
+      "scale" : "2x",
-            "scale": "2x"
+      "size" : "83.5x83.5"
-        },
+    },
-        {
+    {
-            "size": "1024x1024",
+      "filename" : "ItunesArtwork@2x.png",
-            "idiom": "ios-marketing",
+      "idiom" : "ios-marketing",
-            "filename": "icon-1024.png",
+      "scale" : "1x",
-            "scale": "1x"
+      "size" : "1024x1024"
-        }
-    ],
-    "info": {
-        "version": 1,
-        "author": "icon.wuruihong.com"
     }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
 }