部分修改

+
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -59,6 +61,7 @@ android {
 
         main { jniLibs.srcDirs = ['libs'] }
     }
+  
 
     lintOptions {
         disable 'InvalidPackage'
@@ -73,7 +76,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.naji.one_key"
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -81,6 +84,7 @@ android {
 
         ndk {
             //选择要添加的对应 cpu 类型的 .so 库。
+            // abiFilters  'arm64-v8a', 'x86_64',  'mips64'   //魅族64位，不支持32位
             abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64'
         }
 
@@ -175,3 +179,4 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
 }
+

@@ -9,6 +9,11 @@
 -keep class com.tencent.bigdata.baseapi.** {*;}
 -keep class com.tencent.bigdata.mqttchannel.** {*;}
 
+-keep class com.tencent.tpns.baseapi.** {*;} 
+
+
+
+
 #-ignorewarning
 -keepattributes *Annotation*
 -keepattributes Exceptions

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.naji.one_key">
+  package="com.naji.one_key"
+    > 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
@@ -32,6 +33,8 @@
         android:requestLegacyExternalStorage="true"
         android:preserveLegacyExternalStorage="true"
         android:allowNativeHeapPointerTagging="false"
+        android:extractNativeLibs="true"
+        
         >
         
         <activity

+
+
 buildscript {
     // ext.kotlin_version = '1.3.50'
     // ext.kotlin_version = '1.9.24'
@@ -9,6 +11,7 @@ ext.kotlin_version = '1.8.22'
 
 //  ext.kotlin_version = '1.4.32'
     repositories {
+        mavenCentral()
         google()
         jcenter()
 
@@ -40,6 +43,7 @@ maven{
 
 allprojects {
     repositories {
+        mavenCentral()
         google()
         jcenter()
 
@@ -59,6 +63,9 @@ maven{
 }
 
 rootProject.buildDir = '../build'
+// subprojects{
+//     project.abiFilters.android.compileSdkVersion 34
+// }
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
@@ -77,6 +84,7 @@ subprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
+

@@ -4,5 +4,4 @@ distributionPath=wrapper/dists
 # distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-
+zipStorePath=wrapper/dists
\ No newline at end of file

+**/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/

-0feb5fcd550157bc1a24916743cf7132
\ No newline at end of file

@@ -2,25 +2,25 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>App</string>
-	<key>CFBundleIdentifier</key>
-	<string>io.flutter.flutter.app</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>App</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>MinimumOSVersion</key>
-	<string>11.0</string>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>App</string>
+  <key>CFBundleIdentifier</key>
+  <string>io.flutter.flutter.app</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>App</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>1.0</string>
+  <key>MinimumOSVersion</key>
+  <string>12.0</string>
 </dict>
 </plist>

-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
-
-

-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
-

@@ -17,7 +17,7 @@ source 'https://cdn.cocoapods.org/'
 # source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
 # pod 'gitee-mosect-ijkplayer', :source => 'https://gitee.com/mosect/ijkplayer.git'
 
-platform :ios, '12.0'
+platform :ios, '15.0'
 
 
 
@@ -55,11 +55,13 @@ target 'Runner' do
 end
 
 post_install do |installer|
+  installer.pods_project.build_configurations.each do |config|
+      config.build_settings['WARNING_CFLAGS'] = '-Wno-nullability-completeness'
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
     target.build_configurations.each do |config|
-      if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 11.0
-        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
+      if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 15.0
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.0'
       
       config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
         '$(inherited)',
@@ -81,6 +83,7 @@ post_install do |installer|
         'PERMISSION_MICROPHONE=1',
       ]
     end
+    end
       end 
   end
 end

@@ -42,8 +42,6 @@ PODS:
     - Flutter
   - device_utils_my (0.0.1):
     - Flutter
-  - easy_contact_picker (0.0.1):
-    - Flutter
   - fijkplayer (0.11.0):
     - BIJKPlayer (~> 0.7.16)
     - Flutter
@@ -53,7 +51,7 @@ PODS:
   - flutter_app_update (0.0.1):
     - Flutter
   - flutter_bugly (0.0.1):
-    - Bugly
+    - Bugly (= 2.6.1)
     - Flutter
   - flutter_downloader (0.0.1):
     - Flutter
@@ -62,15 +60,17 @@ PODS:
     - Mantle
     - SDWebImage
     - SDWebImageWebPCoder
-  - flutter_inappwebview (0.0.1):
+  - flutter_inappwebview_ios (0.0.1):
     - Flutter
-    - flutter_inappwebview/Core (= 0.0.1)
-    - OrderedSet (~> 5.0)
-  - flutter_inappwebview/Core (0.0.1):
+    - flutter_inappwebview_ios/Core (= 0.0.1)
+    - OrderedSet (~> 6.0.3)
+  - flutter_inappwebview_ios/Core (0.0.1):
     - Flutter
-    - OrderedSet (~> 5.0)
+    - OrderedSet (~> 6.0.3)
   - flutter_keyboard_visibility (0.0.1):
     - Flutter
+  - flutter_native_contact_picker (0.0.1):
+    - Flutter
   - flutter_native_image (0.0.1):
     - Flutter
   - flutter_sms (1.1.0):
@@ -81,15 +81,12 @@ PODS:
     - Flutter
   - fluttertoast (0.0.2):
     - Flutter
-    - Toast
   - fluwx (0.0.1):
     - Flutter
-    - WechatOpenSDK-XCFramework (~> 2.0.2)
-  - FMDB (2.7.12):
-    - FMDB/standard (= 2.7.12)
-  - FMDB/Core (2.7.12)
-  - FMDB/standard (2.7.12):
-    - FMDB/Core
+    - fluwx/pay (= 0.0.1)
+  - fluwx/pay (0.0.1):
+    - Flutter
+    - WechatOpenSDK-XCFramework (~> 2.0.4)
   - foundation_fluttify (0.0.1):
     - Flutter
   - geocoding_ios (1.0.5):
@@ -106,24 +103,24 @@ PODS:
     - GoogleMaps/Base
   - image_cropper (0.0.4):
     - Flutter
-    - TOCropViewController (~> 2.6.1)
+    - TOCropViewController (~> 2.7.4)
   - image_gallery_saver (2.0.2):
     - Flutter
   - image_picker_ios (0.0.1):
     - Flutter
   - install_plugin (2.0.0):
     - Flutter
-  - libwebp (1.3.2):
-    - libwebp/demux (= 1.3.2)
-    - libwebp/mux (= 1.3.2)
-    - libwebp/sharpyuv (= 1.3.2)
-    - libwebp/webp (= 1.3.2)
-  - libwebp/demux (1.3.2):
+  - libwebp (1.5.0):
+    - libwebp/demux (= 1.5.0)
+    - libwebp/mux (= 1.5.0)
+    - libwebp/sharpyuv (= 1.5.0)
+    - libwebp/webp (= 1.5.0)
+  - libwebp/demux (1.5.0):
     - libwebp/webp
-  - libwebp/mux (1.3.2):
+  - libwebp/mux (1.5.0):
     - libwebp/demux
-  - libwebp/sharpyuv (1.3.2)
-  - libwebp/webp (1.3.2):
+  - libwebp/sharpyuv (1.5.0)
+  - libwebp/webp (1.5.0):
     - libwebp/sharpyuv
   - Mantle (2.2.0):
     - Mantle/extobjc (= 2.2.0)
@@ -131,13 +128,13 @@ PODS:
   - MTBBarcodeScanner (5.0.11)
   - open_filex (0.0.2):
     - Flutter
-  - OrderedSet (5.0.0)
+  - OrderedSet (6.0.3)
   - package_info (0.0.1):
     - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - permission_handler_apple (9.1.1):
+  - permission_handler_apple (9.3.0):
     - Flutter
   - photo_manager (2.0.0):
     - Flutter
@@ -156,22 +153,22 @@ PODS:
     - FlutterMacOS
   - sign_in_with_apple (0.0.1):
     - Flutter
-  - sqflite (0.0.3):
+  - sqflite_darwin (0.0.4):
     - Flutter
-    - FMDB (>= 2.7.5)
+    - FlutterMacOS
   - SwiftProtobuf (1.28.2)
-  - Toast (4.1.1)
-  - TOCropViewController (2.6.1)
-  - TPNS-iOS (1.3.9.7)
-  - tpns_flutter_plugin (1.2.6):
+  - TOCropViewController (2.7.4)
+  - TPNS-iOS (1.4.0.4)
+  - tpns_flutter_plugin (1.3.3):
     - Flutter
-    - TPNS-iOS (= 1.3.9.7)
+    - TPNS-iOS (= 1.4.0.4)
   - url_launcher_ios (0.0.1):
     - Flutter
   - video_compress (0.3.0):
     - Flutter
   - video_player_avfoundation (0.0.1):
     - Flutter
+    - FlutterMacOS
   - video_thumbnail (0.0.1):
     - Flutter
     - libwebp
@@ -191,7 +188,6 @@ DEPENDENCIES:
   - core_location_fluttify (from `.symlinks/plugins/core_location_fluttify/ios`)
   - device_info (from `.symlinks/plugins/device_info/ios`)
   - device_utils_my (from `.symlinks/plugins/device_utils_my/ios`)
-  - easy_contact_picker (from `.symlinks/plugins/easy_contact_picker/ios`)
   - fijkplayer (from `.symlinks/plugins/fijkplayer/ios`)
   - Flutter (from `Flutter`)
   - flutter_app_badger (from `.symlinks/plugins/flutter_app_badger/ios`)
@@ -199,8 +195,9 @@ DEPENDENCIES:
   - flutter_bugly (from `.symlinks/plugins/flutter_bugly/ios`)
   - flutter_downloader (from `.symlinks/plugins/flutter_downloader/ios`)
   - flutter_image_compress_common (from `.symlinks/plugins/flutter_image_compress_common/ios`)
-  - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
+  - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
   - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
+  - flutter_native_contact_picker (from `.symlinks/plugins/flutter_native_contact_picker/ios`)
   - flutter_native_image (from `.symlinks/plugins/flutter_native_image/ios`)
   - flutter_sms (from `.symlinks/plugins/flutter_sms/ios`)
   - flutter_statusbarcolor_ns (from `.symlinks/plugins/flutter_statusbarcolor_ns/ios`)
@@ -217,17 +214,17 @@ DEPENDENCIES:
   - install_plugin (from `.symlinks/plugins/install_plugin/ios`)
   - open_filex (from `.symlinks/plugins/open_filex/ios`)
   - package_info (from `.symlinks/plugins/package_info/ios`)
-  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - photo_manager (from `.symlinks/plugins/photo_manager/ios`)
   - sendsms (from `.symlinks/plugins/sendsms/ios`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`)
-  - sqflite (from `.symlinks/plugins/sqflite/ios`)
+  - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
   - tpns_flutter_plugin (from `.symlinks/plugins/tpns_flutter_plugin/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - video_compress (from `.symlinks/plugins/video_compress/ios`)
-  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
+  - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
   - video_thumbnail (from `.symlinks/plugins/video_thumbnail/ios`)
   - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
 
@@ -239,8 +236,11 @@ SPEC REPOS:
     - AMapSearch-NO-IDFA
     - BIJKPlayer
     - Bugly
+<<<<<<< HEAD
     - FMDB
     - GoogleMaps
+=======
+>>>>>>> v5.4.4+
     - libwebp
     - Mantle
     - MTBBarcodeScanner
@@ -249,7 +249,6 @@ SPEC REPOS:
     - SDWebImage
     - SDWebImageWebPCoder
     - SwiftProtobuf
-    - Toast
     - TOCropViewController
     - TPNS-iOS
     - WechatOpenSDK-XCFramework
@@ -277,8 +276,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/device_info/ios"
   device_utils_my:
     :path: ".symlinks/plugins/device_utils_my/ios"
-  easy_contact_picker:
-    :path: ".symlinks/plugins/easy_contact_picker/ios"
   fijkplayer:
     :path: ".symlinks/plugins/fijkplayer/ios"
   Flutter:
@@ -293,10 +290,12 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_downloader/ios"
   flutter_image_compress_common:
     :path: ".symlinks/plugins/flutter_image_compress_common/ios"
-  flutter_inappwebview:
-    :path: ".symlinks/plugins/flutter_inappwebview/ios"
+  flutter_inappwebview_ios:
+    :path: ".symlinks/plugins/flutter_inappwebview_ios/ios"
   flutter_keyboard_visibility:
     :path: ".symlinks/plugins/flutter_keyboard_visibility/ios"
+  flutter_native_contact_picker:
+    :path: ".symlinks/plugins/flutter_native_contact_picker/ios"
   flutter_native_image:
     :path: ".symlinks/plugins/flutter_native_image/ios"
   flutter_sms:
@@ -330,7 +329,7 @@ EXTERNAL SOURCES:
   package_info:
     :path: ".symlinks/plugins/package_info/ios"
   path_provider_foundation:
-    :path: ".symlinks/plugins/path_provider_foundation/ios"
+    :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
   photo_manager:
@@ -338,11 +337,11 @@ EXTERNAL SOURCES:
   sendsms:
     :path: ".symlinks/plugins/sendsms/ios"
   shared_preferences_foundation:
-    :path: ".symlinks/plugins/shared_preferences_foundation/ios"
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sign_in_with_apple:
     :path: ".symlinks/plugins/sign_in_with_apple/ios"
-  sqflite:
-    :path: ".symlinks/plugins/sqflite/ios"
+  sqflite_darwin:
+    :path: ".symlinks/plugins/sqflite_darwin/darwin"
   tpns_flutter_plugin:
     :path: ".symlinks/plugins/tpns_flutter_plugin/ios"
   url_launcher_ios:
@@ -350,7 +349,7 @@ EXTERNAL SOURCES:
   video_compress:
     :path: ".symlinks/plugins/video_compress/ios"
   video_player_avfoundation:
-    :path: ".symlinks/plugins/video_player_avfoundation/ios"
+    :path: ".symlinks/plugins/video_player_avfoundation/darwin"
   video_thumbnail:
     :path: ".symlinks/plugins/video_thumbnail/ios"
   webview_flutter:
@@ -358,17 +357,18 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   AMap3DMap-NO-IDFA: 6660036f9a8c28ed3e9037936210121599055a2e
-  amap_core_fluttify: b84657ba39ee287a4b96bbcc0a6e67612cc3808f
-  amap_location_fluttify: 7dc366b959d3ea9ce0b826e60c22a15cec54bbad
-  amap_map_fluttify: 4eaf28184c3cac71f7cf1fb2799c919886792ca8
-  amap_search_fluttify: cfab91aa65730337fff54705aae0423ea752fc91
+  amap_core_fluttify: 4e444a402c3e2ef35958a623b74ab368a49813c8
+  amap_location_fluttify: 5d07b9fc4de09726de28cb54de6ecbc09509a9bd
+  amap_map_fluttify: 7d4644215ee20b2f9e1c0173fb19291fc7a6b6fc
+  amap_search_fluttify: b964944aa1ee019a08b37c64cc8abaf86a34a1a3
   AMapFoundation-NO-IDFA: cc2ec7a2828ef292358ad594b7ee0ae21a7f097b
   AMapLocation-NO-IDFA: 9d7ec9b052405356600b59fe0a9a65261bacc54e
   AMapSearch-NO-IDFA: 9df378c88d50083346412ee3e0a10e2c451c7139
-  audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40
-  barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0
+  audioplayers_darwin: ccf9c770ee768abb07e26d90af093f7bab1c12ab
+  barcode_scan2: f80517f040989095c9b5067be77649bf6114442c
   BIJKPlayer: 4c5d66e5cb99ae5bade6f22a4fcc031722a81c64
   Bugly: 217ac2ce5f0f2626d43dbaa4f70764c953a26a31
+<<<<<<< HEAD
   connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
   contacts_service: 849e1f84281804c8bfbec1b4c3eedcb23c5d3eca
   core_location_fluttify: 9466a411ea7d22c6349c7e6a767ae4623f01eb1d
@@ -401,33 +401,61 @@ SPEC CHECKSUMS:
   image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
   install_plugin: b52f81470a1f37b006607bdf7ffc6031df43fe76
   libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
+=======
+  connectivity_plus: 481668c94744c30c53b8895afb39159d1e619bdf
+  contacts_service: 7c2ed10147f55891576c6a582f431e385d8de92d
+  core_location_fluttify: d76555ed03db792a010b362a52a72134a69fe32b
+  device_info: 52e8c0c9c61def8d0a92bf175f5f500abbea04bc
+  device_utils_my: de33d0a3965bd76cf7e9fb58b7ea71d698686969
+  fijkplayer: 2dd31ec312ba554bb6a9163cb2f44cdb528e50da
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  flutter_app_badger: 16b371e989d04cd265df85be2c3851b49cb68d18
+  flutter_app_update: 816fdb2e30e4832a7c45e3f108d391c42ef040a9
+  flutter_bugly: a77131ff7b385a481c594830dc89aa53e8e7fbee
+  flutter_downloader: 78da0da1084e709cbfd3b723c7ea349c71681f09
+  flutter_image_compress_common: 1697a328fd72bfb335507c6bca1a65fa5ad87df1
+  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
+  flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619
+  flutter_native_contact_picker: 22508d3ab5a583068d4a588cb37c0e0b8764722d
+  flutter_native_image: c0f200e4bc5da392b15878df38654cc85a78b090
+  flutter_sms: bb63bc226f41fad2b7cc9f0b1d0c15f7730a8310
+  flutter_statusbarcolor_ns: 28ea17050f37c962fe05a4722a6d43afc4fca76b
+  flutter_wxwork: 544263eeacf44361e64b749e4ff62b5f680cbc14
+  fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1
+  fluwx: 6bf9c5a3a99ad31b0de137dd92370a0d10a60f4b
+  foundation_fluttify: f4349a7e72691ddf460062127ef64f3a221868a5
+  image_cropper: c4326ea50132b1e1564499e5d32a84f01fb03537
+  image_gallery_saver: 14711d79da40581063e8842a11acf1969d781ed7
+  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
+  install_plugin: e17e38d6f504857748a3ec1299d8a2bbeeeea854
+  libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
+>>>>>>> v5.4.4+
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
-  open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4
-  OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
-  package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
-  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
-  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
-  photo_manager: 4f6810b7dfc4feb03b461ac1a70dacf91fba7604
+  open_filex: 432f3cd11432da3e39f47fcc0df2b1603854eff1
+  OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
+  package_info: cce50adca9873c79f931618469d2114b91d71189
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
+  photo_manager: d2fbcc0f2d82458700ee6256a15018210a81d413
   ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda
   SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
-  sendsms: 4065f76018b22a3e6987b4630f161feab95cef23
-  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
-  sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440
-  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
+  sendsms: 43a465a88ce570d59cc10ef0f3bdb922cc303c7b
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sign_in_with_apple: c5dcc141574c8c54d5ac99dd2163c0c72ad22418
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
   SwiftProtobuf: 4dbaffec76a39a8dc5da23b40af1a5dc01a4c02d
-  Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
-  TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
-  TPNS-iOS: e13778e709e9ac84fe512476c6f4983f0011f7fe
-  tpns_flutter_plugin: d9fa7fdf77de4e1ee3b5a9cd61fd92eecb0e9b08
-  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
-  video_compress: fce97e4fb1dfd88175aa07d2ffc8a2f297f87fbe
-  video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126
-  video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1
-  webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b
+  TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
+  TPNS-iOS: 38f2c743d01cd1e62cbdbb12455990a9a75fb492
+  tpns_flutter_plugin: 0d205d24df8b0959a3c5302c6648637665556aee
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+  video_compress: f2133a07762889d67f0711ac831faa26f956980e
+  video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
+  video_thumbnail: b637e0ad5f588ca9945f6e2c927f73a69a661140
+  webview_flutter: fa13f657fd0a01527ab6ba905b3be0fb3e3bfd4d
   WechatOpenSDK-XCFramework: 36fb2bea0754266c17184adf4963d7e6ff98b69f
 
-PODFILE CHECKSUM: 1cefd2e71f0fcfa4f2430db723fe500dadb93e92
+PODFILE CHECKSUM: 9435259418d39cbc3076dcc2f688f77abaddd31d
 
 COCOAPODS: 1.16.2

@@ -3,33 +3,34 @@
 	archiveVersion = 1;
 	classes = {
 	};
+<<<<<<< HEAD
 	objectVersion = 50;
+=======
+	objectVersion = 54;
+>>>>>>> v5.4.4+
 	objects = {
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		728D93682B1DBD6D00EFD19A /* tts_voice.caf in Resources */ = {isa = PBXBuildFile; fileRef = 728D93632B1DBD6C00EFD19A /* tts_voice.caf */; };
-		728D93692B1DBD6D00EFD19A /* tts_deposit.caf in Resources */ = {isa = PBXBuildFile; fileRef = 728D93642B1DBD6C00EFD19A /* tts_deposit.caf */; };
-		728D936A2B1DBD6D00EFD19A /* tts_wine_remind.caf in Resources */ = {isa = PBXBuildFile; fileRef = 728D93652B1DBD6C00EFD19A /* tts_wine_remind.caf */; };
-		728D936B2B1DBD6D00EFD19A /* tts_recharge.caf in Resources */ = {isa = PBXBuildFile; fileRef = 728D93662B1DBD6C00EFD19A /* tts_recharge.caf */; };
-		728D936C2B1DBD6D00EFD19A /* tts_commemoration_day.caf in Resources */ = {isa = PBXBuildFile; fileRef = 728D93672B1DBD6D00EFD19A /* tts_commemoration_day.caf */; };
-		72DFBB9425BA6CD700EE1E5D /* tts_all.caf in Resources */ = {isa = PBXBuildFile; fileRef = 720060DA25B9912C0014BE3B /* tts_all.caf */; };
-		72DFBB9525BA6CD700EE1E5D /* tts_cancel.caf in Resources */ = {isa = PBXBuildFile; fileRef = 72DFBB8C25BA6CBF00EE1E5D /* tts_cancel.caf */; };
-		72DFBB9625BA6CD700EE1E5D /* tts_invoice.caf in Resources */ = {isa = PBXBuildFile; fileRef = 72DFBB9325BA6CBF00EE1E5D /* tts_invoice.caf */; };
-		72DFBB9725BA6CD700EE1E5D /* tts_new.caf in Resources */ = {isa = PBXBuildFile; fileRef = 72DFBB8E25BA6CBF00EE1E5D /* tts_new.caf */; };
-		72DFBB9825BA6CD700EE1E5D /* tts_online.caf in Resources */ = {isa = PBXBuildFile; fileRef = 72DFBB8F25BA6CBF00EE1E5D /* tts_online.caf */; };
-		72DFBB9925BA6CD700EE1E5D /* tts_order.caf in Resources */ = {isa = PBXBuildFile; fileRef = 72DFBB9225BA6CBF00EE1E5D /* tts_order.caf */; };
-		72DFBB9A25BA6CD700EE1E5D /* tts_pay.caf in Resources */ = {isa = PBXBuildFile; fileRef = 72DFBB8D25BA6CBF00EE1E5D /* tts_pay.caf */; };
-		72DFBB9B25BA6CD700EE1E5D /* tts_pre_pay.caf in Resources */ = {isa = PBXBuildFile; fileRef = 72DFBB9125BA6CBF00EE1E5D /* tts_pre_pay.caf */; };
-		72E2EB012B4E847E009FD712 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 72E2EB002B4E846E009FD712 /* libsqlite3.tbd */; };
+		6BEC6C3B65B04502A3990DE7 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4E32EA6F002ADDE3266FC1B /* 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 */; };
-		A7F352227F0F121A53D9A543 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F11082C59A1D00E83E0934D /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 97C146E61CF9000F007C117D /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 97C146ED1CF9000F007C117D;
+			remoteInfo = Runner;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -47,26 +48,10 @@
 		0771EF012D141AE300148DB8 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		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>"; };
-		22513BD076488FBD50F0303F /* 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>"; };
-		2DCAB49DF131E02F3BAF38E1 /* 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>"; };
+		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
+		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		720060DA25B9912C0014BE3B /* tts_all.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_all.caf; sourceTree = "<group>"; };
-		7206E2DB26200F770055D76E /* 一键订Debug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "一键订Debug.entitlements"; sourceTree = "<group>"; };
-		72544E7E2B592D7D00A1A4EF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = "<group>"; };
-		72544E7F2B592D7E00A1A4EF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
-		728D93632B1DBD6C00EFD19A /* tts_voice.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_voice.caf; sourceTree = "<group>"; };
-		728D93642B1DBD6C00EFD19A /* tts_deposit.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_deposit.caf; sourceTree = "<group>"; };
-		728D93652B1DBD6C00EFD19A /* tts_wine_remind.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_wine_remind.caf; sourceTree = "<group>"; };
-		728D93662B1DBD6C00EFD19A /* tts_recharge.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_recharge.caf; sourceTree = "<group>"; };
-		728D93672B1DBD6D00EFD19A /* tts_commemoration_day.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_commemoration_day.caf; sourceTree = "<group>"; };
-		72DFBB8C25BA6CBF00EE1E5D /* tts_cancel.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_cancel.caf; sourceTree = "<group>"; };
-		72DFBB8D25BA6CBF00EE1E5D /* tts_pay.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_pay.caf; sourceTree = "<group>"; };
-		72DFBB8E25BA6CBF00EE1E5D /* tts_new.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_new.caf; sourceTree = "<group>"; };
-		72DFBB8F25BA6CBF00EE1E5D /* tts_online.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_online.caf; sourceTree = "<group>"; };
-		72DFBB9125BA6CBF00EE1E5D /* tts_pre_pay.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_pre_pay.caf; sourceTree = "<group>"; };
-		72DFBB9225BA6CBF00EE1E5D /* tts_order.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_order.caf; sourceTree = "<group>"; };
-		72DFBB9325BA6CBF00EE1E5D /* tts_invoice.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_invoice.caf; sourceTree = "<group>"; };
-		72E2EB002B4E846E009FD712 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
+		5D2E701D6DE8C4040FECD4E8 /* Runner.entitlements */ = {isa = PBXFileReference; includeInIndex = 1; 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>"; };
@@ -76,10 +61,18 @@
 		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		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>"; };
+<<<<<<< HEAD
 		9F11082C59A1D00E83E0934D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		CC19436D18202E6CAD07F931 /* 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>"; };
 		EE6AF8FF2457DB720005E3B9 /* RunnerProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerProfile.entitlements; sourceTree = "<group>"; };
 		EE6AF9002457DC0C0005E3B9 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
+=======
+		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		B4E32EA6F002ADDE3266FC1B /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		C872893A1BAF0A487B493871 /* 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>"; };
+		DBDA9A3CA19A8342BD2C8436 /* 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>"; };
+		FEE980E99826EDF475284386 /* 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>"; };
+>>>>>>> v5.4.4+
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -87,31 +80,29 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				72E2EB012B4E847E009FD712 /* libsqlite3.tbd in Frameworks */,
-				A7F352227F0F121A53D9A543 /* Pods_Runner.framework in Frameworks */,
+				6BEC6C3B65B04502A3990DE7 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		5F6C37E5A77D3FF43D0DBCC2 /* Pods */ = {
+		1201D8FB0352809AD89E4634 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				22513BD076488FBD50F0303F /* Pods-Runner.debug.xcconfig */,
-				2DCAB49DF131E02F3BAF38E1 /* Pods-Runner.release.xcconfig */,
-				CC19436D18202E6CAD07F931 /* Pods-Runner.profile.xcconfig */,
+				C872893A1BAF0A487B493871 /* Pods-Runner.debug.xcconfig */,
+				DBDA9A3CA19A8342BD2C8436 /* Pods-Runner.release.xcconfig */,
+				FEE980E99826EDF475284386 /* Pods-Runner.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
 		};
-		8074F3926F79FEBA9CA1E157 /* Frameworks */ = {
+		331C8082294A63A400263BE5 /* RunnerTests */ = {
 			isa = PBXGroup;
 			children = (
-				72E2EB002B4E846E009FD712 /* libsqlite3.tbd */,
-				9F11082C59A1D00E83E0934D /* Pods_Runner.framework */,
+				331C807B294A618700263BE5 /* RunnerTests.swift */,
 			);
-			name = Frameworks;
+			path = RunnerTests;
 			sourceTree = "<group>";
 		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
@@ -128,24 +119,12 @@
 		97C146E51CF9000F007C117D = {
 			isa = PBXGroup;
 			children = (
-				720060DA25B9912C0014BE3B /* tts_all.caf */,
-				72DFBB8C25BA6CBF00EE1E5D /* tts_cancel.caf */,
-				72DFBB9325BA6CBF00EE1E5D /* tts_invoice.caf */,
-				72DFBB8E25BA6CBF00EE1E5D /* tts_new.caf */,
-				728D93672B1DBD6D00EFD19A /* tts_commemoration_day.caf */,
-				728D93642B1DBD6C00EFD19A /* tts_deposit.caf */,
-				728D93662B1DBD6C00EFD19A /* tts_recharge.caf */,
-				728D93632B1DBD6C00EFD19A /* tts_voice.caf */,
-				728D93652B1DBD6C00EFD19A /* tts_wine_remind.caf */,
-				72DFBB8F25BA6CBF00EE1E5D /* tts_online.caf */,
-				72DFBB9225BA6CBF00EE1E5D /* tts_order.caf */,
-				72DFBB8D25BA6CBF00EE1E5D /* tts_pay.caf */,
-				72DFBB9125BA6CBF00EE1E5D /* tts_pre_pay.caf */,
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
-				5F6C37E5A77D3FF43D0DBCC2 /* Pods */,
-				8074F3926F79FEBA9CA1E157 /* Frameworks */,
+				331C8082294A63A400263BE5 /* RunnerTests */,
+				1201D8FB0352809AD89E4634 /* Pods */,
+				CBA3FC8EF17C231CEC54AC20 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -153,6 +132,7 @@
 			isa = PBXGroup;
 			children = (
 				97C146EE1CF9000F007C117D /* Runner.app */,
+				331C8081294A63A400263BE5 /* RunnerTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -160,45 +140,65 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
-				7206E2DB26200F770055D76E /* 一键订Debug.entitlements */,
-				EE6AF9002457DC0C0005E3B9 /* Runner.entitlements */,
-				EE6AF8FF2457DB720005E3B9 /* RunnerProfile.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
+<<<<<<< HEAD
 				0771EF012D141AE300148DB8 /* Info.plist */,
 				97C146F11CF9000F007C117D /* Supporting Files */,
+=======
+				97C147021CF9000F007C117D /* Info.plist */,
+>>>>>>> v5.4.4+
 				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
 				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
 				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
 				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
+				5D2E701D6DE8C4040FECD4E8 /* Runner.entitlements */,
 			);
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		97C146F11CF9000F007C117D /* Supporting Files */ = {
+		CBA3FC8EF17C231CEC54AC20 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				B4E32EA6F002ADDE3266FC1B /* Pods_Runner.framework */,
 			);
-			name = "Supporting Files";
+			name = Frameworks;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
+		331C8080294A63A400263BE5 /* RunnerTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
+			buildPhases = (
+				331C807D294A63A400263BE5 /* Sources */,
+				331C807F294A63A400263BE5 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				331C8086294A63A400263BE5 /* PBXTargetDependency */,
+			);
+			name = RunnerTests;
+			productName = RunnerTests;
+			productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 		97C146ED1CF9000F007C117D /* Runner */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				9C09FB22D919B3DDAB7B4DE4 /* [CP] Check Pods Manifest.lock */,
+				9D6E6C8DDD2621BB8784B52B /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				9B9871E299FA5648CFE77D1A /* [CP] Embed Pods Frameworks */,
-				FE822B5E2C661DC46807EEC9 /* [CP] Copy Pods Resources */,
+				54CC91170D6A8CE2A0114D6E /* [CP] Embed Pods Frameworks */,
+				8D6BE64BCA50732C7F2DB851 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -215,25 +215,27 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
-				ORGANIZATIONNAME = "The Chromium Authors";
+				BuildIndependentTargetsInParallel = YES;
+				LastUpgradeCheck = 1510;
+				ORGANIZATIONNAME = "";
 				TargetAttributes = {
+					331C8080294A63A400263BE5 = {
+						CreatedOnToolsVersion = 14.0;
+						TestTargetID = 97C146ED1CF9000F007C117D;
+					};
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
-						DevelopmentTeam = 8J59HM8B82;
 						LastSwiftMigration = 1100;
-						ProvisioningStyle = Automatic;
 					};
 				};
 			};
 			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 9.3";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				Base,
-				"zh-Hans",
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
@@ -241,28 +243,23 @@
 			projectRoot = "";
 			targets = (
 				97C146ED1CF9000F007C117D /* Runner */,
+				331C8080294A63A400263BE5 /* RunnerTests */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
+		331C807F294A63A400263BE5 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		97C146EC1CF9000F007C117D /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				72DFBB9425BA6CD700EE1E5D /* tts_all.caf in Resources */,
-				728D936A2B1DBD6D00EFD19A /* tts_wine_remind.caf in Resources */,
-				728D93682B1DBD6D00EFD19A /* tts_voice.caf in Resources */,
-				728D936B2B1DBD6D00EFD19A /* tts_recharge.caf in Resources */,
-				72DFBB9525BA6CD700EE1E5D /* tts_cancel.caf in Resources */,
-				72DFBB9625BA6CD700EE1E5D /* tts_invoice.caf in Resources */,
-				72DFBB9725BA6CD700EE1E5D /* tts_new.caf in Resources */,
-				72DFBB9825BA6CD700EE1E5D /* tts_online.caf in Resources */,
-				728D936C2B1DBD6D00EFD19A /* tts_commemoration_day.caf in Resources */,
-				72DFBB9925BA6CD700EE1E5D /* tts_order.caf in Resources */,
-				72DFBB9A25BA6CD700EE1E5D /* tts_pay.caf in Resources */,
-				72DFBB9B25BA6CD700EE1E5D /* tts_pre_pay.caf in Resources */,
-				728D93692B1DBD6D00EFD19A /* tts_deposit.caf in Resources */,
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
@@ -275,10 +272,12 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -287,8 +286,43 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
 		};
+		54CC91170D6A8CE2A0114D6E /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${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";
+			showEnvVarsInLog = 0;
+		};
+		8D6BE64BCA50732C7F2DB851 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${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";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -301,6 +335,7 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
+<<<<<<< HEAD
 		9B9871E299FA5648CFE77D1A /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -414,6 +449,9 @@
 			showEnvVarsInLog = 0;
 		};
 		9C09FB22D919B3DDAB7B4DE4 /* [CP] Check Pods Manifest.lock */ = {
+=======
+		9D6E6C8DDD2621BB8784B52B /* [CP] Check Pods Manifest.lock */ = {
+>>>>>>> v5.4.4+
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -435,6 +473,7 @@
 			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;
 		};
+<<<<<<< HEAD
 		FE822B5E2C661DC46807EEC9 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -455,9 +494,19 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+=======
+>>>>>>> v5.4.4+
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+		331C807D294A63A400263BE5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		97C146EA1CF9000F007C117D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -469,12 +518,19 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 97C146ED1CF9000F007C117D /* Runner */;
+			targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin PBXVariantGroup section */
 		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
 				97C146FB1CF9000F007C117D /* Base */,
-				72544E7E2B592D7D00A1A4EF /* zh-Hans */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
@@ -483,7 +539,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				97C147001CF9000F007C117D /* Base */,
-				72544E7F2B592D7E00A1A4EF /* zh-Hans */,
 			);
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
@@ -495,7 +550,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -520,12 +575,12 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -534,9 +589,8 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile";
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -548,50 +602,88 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 542;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CURRENT_PROJECT_VERSION = 5503;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
-				FLUTTER_BUILD_MODE = release;
-				FLUTTER_ROOT = /Users/naji2021/Documents/flutter;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
-				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
+					"@executable_path/Frameworks",
 				);
 <<<<<<< HEAD
+<<<<<<< HEAD
 				MARKETING_VERSION = 6.0.0;
 =======
 				MARKETING_VERSION = 5.4.3;
 >>>>>>> 58718afe (预订安排页人数变更修改)
 				PODS_ROOT = "$(inherited)";
+=======
+				MARKETING_VERSION = 5.5.0;
+>>>>>>> v5.4.4+
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
-				PRODUCT_NAME = Runner;
-				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_ENABLE_BATCH_MODE = NO;
+				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
-				VALID_ARCHS = "$(inherited)";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Profile;
 		};
+		331C8088294A63A400263BE5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterReserveapp.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Debug;
+		};
+		331C8089294A63A400263BE5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterReserveapp.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Release;
+		};
+		331C808A294A63A400263BE5 /* Profile */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterReserveapp.RunnerTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
+			};
+			name = Profile;
+		};
 		97C147031CF9000F007C117D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -616,12 +708,12 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "Apple Development: 冬妮 王 (HK623XJ482)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: 冬妮 王 (HK623XJ482)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -636,10 +728,9 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -649,7 +740,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -674,12 +765,12 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "Apple Development: 冬妮 王 (HK623XJ482)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: 冬妮 王 (HK623XJ482)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -688,12 +779,12 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile";
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -701,17 +792,15 @@
 		};
 		97C147061CF9000F007C117D /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 22513BD076488FBD50F0303F /* Pods-Runner.debug.xcconfig */;
+			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 542;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
+				CURRENT_PROJECT_VERSION = 5503;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
+<<<<<<< HEAD
 				FLUTTER_BUILD_MODE = debug;
 				FLUTTER_ROOT = /Users/naji2021/Documents/flutter;
 				FLUTTER_TARGET = "/Users/naji2021/Desktop/Flutter-ReserveApp/lib/main.dart";
@@ -719,28 +808,30 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
+=======
+>>>>>>> v5.4.4+
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
+					"@executable_path/Frameworks",
 				);
 <<<<<<< HEAD
+<<<<<<< HEAD
 				MARKETING_VERSION = 6.0.0;
 =======
 				MARKETING_VERSION = 5.4.3;
 >>>>>>> 58718afe (预订安排页人数变更修改)
 				PACKAGE_CONFIG = "/Users/naji2021/Desktop/Flutter-ReserveApp/.dart_tool/package_config.json";
 				PODS_ROOT = "$(inherited)";
+=======
+				MARKETING_VERSION = 5.5.0;
+>>>>>>> v5.4.4+
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
-				PRODUCT_NAME = Runner;
-				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_ENABLE_BATCH_MODE = NO;
+				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				VALID_ARCHS = "$(inherited)";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -749,41 +840,32 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 542;
+				CURRENT_PROJECT_VERSION = 5503;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
-				FLUTTER_BUILD_MODE = release;
-				FLUTTER_ROOT = /Users/naji2021/Documents/flutter;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
-				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
+					"@executable_path/Frameworks",
 				);
 <<<<<<< HEAD
+<<<<<<< HEAD
 				MARKETING_VERSION = 6.0.0;
 =======
 				MARKETING_VERSION = 5.4.3;
 >>>>>>> 58718afe (预订安排页人数变更修改)
 				PODS_ROOT = "$(inherited)";
+=======
+				MARKETING_VERSION = 5.5.0;
+>>>>>>> v5.4.4+
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
-				PRODUCT_NAME = Runner;
-				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_ENABLE_BATCH_MODE = NO;
+				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
-				VALID_ARCHS = "$(inherited)";
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;
@@ -791,6 +873,16 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				331C8088294A63A400263BE5 /* Debug */,
+				331C8089294A63A400263BE5 /* Release */,
+				331C808A294A63A400263BE5 /* Profile */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,6 +37,17 @@
          </BuildableReference>
       </MacroExpansion>
       <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "331C8080294A63A400263BE5"
+               BuildableName = "RunnerTests.xctest"
+               BlueprintName = "RunnerTests"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -48,6 +59,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

@@ -3,7 +3,7 @@ import Flutter
 import flutter_downloader
 import GoogleMaps
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file

@@ -2,12 +2,15 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+<<<<<<< HEAD
     <!-- <key>NSBonjourServices</key>
 	<string>_dartobservatory._tcp</string> -->
 	<key>LSSupportsOpeningDocumentsInPlace</key>
 	<true/>
 	<key>UIFileSharingEnabled</key>
 	<true/>
+=======
+>>>>>>> v5.4.4+
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 	<key>CFBundleAllowMixedLocalizations</key>
@@ -19,7 +22,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.naji.reserveLine</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -33,20 +36,20 @@
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
+			<key>CFBundleURLName</key>
+			<string>main</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>wwbdca186ec4257973</string>
 			</array>
-			<key>CFBundleURLName</key>
-			<string>main</string>
 		</dict>
 		<dict>
+			<key>CFBundleURLName</key>
+			<string>main</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>wwauthbdca186ec4257973000006</string>
 			</array>
-			<key>CFBundleURLName</key>
-			<string>main</string>
 		</dict>
 		<dict>
 			<key>CFBundleTypeRole</key>
@@ -72,18 +75,23 @@
 		<string>weixin</string>
 		<string>iosamap</string>
 		<string>amapuri</string>
+<<<<<<< HEAD
 		<string>whatsapp</string>
+=======
+		<string>weixinURLParamsAPI</string>
+>>>>>>> v5.4.4+
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>LSSupportsOpeningDocumentsInPlace</key>
+	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
+		<key>NSAllowsArbitraryLoadsInWebContent</key>
+		<true/>
 	</dict>
-	
-	<key>NSMicrophoneUsageDescription</key>
-	<string>需要您的同意,APP才能使用您的麦克风来录制店铺视频介绍</string>
 	<key>NSAppleMusicUsageDescription</key>
 	<string>需要您的同意,APP才能访问媒体资料库</string>
 	<key>NSCalendarsUsageDescription</key>
@@ -94,21 +102,30 @@
 	<string>允许访问您的通讯录来一键录入联系人</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>需要您的同意,APP才能在创建店铺时选择店铺位置</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>需要您的同意,APP才能使用您的麦克风来录制店铺视频介绍</string>
 	<key>NSMotionUsageDescription</key>
 	<string>需要您的同意,APP才能访问运动与健身</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>需要您的同意,APP才能访问您的相册来上传消费清单</string>
 	<key>NSSpeechRecognitionUsageDescription</key>
 	<string>需要您的同意,APP才能访问语音识别</string>
+<<<<<<< HEAD
 		<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
 	<string>需要您的同意,APP才能在创建店铺时选择店铺位置</string>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>需要您的同意,APP才能在创建店铺时选择店铺位置</string>
+=======
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+>>>>>>> v5.4.4+
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>fetch</string>
 		<string>remote-notification</string>
 	</array>
+	<key>UIFileSharingEnabled</key>
+	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>aps-environment</key>
-	<string>development</string>
-	<key>com.apple.developer.applesignin</key>
-	<array>
-		<string>Default</string>
-	</array>
-	<key>com.apple.developer.associated-domains</key>
-	<array>
-		<string>applinks:xt04.colorcun.com</string>
-	</array>
-</dict>
+<dict/>
 </plist>

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>aps-environment</key>
-	<string>development</string>
-	<key>com.apple.developer.applesignin</key>
-	<array>
-		<string>Default</string>
-	</array>
-	<key>com.apple.developer.associated-domains</key>
-	<array>
-		<string>applinks:xt04.colorcun.com</string>
-	</array>
-</dict>
-</plist>

+import Flutter
+import UIKit
+import XCTest
+
+class RunnerTests: XCTestCase {
+
+  func testExample() {
+    // If you add code to the Runner application, consider adding tests here.
+    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
+  }
+
+}

- extern const unsigned char RunnerVersionString[];
- extern const double RunnerVersionNumber;
-
- const unsigned char RunnerVersionString[] __attribute__ ((used)) = "@(#)PROGRAM:Runner  PROJECT:Runner-393" "\n";
- const double RunnerVersionNumber __attribute__ ((used)) = (double)393.;

-{"":{"diagnostics":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/Runner-master.dia","swift-dependencies":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/Runner-master.swiftdeps"},"/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift":{"dependencies":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/AppDelegate.d","diagnostics":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/AppDelegate.dia","index-unit-output-path":"/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/AppDelegate.o","llvm-bc":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/AppDelegate.bc","object":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/AppDelegate.o","swift-dependencies":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/AppDelegate.swiftdeps","swiftmodule":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/arm64/AppDelegate~partial.swiftmodule"}}
\ No newline at end of file

-version: "Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)"
-options: "31d1359b39fa124baf9b86a743115137d852f39fd379aa67ceb7d199d1a118f3"
-build_start_time: [1662690689, 518762111]
-build_end_time: [1662690689, 623396873]
-inputs:
-  "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift": !private [1626855519, 779936790]

-version: "Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)"
-options: "31d1359b39fa124baf9b86a743115137d852f39fd379aa67ceb7d199d1a118f3"
-build_start_time: [1662690146, 218652009]
-build_end_time: [1662690146, 534229040]
-inputs:
-  "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift": !private [1626855519, 779936790]

-/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift

-{"":{"diagnostics":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/Runner-master.dia","swift-dependencies":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/Runner-master.swiftdeps"},"/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift":{"dependencies":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/AppDelegate.d","diagnostics":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/AppDelegate.dia","index-unit-output-path":"/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/AppDelegate.o","llvm-bc":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/AppDelegate.bc","object":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/AppDelegate.o","swift-dependencies":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/AppDelegate.swiftdeps","swiftmodule":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphoneos/Runner.build/Objects-normal/armv7/AppDelegate~partial.swiftmodule"}}
\ No newline at end of file

-version: "Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)"
-options: "31d1359b39fa124baf9b86a743115137d852f39fd379aa67ceb7d199d1a118f3"
-build_start_time: [1662690277, 307630062]
-build_end_time: [1662690277, 474601030]
-inputs:
-  "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift": !private [1626855519, 779936790]

-/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift

-#!/bin/sh
-diff "${PODS_PODFILE_DIR_PATH}/Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
-if [ $? != 0 ] ; then
-    # print error to STDERR
-    echo "error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation." >&2
-    exit 1
-fi
-# This output is used by Xcode 'outputs' to avoid re-running this script phase.
-echo "SUCCESS" > "${SCRIPT_OUTPUT_FILE_0}"
-

-{"case-sensitive":"false","roots":[],"version":0}
\ No newline at end of file

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>application-identifier</key>
-	<string>8J59HM8B82.com.naji.reserveLine</string>
-	<key>aps-environment</key>
-	<string>development</string>
-	<key>com.apple.developer.applesignin</key>
-	<array>
-		<string>Default</string>
-	</array>
-	<key>com.apple.developer.associated-domains</key>
-	<array>
-		<string>applinks:xt04.colorcun.com</string>
-	</array>
-</dict>
-</plist>

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.security.get-task-allow</key>
-	<true/>
-</dict>
-</plist>

- extern const unsigned char RunnerVersionString[];
- extern const double RunnerVersionNumber;
-
- const unsigned char RunnerVersionString[] __attribute__ ((used)) = "@(#)PROGRAM:Runner  PROJECT:Runner-393" "\n";
- const double RunnerVersionNumber __attribute__ ((used)) = (double)393.;

-{"":{"diagnostics":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphonesimulator/Runner.build/Objects-normal/x86_64/Runner-master.dia","swift-dependencies":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphonesimulator/Runner.build/Objects-normal/x86_64/Runner-master.swiftdeps"},"/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift":{"dependencies":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphonesimulator/Runner.build/Objects-normal/x86_64/AppDelegate.d","diagnostics":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphonesimulator/Runner.build/Objects-normal/x86_64/AppDelegate.dia","index-unit-output-path":"/Runner.build/Debug-iphonesimulator/Runner.build/Objects-normal/x86_64/AppDelegate.o","llvm-bc":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphonesimulator/Runner.build/Objects-normal/x86_64/AppDelegate.bc","object":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphonesimulator/Runner.build/Objects-normal/x86_64/AppDelegate.o","swift-dependencies":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphonesimulator/Runner.build/Objects-normal/x86_64/AppDelegate.swiftdeps","swiftmodule":"/Users/wangdongni/Desktop/oneKey_wdn/ios/build/Runner.build/Debug-iphonesimulator/Runner.build/Objects-normal/x86_64/AppDelegate~partial.swiftmodule"}}
\ No newline at end of file

-version: "Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)"
-options: "31d1359b39fa124baf9b86a743115137d852f39fd379aa67ceb7d199d1a118f3"
-build_start_time: [1662689681, 339809894]
-build_end_time: [1662689681, 450616836]
-inputs:
-  "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift": !private [1626855519, 779936790]

-/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>application-identifier</key>
-	<string>8J59HM8B82.com.naji.reserveLine</string>
-	<key>aps-environment</key>
-	<string>development</string>
-	<key>com.apple.developer.applesignin</key>
-	<array>
-		<string>Default</string>
-	</array>
-	<key>com.apple.developer.associated-domains</key>
-	<array>
-		<string>applinks:xt04.colorcun.com</string>
-	</array>
-</dict>
-</plist>

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.security.get-task-allow</key>
-	<true/>
-</dict>
-</plist>

-#!/bin/sh
-diff "${PODS_PODFILE_DIR_PATH}/Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
-if [ $? != 0 ] ; then
-    # print error to STDERR
-    echo "error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation." >&2
-    exit 1
-fi
-# This output is used by Xcode 'outputs' to avoid re-running this script phase.
-echo "SUCCESS" > "${SCRIPT_OUTPUT_FILE_0}"
-

-{"case-sensitive":"false","roots":[],"version":0}
\ No newline at end of file

-{
-  "_buildCommand2" : {
-    "command" : "prepareForIndexing",
-    "enableIndexBuildArena" : false,
-    "targets" : null
-  },
-  "buildCommand" : "build",
-  "configuredTargets" : [
-    {
-      "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
-    }
-  ],
-  "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
-  "continueBuildingAfterErrors" : true,
-  "enableIndexBuildArena" : false,
-  "hideShellScriptEnvironment" : false,
-  "parameters" : {
-    "action" : "build",
-    "activeArchitecture" : "arm64e",
-    "activeRunDestination" : {
-      "disableOnlyActiveArch" : true,
-      "platform" : "iphoneos",
-      "sdk" : "iphoneos15.5",
-      "sdkVariant" : "iphoneos",
-      "supportedArchitectures" : [
-        "armv4t",
-        "armv5",
-        "armv6",
-        "armv7",
-        "armv7f",
-        "armv7s",
-        "armv7k",
-        "arm64",
-        "arm64e"
-      ],
-      "targetArchitecture" : "arm64e"
-    },
-    "arenaInfo" : {
-      "buildIntermediatesPath" : "",
-      "buildProductsPath" : "",
-      "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
-      "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
-      "indexEnableDataStore" : true,
-      "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
-      "pchPath" : ""
-    },
-    "configurationName" : "Debug",
-    "overrides" : {
-      "synthesized" : {
-        "table" : {
-          "ENABLE_PREVIEWS" : "NO"
-        }
-      }
-    }
-  },
-  "qos" : "default",
-  "schemeCommand" : "launch",
-  "schemeCommand2" : "launch",
-  "shouldCollectMetrics" : false,
-  "showNonLoggedProgress" : true,
-  "useDryRun" : true,
-  "useImplicitDependencies" : true,
-  "useLegacyBuildLocations" : false,
-  "useParallelTargets" : true
-}
\ No newline at end of file

-Target dependency graph (1 target)
-Runner in Runner, no dependencies
\ No newline at end of file

-{
-  "_buildCommand2" : {
-    "command" : "prepareForIndexing",
-    "enableIndexBuildArena" : false,
-    "targets" : null
-  },
-  "buildCommand" : "build",
-  "configuredTargets" : [
-    {
-      "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
-    }
-  ],
-  "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
-  "continueBuildingAfterErrors" : true,
-  "enableIndexBuildArena" : false,
-  "hideShellScriptEnvironment" : false,
-  "parameters" : {
-    "action" : "build",
-    "activeArchitecture" : "arm64",
-    "activeRunDestination" : {
-      "disableOnlyActiveArch" : false,
-      "platform" : "iphoneos",
-      "sdk" : "iphoneos15.5",
-      "sdkVariant" : "iphoneos",
-      "supportedArchitectures" : [
-        "arm64e",
-        "arm64v8",
-        "arm64",
-        "armv8"
-      ],
-      "targetArchitecture" : "arm64"
-    },
-    "arenaInfo" : {
-      "buildIntermediatesPath" : "",
-      "buildProductsPath" : "",
-      "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
-      "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
-      "indexEnableDataStore" : true,
-      "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
-      "pchPath" : ""
-    },
-    "configurationName" : "Debug",
-    "overrides" : {
-      "synthesized" : {
-        "table" : {
-          "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone12,8",
-          "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "14.4.2",
-          "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
-          "ENABLE_PREVIEWS" : "NO",
-          "TARGET_DEVICE_IDENTIFIER" : "00008030-000640322103802E",
-          "TARGET_DEVICE_MODEL" : "iPhone12,8",
-          "TARGET_DEVICE_OS_VERSION" : "14.4.2",
-          "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
-        }
-      }
-    }
-  },
-  "schemeCommand" : "launch",
-  "schemeCommand2" : "launch",
-  "shouldCollectMetrics" : false,
-  "showNonLoggedProgress" : true,
-  "useDryRun" : false,
-  "useImplicitDependencies" : true,
-  "useLegacyBuildLocations" : false,
-  "useParallelTargets" : true
-}
\ No newline at end of file

-Target dependency graph (1 target)
-Runner in Runner, no dependencies
\ No newline at end of file

-{
-  "_buildCommand2" : {
-    "command" : "prepareForIndexing",
-    "enableIndexBuildArena" : false,
-    "targets" : null
-  },
-  "buildCommand" : "build",
-  "configuredTargets" : [
-    {
-      "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
-    }
-  ],
-  "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
-  "continueBuildingAfterErrors" : true,
-  "enableIndexBuildArena" : false,
-  "hideShellScriptEnvironment" : false,
-  "parameters" : {
-    "action" : "build",
-    "activeArchitecture" : "arm64",
-    "activeRunDestination" : {
-      "disableOnlyActiveArch" : false,
-      "platform" : "iphoneos",
-      "sdk" : "iphoneos15.5",
-      "sdkVariant" : "iphoneos",
-      "supportedArchitectures" : [
-        "arm64e",
-        "arm64v8",
-        "arm64",
-        "armv8"
-      ],
-      "targetArchitecture" : "arm64"
-    },
-    "arenaInfo" : {
-      "buildIntermediatesPath" : "",
-      "buildProductsPath" : "",
-      "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
-      "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
-      "indexEnableDataStore" : true,
-      "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
-      "pchPath" : ""
-    },
-    "configurationName" : "Debug",
-    "overrides" : {
-      "synthesized" : {
-        "table" : {
-          "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone12,8",
-          "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "14.4.2",
-          "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
-          "ENABLE_PREVIEWS" : "NO",
-          "TARGET_DEVICE_IDENTIFIER" : "00008030-000640322103802E",
-          "TARGET_DEVICE_MODEL" : "iPhone12,8",
-          "TARGET_DEVICE_OS_VERSION" : "14.4.2",
-          "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
-        }
-      }
-    }
-  },
-  "qos" : "default",
-  "schemeCommand" : "launch",
-  "schemeCommand2" : "launch",
-  "shouldCollectMetrics" : false,
-  "showNonLoggedProgress" : true,
-  "useDryRun" : true,
-  "useImplicitDependencies" : true,
-  "useLegacyBuildLocations" : false,
-  "useParallelTargets" : true
-}
\ No newline at end of file

-Target dependency graph (1 target)
-Runner in Runner, no dependencies
\ No newline at end of file

-{
-  "_buildCommand2" : {
-    "command" : "prepareForIndexing",
-    "enableIndexBuildArena" : false,
-    "targets" : null
-  },
-  "buildCommand" : "build",
-  "configuredTargets" : [
-    {
-      "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
-    }
-  ],
-  "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
-  "continueBuildingAfterErrors" : true,
-  "enableIndexBuildArena" : false,
-  "hideShellScriptEnvironment" : false,
-  "parameters" : {
-    "action" : "build",
-    "activeArchitecture" : "arm64",
-    "activeRunDestination" : {
-      "disableOnlyActiveArch" : false,
-      "platform" : "iphoneos",
-      "sdk" : "iphoneos15.5",
-      "sdkVariant" : "iphoneos",
-      "supportedArchitectures" : [
-        "arm64e",
-        "arm64v8",
-        "arm64",
-        "armv8"
-      ],
-      "targetArchitecture" : "arm64"
-    },
-    "arenaInfo" : {
-      "buildIntermediatesPath" : "",
-      "buildProductsPath" : "",
-      "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
-      "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
-      "indexEnableDataStore" : true,
-      "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
-      "pchPath" : ""
-    },
-    "configurationName" : "Debug",
-    "overrides" : {
-      "synthesized" : {
-        "table" : {
-          "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone12,8",
-          "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "14.4.2",
-          "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
-          "ENABLE_PREVIEWS" : "NO",
-          "TARGET_DEVICE_IDENTIFIER" : "00008030-000640322103802E",
-          "TARGET_DEVICE_MODEL" : "iPhone12,8",
-          "TARGET_DEVICE_OS_VERSION" : "14.4.2",
-          "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
-        }
-      }
-    }
-  },
-  "qos" : "default",
-  "schemeCommand" : "launch",
-  "schemeCommand2" : "launch",
-  "shouldCollectMetrics" : false,
-  "showNonLoggedProgress" : true,
-  "useDryRun" : true,
-  "useImplicitDependencies" : true,
-  "useLegacyBuildLocations" : false,
-  "useParallelTargets" : true
-}
\ No newline at end of file

-Target dependency graph (1 target)
-Runner in Runner, no dependencies
\ No newline at end of file

-{
-  "_buildCommand2" : {
-    "command" : "prepareForIndexing",
-    "enableIndexBuildArena" : false,
-    "targets" : null
-  },
-  "buildCommand" : "build",
-  "configuredTargets" : [
-    {
-      "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
-    }
-  ],
-  "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
-  "continueBuildingAfterErrors" : true,
-  "enableIndexBuildArena" : false,
-  "hideShellScriptEnvironment" : false,
-  "parameters" : {
-    "action" : "build",
-    "activeArchitecture" : "arm64",
-    "activeRunDestination" : {
-      "disableOnlyActiveArch" : false,
-      "platform" : "iphoneos",
-      "sdk" : "iphoneos15.5",
-      "sdkVariant" : "iphoneos",
-      "supportedArchitectures" : [
-        "arm64v8",
-        "arm64",
-        "armv8"
-      ],
-      "targetArchitecture" : "arm64"
-    },
-    "arenaInfo" : {
-      "buildIntermediatesPath" : "",
-      "buildProductsPath" : "",
-      "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
-      "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
-      "indexEnableDataStore" : true,
-      "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
-      "pchPath" : ""
-    },
-    "configurationName" : "Debug",
-    "overrides" : {
-      "synthesized" : {
-        "table" : {
-          "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone10,2",
-          "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "13.6",
-          "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
-          "ENABLE_PREVIEWS" : "NO",
-          "TARGET_DEVICE_IDENTIFIER" : "fe000909aeb9328b501332bf921126c213f1c4a4",
-          "TARGET_DEVICE_MODEL" : "iPhone10,2",
-          "TARGET_DEVICE_OS_VERSION" : "13.6",
-          "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
-        }
-      }
-    }
-  },
-  "schemeCommand" : "launch",
-  "schemeCommand2" : "launch",
-  "shouldCollectMetrics" : false,
-  "showNonLoggedProgress" : true,
-  "useDryRun" : false,
-  "useImplicitDependencies" : true,
-  "useLegacyBuildLocations" : false,
-  "useParallelTargets" : true
-}
\ No newline at end of file

-Target dependency graph (1 target)
-Runner in Runner, no dependencies
\ No newline at end of file

-{
-  "_buildCommand2" : {
-    "command" : "prepareForIndexing",
-    "enableIndexBuildArena" : false,
-    "targets" : null
-  },
-  "buildCommand" : "build",
-  "configuredTargets" : [
-    {
-      "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"
-    }
-  ],
-  "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",
-  "continueBuildingAfterErrors" : true,
-  "enableIndexBuildArena" : false,
-  "hideShellScriptEnvironment" : false,
-  "parameters" : {
-    "action" : "build",
-    "activeArchitecture" : "arm64",
-    "activeRunDestination" : {
-      "disableOnlyActiveArch" : false,
-      "platform" : "iphoneos",
-      "sdk" : "iphoneos15.5",
-      "sdkVariant" : "iphoneos",
-      "supportedArchitectures" : [
-        "arm64v8",
-        "arm64",
-        "armv8"
-      ],
-      "targetArchitecture" : "arm64"
-    },
-    "arenaInfo" : {
-      "buildIntermediatesPath" : "",
-      "buildProductsPath" : "",
-      "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",
-      "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",
-      "indexEnableDataStore" : true,
-      "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",
-      "pchPath" : ""
-    },
-    "configurationName" : "Debug",
-    "overrides" : {
-      "synthesized" : {
-        "table" : {
-          "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone10,2",
-          "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "13.6",
-          "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",
-          "ENABLE_PREVIEWS" : "NO",
-          "TARGET_DEVICE_IDENTIFIER" : "fe000909aeb9328b501332bf921126c213f1c4a4",
-          "TARGET_DEVICE_MODEL" : "iPhone10,2",
-          "TARGET_DEVICE_OS_VERSION" : "13.6",
-          "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"
-        }
-      }
-    }
-  },
-  "qos" : "default",
-  "schemeCommand" : "launch",
-  "schemeCommand2" : "launch",
-  "shouldCollectMetrics" : false,
-  "showNonLoggedProgress" : true,
-  "useDryRun" : true,
-  "useImplicitDependencies" : true,
-  "useLegacyBuildLocations" : false,
-  "useParallelTargets" : true
-}
\ No newline at end of file