xt / Flutter-ReserveApp · Commits

Go to a project

Commit 488e285891c1fd5449c7dfc9f81c41f95ca147cc

Authored by wdn127929
2 parents 60346bab ecb5506c

部分修改

Inline Side-by-side
Showing 100 changed files with 458 additions and 829 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 100+ files are displayed.

  1 +
  2 +
1 def localProperties = new Properties() 3 def localProperties = new Properties()
2 def localPropertiesFile = rootProject.file('local.properties') 4 def localPropertiesFile = rootProject.file('local.properties')
3 if (localPropertiesFile.exists()) { 5 if (localPropertiesFile.exists()) {
@@ -59,6 +61,7 @@ android { @@ -59,6 +61,7 @@ android {
59 61
60 main { jniLibs.srcDirs = ['libs'] } 62 main { jniLibs.srcDirs = ['libs'] }
61 } 63 }
  64 +
62 65
63 lintOptions { 66 lintOptions {
64 disable 'InvalidPackage' 67 disable 'InvalidPackage'
@@ -73,7 +76,7 @@ android { @@ -73,7 +76,7 @@ android {
73 defaultConfig { 76 defaultConfig {
74 // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). 77 // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
75 applicationId "com.naji.one_key" 78 applicationId "com.naji.one_key"
76 - minSdkVersion 21 79 + minSdkVersion 24
77 targetSdkVersion 30 80 targetSdkVersion 30
78 versionCode flutterVersionCode.toInteger() 81 versionCode flutterVersionCode.toInteger()
79 versionName flutterVersionName 82 versionName flutterVersionName
@@ -81,6 +84,7 @@ android { @@ -81,6 +84,7 @@ android {
81 84
82 ndk { 85 ndk {
83 //选择要添加的对应 cpu 类型的 .so 库。 86 //选择要添加的对应 cpu 类型的 .so 库。
  87 + // abiFilters 'arm64-v8a', 'x86_64', 'mips64' //魅族64位，不支持32位
84 abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64' 88 abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64'
85 } 89 }
86 90
@@ -175,3 +179,4 @@ dependencies { @@ -175,3 +179,4 @@ dependencies {
175 implementation 'com.github.bumptech.glide:glide:4.11.0' 179 implementation 'com.github.bumptech.glide:glide:4.11.0'
176 annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' 180 annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
177 } 181 }
  182 +
@@ -9,6 +9,11 @@ @@ -9,6 +9,11 @@
9 -keep class com.tencent.bigdata.baseapi.** {*;} 9 -keep class com.tencent.bigdata.baseapi.** {*;}
10 -keep class com.tencent.bigdata.mqttchannel.** {*;} 10 -keep class com.tencent.bigdata.mqttchannel.** {*;}
11 11
  12 +-keep class com.tencent.tpns.baseapi.** {*;}
  13 +
  14 +
  15 +
  16 +
12 #-ignorewarning 17 #-ignorewarning
13 -keepattributes *Annotation* 18 -keepattributes *Annotation*
14 -keepattributes Exceptions 19 -keepattributes Exceptions
1 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 1 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
2 xmlns:tools="http://schemas.android.com/tools" 2 xmlns:tools="http://schemas.android.com/tools"
3 - package="com.naji.one_key"> 3 + package="com.naji.one_key"
  4 + >
4 <!-- io.flutter.app.FlutterApplication is an android.app.Application that 5 <!-- io.flutter.app.FlutterApplication is an android.app.Application that
5 calls FlutterMain.startInitialization(this); in its onCreate method. 6 calls FlutterMain.startInitialization(this); in its onCreate method.
6 In most cases you can leave this as-is, but you if you want to provide 7 In most cases you can leave this as-is, but you if you want to provide
@@ -32,6 +33,8 @@ @@ -32,6 +33,8 @@
32 android:requestLegacyExternalStorage="true" 33 android:requestLegacyExternalStorage="true"
33 android:preserveLegacyExternalStorage="true" 34 android:preserveLegacyExternalStorage="true"
34 android:allowNativeHeapPointerTagging="false" 35 android:allowNativeHeapPointerTagging="false"
  36 + android:extractNativeLibs="true"
  37 +
35 > 38 >
36 39
37 <activity 40 <activity
  1 +
  2 +
1 buildscript { 3 buildscript {
2 // ext.kotlin_version = '1.3.50' 4 // ext.kotlin_version = '1.3.50'
3 // ext.kotlin_version = '1.9.24' 5 // ext.kotlin_version = '1.9.24'
@@ -9,6 +11,7 @@ ext.kotlin_version = '1.8.22' @@ -9,6 +11,7 @@ ext.kotlin_version = '1.8.22'
9 11
10 // ext.kotlin_version = '1.4.32' 12 // ext.kotlin_version = '1.4.32'
11 repositories { 13 repositories {
  14 + mavenCentral()
12 google() 15 google()
13 jcenter() 16 jcenter()
14 17
@@ -40,6 +43,7 @@ maven{ @@ -40,6 +43,7 @@ maven{
40 43
41 allprojects { 44 allprojects {
42 repositories { 45 repositories {
  46 + mavenCentral()
43 google() 47 google()
44 jcenter() 48 jcenter()
45 49
@@ -59,6 +63,9 @@ maven{ @@ -59,6 +63,9 @@ maven{
59 } 63 }
60 64
61 rootProject.buildDir = '../build' 65 rootProject.buildDir = '../build'
  66 +// subprojects{
  67 +// project.abiFilters.android.compileSdkVersion 34
  68 +// }
62 subprojects { 69 subprojects {
63 project.buildDir = "${rootProject.buildDir}/${project.name}" 70 project.buildDir = "${rootProject.buildDir}/${project.name}"
64 } 71 }
@@ -77,6 +84,7 @@ subprojects { @@ -77,6 +84,7 @@ subprojects {
77 } 84 }
78 } 85 }
79 86
80 -task clean(type: Delete) { 87 +tasks.register("clean", Delete) {
81 delete rootProject.buildDir 88 delete rootProject.buildDir
82 } 89 }
  90 +
@@ -4,5 +4,4 @@ distributionPath=wrapper/dists @@ -4,5 +4,4 @@ distributionPath=wrapper/dists
4 # distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip 4 # distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
5 distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip 5 distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
6 zipStoreBase=GRADLE_USER_HOME 6 zipStoreBase=GRADLE_USER_HOME
7 -zipStorePath=wrapper/dists  
8 - 7 +zipStorePath=wrapper/dists
  1 +**/dgph
1 *.mode1v3 2 *.mode1v3
2 *.mode2v3 3 *.mode2v3
3 *.moved-aside 4 *.moved-aside
@@ -18,6 +19,7 @@ Flutter/App.framework @@ -18,6 +19,7 @@ Flutter/App.framework
18 Flutter/Flutter.framework 19 Flutter/Flutter.framework
19 Flutter/Flutter.podspec 20 Flutter/Flutter.podspec
20 Flutter/Generated.xcconfig 21 Flutter/Generated.xcconfig
  22 +Flutter/ephemeral/
21 Flutter/app.flx 23 Flutter/app.flx
22 Flutter/app.zip 24 Flutter/app.zip
23 Flutter/flutter_assets/ 25 Flutter/flutter_assets/
1 -0feb5fcd550157bc1a24916743cf7132  
@@ -2,25 +2,25 @@ @@ -2,25 +2,25 @@
2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> 2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 <plist version="1.0"> 3 <plist version="1.0">
4 <dict> 4 <dict>
5 - <key>CFBundleDevelopmentRegion</key>  
6 - <string>$(DEVELOPMENT_LANGUAGE)</string>  
7 - <key>CFBundleExecutable</key>  
8 - <string>App</string>  
9 - <key>CFBundleIdentifier</key>  
10 - <string>io.flutter.flutter.app</string>  
11 - <key>CFBundleInfoDictionaryVersion</key>  
12 - <string>6.0</string>  
13 - <key>CFBundleName</key>  
14 - <string>App</string>  
15 - <key>CFBundlePackageType</key>  
16 - <string>FMWK</string>  
17 - <key>CFBundleShortVersionString</key>  
18 - <string>1.0</string>  
19 - <key>CFBundleSignature</key>  
20 - <string>????</string>  
21 - <key>CFBundleVersion</key>  
22 - <string>1.0</string>  
23 - <key>MinimumOSVersion</key>  
24 - <string>11.0</string> 5 + <key>CFBundleDevelopmentRegion</key>
  6 + <string>en</string>
  7 + <key>CFBundleExecutable</key>
  8 + <string>App</string>
  9 + <key>CFBundleIdentifier</key>
  10 + <string>io.flutter.flutter.app</string>
  11 + <key>CFBundleInfoDictionaryVersion</key>
  12 + <string>6.0</string>
  13 + <key>CFBundleName</key>
  14 + <string>App</string>
  15 + <key>CFBundlePackageType</key>
  16 + <string>FMWK</string>
  17 + <key>CFBundleShortVersionString</key>
  18 + <string>1.0</string>
  19 + <key>CFBundleSignature</key>
  20 + <string>????</string>
  21 + <key>CFBundleVersion</key>
  22 + <string>1.0</string>
  23 + <key>MinimumOSVersion</key>
  24 + <string>12.0</string>
25 </dict> 25 </dict>
26 </plist> 26 </plist>
1 -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" 1 +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
2 #include "Generated.xcconfig" 2 #include "Generated.xcconfig"
3 -  
4 -  
1 -#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" 1 +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
2 #include "Generated.xcconfig" 2 #include "Generated.xcconfig"
3 -  
@@ -17,7 +17,7 @@ source 'https://cdn.cocoapods.org/' @@ -17,7 +17,7 @@ source 'https://cdn.cocoapods.org/'
17 # source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git' 17 # source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
18 # pod 'gitee-mosect-ijkplayer', :source => 'https://gitee.com/mosect/ijkplayer.git' 18 # pod 'gitee-mosect-ijkplayer', :source => 'https://gitee.com/mosect/ijkplayer.git'
19 19
20 -platform :ios, '12.0' 20 +platform :ios, '15.0'
21 21
22 22
23 23
@@ -55,11 +55,13 @@ target 'Runner' do @@ -55,11 +55,13 @@ target 'Runner' do
55 end 55 end
56 56
57 post_install do |installer| 57 post_install do |installer|
  58 + installer.pods_project.build_configurations.each do |config|
  59 + config.build_settings['WARNING_CFLAGS'] = '-Wno-nullability-completeness'
58 installer.pods_project.targets.each do |target| 60 installer.pods_project.targets.each do |target|
59 flutter_additional_ios_build_settings(target) 61 flutter_additional_ios_build_settings(target)
60 target.build_configurations.each do |config| 62 target.build_configurations.each do |config|
61 - if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 11.0  
62 - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0' 63 + if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < 15.0
  64 + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.0'
63 65
64 config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [ 66 config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
65 '$(inherited)', 67 '$(inherited)',
@@ -81,6 +83,7 @@ post_install do |installer| @@ -81,6 +83,7 @@ post_install do |installer|
81 'PERMISSION_MICROPHONE=1', 83 'PERMISSION_MICROPHONE=1',
82 ] 84 ]
83 end 85 end
  86 + end
84 end 87 end
85 end 88 end
86 end 89 end
@@ -42,8 +42,6 @@ PODS: @@ -42,8 +42,6 @@ PODS:
42 - Flutter 42 - Flutter
43 - device_utils_my (0.0.1): 43 - device_utils_my (0.0.1):
44 - Flutter 44 - Flutter
45 - - easy_contact_picker (0.0.1):  
46 - - Flutter  
47 - fijkplayer (0.11.0): 45 - fijkplayer (0.11.0):
48 - BIJKPlayer (~> 0.7.16) 46 - BIJKPlayer (~> 0.7.16)
49 - Flutter 47 - Flutter
@@ -53,7 +51,7 @@ PODS: @@ -53,7 +51,7 @@ PODS:
53 - flutter_app_update (0.0.1): 51 - flutter_app_update (0.0.1):
54 - Flutter 52 - Flutter
55 - flutter_bugly (0.0.1): 53 - flutter_bugly (0.0.1):
56 - - Bugly 54 + - Bugly (= 2.6.1)
57 - Flutter 55 - Flutter
58 - flutter_downloader (0.0.1): 56 - flutter_downloader (0.0.1):
59 - Flutter 57 - Flutter
@@ -62,15 +60,17 @@ PODS: @@ -62,15 +60,17 @@ PODS:
62 - Mantle 60 - Mantle
63 - SDWebImage 61 - SDWebImage
64 - SDWebImageWebPCoder 62 - SDWebImageWebPCoder
65 - - flutter_inappwebview (0.0.1): 63 + - flutter_inappwebview_ios (0.0.1):
66 - Flutter 64 - Flutter
67 - - flutter_inappwebview/Core (= 0.0.1)  
68 - - OrderedSet (~> 5.0)  
69 - - flutter_inappwebview/Core (0.0.1): 65 + - flutter_inappwebview_ios/Core (= 0.0.1)
  66 + - OrderedSet (~> 6.0.3)
  67 + - flutter_inappwebview_ios/Core (0.0.1):
70 - Flutter 68 - Flutter
71 - - OrderedSet (~> 5.0) 69 + - OrderedSet (~> 6.0.3)
72 - flutter_keyboard_visibility (0.0.1): 70 - flutter_keyboard_visibility (0.0.1):
73 - Flutter 71 - Flutter
  72 + - flutter_native_contact_picker (0.0.1):
  73 + - Flutter
74 - flutter_native_image (0.0.1): 74 - flutter_native_image (0.0.1):
75 - Flutter 75 - Flutter
76 - flutter_sms (1.1.0): 76 - flutter_sms (1.1.0):
@@ -81,15 +81,12 @@ PODS: @@ -81,15 +81,12 @@ PODS:
81 - Flutter 81 - Flutter
82 - fluttertoast (0.0.2): 82 - fluttertoast (0.0.2):
83 - Flutter 83 - Flutter
84 - - Toast  
85 - fluwx (0.0.1): 84 - fluwx (0.0.1):
86 - Flutter 85 - Flutter
87 - - WechatOpenSDK-XCFramework (~> 2.0.2)  
88 - - FMDB (2.7.12):  
89 - - FMDB/standard (= 2.7.12)  
90 - - FMDB/Core (2.7.12)  
91 - - FMDB/standard (2.7.12):  
92 - - FMDB/Core 86 + - fluwx/pay (= 0.0.1)
  87 + - fluwx/pay (0.0.1):
  88 + - Flutter
  89 + - WechatOpenSDK-XCFramework (~> 2.0.4)
93 - foundation_fluttify (0.0.1): 90 - foundation_fluttify (0.0.1):
94 - Flutter 91 - Flutter
95 - geocoding_ios (1.0.5): 92 - geocoding_ios (1.0.5):
@@ -106,24 +103,24 @@ PODS: @@ -106,24 +103,24 @@ PODS:
106 - GoogleMaps/Base 103 - GoogleMaps/Base
107 - image_cropper (0.0.4): 104 - image_cropper (0.0.4):
108 - Flutter 105 - Flutter
109 - - TOCropViewController (~> 2.6.1) 106 + - TOCropViewController (~> 2.7.4)
110 - image_gallery_saver (2.0.2): 107 - image_gallery_saver (2.0.2):
111 - Flutter 108 - Flutter
112 - image_picker_ios (0.0.1): 109 - image_picker_ios (0.0.1):
113 - Flutter 110 - Flutter
114 - install_plugin (2.0.0): 111 - install_plugin (2.0.0):
115 - Flutter 112 - Flutter
116 - - libwebp (1.3.2):  
117 - - libwebp/demux (= 1.3.2)  
118 - - libwebp/mux (= 1.3.2)  
119 - - libwebp/sharpyuv (= 1.3.2)  
120 - - libwebp/webp (= 1.3.2)  
121 - - libwebp/demux (1.3.2): 113 + - libwebp (1.5.0):
  114 + - libwebp/demux (= 1.5.0)
  115 + - libwebp/mux (= 1.5.0)
  116 + - libwebp/sharpyuv (= 1.5.0)
  117 + - libwebp/webp (= 1.5.0)
  118 + - libwebp/demux (1.5.0):
122 - libwebp/webp 119 - libwebp/webp
123 - - libwebp/mux (1.3.2): 120 + - libwebp/mux (1.5.0):
124 - libwebp/demux 121 - libwebp/demux
125 - - libwebp/sharpyuv (1.3.2)  
126 - - libwebp/webp (1.3.2): 122 + - libwebp/sharpyuv (1.5.0)
  123 + - libwebp/webp (1.5.0):
127 - libwebp/sharpyuv 124 - libwebp/sharpyuv
128 - Mantle (2.2.0): 125 - Mantle (2.2.0):
129 - Mantle/extobjc (= 2.2.0) 126 - Mantle/extobjc (= 2.2.0)
@@ -131,13 +128,13 @@ PODS: @@ -131,13 +128,13 @@ PODS:
131 - MTBBarcodeScanner (5.0.11) 128 - MTBBarcodeScanner (5.0.11)
132 - open_filex (0.0.2): 129 - open_filex (0.0.2):
133 - Flutter 130 - Flutter
134 - - OrderedSet (5.0.0) 131 + - OrderedSet (6.0.3)
135 - package_info (0.0.1): 132 - package_info (0.0.1):
136 - Flutter 133 - Flutter
137 - path_provider_foundation (0.0.1): 134 - path_provider_foundation (0.0.1):
138 - Flutter 135 - Flutter
139 - FlutterMacOS 136 - FlutterMacOS
140 - - permission_handler_apple (9.1.1): 137 + - permission_handler_apple (9.3.0):
141 - Flutter 138 - Flutter
142 - photo_manager (2.0.0): 139 - photo_manager (2.0.0):
143 - Flutter 140 - Flutter
@@ -156,22 +153,22 @@ PODS: @@ -156,22 +153,22 @@ PODS:
156 - FlutterMacOS 153 - FlutterMacOS
157 - sign_in_with_apple (0.0.1): 154 - sign_in_with_apple (0.0.1):
158 - Flutter 155 - Flutter
159 - - sqflite (0.0.3): 156 + - sqflite_darwin (0.0.4):
160 - Flutter 157 - Flutter
161 - - FMDB (>= 2.7.5) 158 + - FlutterMacOS
162 - SwiftProtobuf (1.28.2) 159 - SwiftProtobuf (1.28.2)
163 - - Toast (4.1.1)  
164 - - TOCropViewController (2.6.1)  
165 - - TPNS-iOS (1.3.9.7)  
166 - - tpns_flutter_plugin (1.2.6): 160 + - TOCropViewController (2.7.4)
  161 + - TPNS-iOS (1.4.0.4)
  162 + - tpns_flutter_plugin (1.3.3):
167 - Flutter 163 - Flutter
168 - - TPNS-iOS (= 1.3.9.7) 164 + - TPNS-iOS (= 1.4.0.4)
169 - url_launcher_ios (0.0.1): 165 - url_launcher_ios (0.0.1):
170 - Flutter 166 - Flutter
171 - video_compress (0.3.0): 167 - video_compress (0.3.0):
172 - Flutter 168 - Flutter
173 - video_player_avfoundation (0.0.1): 169 - video_player_avfoundation (0.0.1):
174 - Flutter 170 - Flutter
  171 + - FlutterMacOS
175 - video_thumbnail (0.0.1): 172 - video_thumbnail (0.0.1):
176 - Flutter 173 - Flutter
177 - libwebp 174 - libwebp
@@ -191,7 +188,6 @@ DEPENDENCIES: @@ -191,7 +188,6 @@ DEPENDENCIES:
191 - core_location_fluttify (from `.symlinks/plugins/core_location_fluttify/ios`) 188 - core_location_fluttify (from `.symlinks/plugins/core_location_fluttify/ios`)
192 - device_info (from `.symlinks/plugins/device_info/ios`) 189 - device_info (from `.symlinks/plugins/device_info/ios`)
193 - device_utils_my (from `.symlinks/plugins/device_utils_my/ios`) 190 - device_utils_my (from `.symlinks/plugins/device_utils_my/ios`)
194 - - easy_contact_picker (from `.symlinks/plugins/easy_contact_picker/ios`)  
195 - fijkplayer (from `.symlinks/plugins/fijkplayer/ios`) 191 - fijkplayer (from `.symlinks/plugins/fijkplayer/ios`)
196 - Flutter (from `Flutter`) 192 - Flutter (from `Flutter`)
197 - flutter_app_badger (from `.symlinks/plugins/flutter_app_badger/ios`) 193 - flutter_app_badger (from `.symlinks/plugins/flutter_app_badger/ios`)
@@ -199,8 +195,9 @@ DEPENDENCIES: @@ -199,8 +195,9 @@ DEPENDENCIES:
199 - flutter_bugly (from `.symlinks/plugins/flutter_bugly/ios`) 195 - flutter_bugly (from `.symlinks/plugins/flutter_bugly/ios`)
200 - flutter_downloader (from `.symlinks/plugins/flutter_downloader/ios`) 196 - flutter_downloader (from `.symlinks/plugins/flutter_downloader/ios`)
201 - flutter_image_compress_common (from `.symlinks/plugins/flutter_image_compress_common/ios`) 197 - flutter_image_compress_common (from `.symlinks/plugins/flutter_image_compress_common/ios`)
202 - - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`) 198 + - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
203 - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`) 199 - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
  200 + - flutter_native_contact_picker (from `.symlinks/plugins/flutter_native_contact_picker/ios`)
204 - flutter_native_image (from `.symlinks/plugins/flutter_native_image/ios`) 201 - flutter_native_image (from `.symlinks/plugins/flutter_native_image/ios`)
205 - flutter_sms (from `.symlinks/plugins/flutter_sms/ios`) 202 - flutter_sms (from `.symlinks/plugins/flutter_sms/ios`)
206 - flutter_statusbarcolor_ns (from `.symlinks/plugins/flutter_statusbarcolor_ns/ios`) 203 - flutter_statusbarcolor_ns (from `.symlinks/plugins/flutter_statusbarcolor_ns/ios`)
@@ -217,17 +214,17 @@ DEPENDENCIES: @@ -217,17 +214,17 @@ DEPENDENCIES:
217 - install_plugin (from `.symlinks/plugins/install_plugin/ios`) 214 - install_plugin (from `.symlinks/plugins/install_plugin/ios`)
218 - open_filex (from `.symlinks/plugins/open_filex/ios`) 215 - open_filex (from `.symlinks/plugins/open_filex/ios`)
219 - package_info (from `.symlinks/plugins/package_info/ios`) 216 - package_info (from `.symlinks/plugins/package_info/ios`)
220 - - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`) 217 + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
221 - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) 218 - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
222 - photo_manager (from `.symlinks/plugins/photo_manager/ios`) 219 - photo_manager (from `.symlinks/plugins/photo_manager/ios`)
223 - sendsms (from `.symlinks/plugins/sendsms/ios`) 220 - sendsms (from `.symlinks/plugins/sendsms/ios`)
224 - - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`) 221 + - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
225 - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`) 222 - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`)
226 - - sqflite (from `.symlinks/plugins/sqflite/ios`) 223 + - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
227 - tpns_flutter_plugin (from `.symlinks/plugins/tpns_flutter_plugin/ios`) 224 - tpns_flutter_plugin (from `.symlinks/plugins/tpns_flutter_plugin/ios`)
228 - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) 225 - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
229 - video_compress (from `.symlinks/plugins/video_compress/ios`) 226 - video_compress (from `.symlinks/plugins/video_compress/ios`)
230 - - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`) 227 + - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
231 - video_thumbnail (from `.symlinks/plugins/video_thumbnail/ios`) 228 - video_thumbnail (from `.symlinks/plugins/video_thumbnail/ios`)
232 - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`) 229 - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
233 230
@@ -239,8 +236,11 @@ SPEC REPOS: @@ -239,8 +236,11 @@ SPEC REPOS:
239 - AMapSearch-NO-IDFA 236 - AMapSearch-NO-IDFA
240 - BIJKPlayer 237 - BIJKPlayer
241 - Bugly 238 - Bugly
  239 +<<<<<<< HEAD
242 - FMDB 240 - FMDB
243 - GoogleMaps 241 - GoogleMaps
  242 +=======
  243 +>>>>>>> v5.4.4+
244 - libwebp 244 - libwebp
245 - Mantle 245 - Mantle
246 - MTBBarcodeScanner 246 - MTBBarcodeScanner
@@ -249,7 +249,6 @@ SPEC REPOS: @@ -249,7 +249,6 @@ SPEC REPOS:
249 - SDWebImage 249 - SDWebImage
250 - SDWebImageWebPCoder 250 - SDWebImageWebPCoder
251 - SwiftProtobuf 251 - SwiftProtobuf
252 - - Toast  
253 - TOCropViewController 252 - TOCropViewController
254 - TPNS-iOS 253 - TPNS-iOS
255 - WechatOpenSDK-XCFramework 254 - WechatOpenSDK-XCFramework
@@ -277,8 +276,6 @@ EXTERNAL SOURCES: @@ -277,8 +276,6 @@ EXTERNAL SOURCES:
277 :path: ".symlinks/plugins/device_info/ios" 276 :path: ".symlinks/plugins/device_info/ios"
278 device_utils_my: 277 device_utils_my:
279 :path: ".symlinks/plugins/device_utils_my/ios" 278 :path: ".symlinks/plugins/device_utils_my/ios"
280 - easy_contact_picker:  
281 - :path: ".symlinks/plugins/easy_contact_picker/ios"  
282 fijkplayer: 279 fijkplayer:
283 :path: ".symlinks/plugins/fijkplayer/ios" 280 :path: ".symlinks/plugins/fijkplayer/ios"
284 Flutter: 281 Flutter:
@@ -293,10 +290,12 @@ EXTERNAL SOURCES: @@ -293,10 +290,12 @@ EXTERNAL SOURCES:
293 :path: ".symlinks/plugins/flutter_downloader/ios" 290 :path: ".symlinks/plugins/flutter_downloader/ios"
294 flutter_image_compress_common: 291 flutter_image_compress_common:
295 :path: ".symlinks/plugins/flutter_image_compress_common/ios" 292 :path: ".symlinks/plugins/flutter_image_compress_common/ios"
296 - flutter_inappwebview:  
297 - :path: ".symlinks/plugins/flutter_inappwebview/ios" 293 + flutter_inappwebview_ios:
  294 + :path: ".symlinks/plugins/flutter_inappwebview_ios/ios"
298 flutter_keyboard_visibility: 295 flutter_keyboard_visibility:
299 :path: ".symlinks/plugins/flutter_keyboard_visibility/ios" 296 :path: ".symlinks/plugins/flutter_keyboard_visibility/ios"
  297 + flutter_native_contact_picker:
  298 + :path: ".symlinks/plugins/flutter_native_contact_picker/ios"
300 flutter_native_image: 299 flutter_native_image:
301 :path: ".symlinks/plugins/flutter_native_image/ios" 300 :path: ".symlinks/plugins/flutter_native_image/ios"
302 flutter_sms: 301 flutter_sms:
@@ -330,7 +329,7 @@ EXTERNAL SOURCES: @@ -330,7 +329,7 @@ EXTERNAL SOURCES:
330 package_info: 329 package_info:
331 :path: ".symlinks/plugins/package_info/ios" 330 :path: ".symlinks/plugins/package_info/ios"
332 path_provider_foundation: 331 path_provider_foundation:
333 - :path: ".symlinks/plugins/path_provider_foundation/ios" 332 + :path: ".symlinks/plugins/path_provider_foundation/darwin"
334 permission_handler_apple: 333 permission_handler_apple:
335 :path: ".symlinks/plugins/permission_handler_apple/ios" 334 :path: ".symlinks/plugins/permission_handler_apple/ios"
336 photo_manager: 335 photo_manager:
@@ -338,11 +337,11 @@ EXTERNAL SOURCES: @@ -338,11 +337,11 @@ EXTERNAL SOURCES:
338 sendsms: 337 sendsms:
339 :path: ".symlinks/plugins/sendsms/ios" 338 :path: ".symlinks/plugins/sendsms/ios"
340 shared_preferences_foundation: 339 shared_preferences_foundation:
341 - :path: ".symlinks/plugins/shared_preferences_foundation/ios" 340 + :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
342 sign_in_with_apple: 341 sign_in_with_apple:
343 :path: ".symlinks/plugins/sign_in_with_apple/ios" 342 :path: ".symlinks/plugins/sign_in_with_apple/ios"
344 - sqflite:  
345 - :path: ".symlinks/plugins/sqflite/ios" 343 + sqflite_darwin:
  344 + :path: ".symlinks/plugins/sqflite_darwin/darwin"
346 tpns_flutter_plugin: 345 tpns_flutter_plugin:
347 :path: ".symlinks/plugins/tpns_flutter_plugin/ios" 346 :path: ".symlinks/plugins/tpns_flutter_plugin/ios"
348 url_launcher_ios: 347 url_launcher_ios:
@@ -350,7 +349,7 @@ EXTERNAL SOURCES: @@ -350,7 +349,7 @@ EXTERNAL SOURCES:
350 video_compress: 349 video_compress:
351 :path: ".symlinks/plugins/video_compress/ios" 350 :path: ".symlinks/plugins/video_compress/ios"
352 video_player_avfoundation: 351 video_player_avfoundation:
353 - :path: ".symlinks/plugins/video_player_avfoundation/ios" 352 + :path: ".symlinks/plugins/video_player_avfoundation/darwin"
354 video_thumbnail: 353 video_thumbnail:
355 :path: ".symlinks/plugins/video_thumbnail/ios" 354 :path: ".symlinks/plugins/video_thumbnail/ios"
356 webview_flutter: 355 webview_flutter:
@@ -358,17 +357,18 @@ EXTERNAL SOURCES: @@ -358,17 +357,18 @@ EXTERNAL SOURCES:
358 357
359 SPEC CHECKSUMS: 358 SPEC CHECKSUMS:
360 AMap3DMap-NO-IDFA: 6660036f9a8c28ed3e9037936210121599055a2e 359 AMap3DMap-NO-IDFA: 6660036f9a8c28ed3e9037936210121599055a2e
361 - amap_core_fluttify: b84657ba39ee287a4b96bbcc0a6e67612cc3808f  
362 - amap_location_fluttify: 7dc366b959d3ea9ce0b826e60c22a15cec54bbad  
363 - amap_map_fluttify: 4eaf28184c3cac71f7cf1fb2799c919886792ca8  
364 - amap_search_fluttify: cfab91aa65730337fff54705aae0423ea752fc91 360 + amap_core_fluttify: 4e444a402c3e2ef35958a623b74ab368a49813c8
  361 + amap_location_fluttify: 5d07b9fc4de09726de28cb54de6ecbc09509a9bd
  362 + amap_map_fluttify: 7d4644215ee20b2f9e1c0173fb19291fc7a6b6fc
  363 + amap_search_fluttify: b964944aa1ee019a08b37c64cc8abaf86a34a1a3
365 AMapFoundation-NO-IDFA: cc2ec7a2828ef292358ad594b7ee0ae21a7f097b 364 AMapFoundation-NO-IDFA: cc2ec7a2828ef292358ad594b7ee0ae21a7f097b
366 AMapLocation-NO-IDFA: 9d7ec9b052405356600b59fe0a9a65261bacc54e 365 AMapLocation-NO-IDFA: 9d7ec9b052405356600b59fe0a9a65261bacc54e
367 AMapSearch-NO-IDFA: 9df378c88d50083346412ee3e0a10e2c451c7139 366 AMapSearch-NO-IDFA: 9df378c88d50083346412ee3e0a10e2c451c7139
368 - audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40  
369 - barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0 367 + audioplayers_darwin: ccf9c770ee768abb07e26d90af093f7bab1c12ab
  368 + barcode_scan2: f80517f040989095c9b5067be77649bf6114442c
370 BIJKPlayer: 4c5d66e5cb99ae5bade6f22a4fcc031722a81c64 369 BIJKPlayer: 4c5d66e5cb99ae5bade6f22a4fcc031722a81c64
371 Bugly: 217ac2ce5f0f2626d43dbaa4f70764c953a26a31 370 Bugly: 217ac2ce5f0f2626d43dbaa4f70764c953a26a31
  371 +<<<<<<< HEAD
372 connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d 372 connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
373 contacts_service: 849e1f84281804c8bfbec1b4c3eedcb23c5d3eca 373 contacts_service: 849e1f84281804c8bfbec1b4c3eedcb23c5d3eca
374 core_location_fluttify: 9466a411ea7d22c6349c7e6a767ae4623f01eb1d 374 core_location_fluttify: 9466a411ea7d22c6349c7e6a767ae4623f01eb1d
@@ -401,33 +401,61 @@ SPEC CHECKSUMS: @@ -401,33 +401,61 @@ SPEC CHECKSUMS:
401 image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5 401 image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
402 install_plugin: b52f81470a1f37b006607bdf7ffc6031df43fe76 402 install_plugin: b52f81470a1f37b006607bdf7ffc6031df43fe76
403 libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 403 libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
  404 +=======
  405 + connectivity_plus: 481668c94744c30c53b8895afb39159d1e619bdf
  406 + contacts_service: 7c2ed10147f55891576c6a582f431e385d8de92d
  407 + core_location_fluttify: d76555ed03db792a010b362a52a72134a69fe32b
  408 + device_info: 52e8c0c9c61def8d0a92bf175f5f500abbea04bc
  409 + device_utils_my: de33d0a3965bd76cf7e9fb58b7ea71d698686969
  410 + fijkplayer: 2dd31ec312ba554bb6a9163cb2f44cdb528e50da
  411 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
  412 + flutter_app_badger: 16b371e989d04cd265df85be2c3851b49cb68d18
  413 + flutter_app_update: 816fdb2e30e4832a7c45e3f108d391c42ef040a9
  414 + flutter_bugly: a77131ff7b385a481c594830dc89aa53e8e7fbee
  415 + flutter_downloader: 78da0da1084e709cbfd3b723c7ea349c71681f09
  416 + flutter_image_compress_common: 1697a328fd72bfb335507c6bca1a65fa5ad87df1
  417 + flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
  418 + flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619
  419 + flutter_native_contact_picker: 22508d3ab5a583068d4a588cb37c0e0b8764722d
  420 + flutter_native_image: c0f200e4bc5da392b15878df38654cc85a78b090
  421 + flutter_sms: bb63bc226f41fad2b7cc9f0b1d0c15f7730a8310
  422 + flutter_statusbarcolor_ns: 28ea17050f37c962fe05a4722a6d43afc4fca76b
  423 + flutter_wxwork: 544263eeacf44361e64b749e4ff62b5f680cbc14
  424 + fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1
  425 + fluwx: 6bf9c5a3a99ad31b0de137dd92370a0d10a60f4b
  426 + foundation_fluttify: f4349a7e72691ddf460062127ef64f3a221868a5
  427 + image_cropper: c4326ea50132b1e1564499e5d32a84f01fb03537
  428 + image_gallery_saver: 14711d79da40581063e8842a11acf1969d781ed7
  429 + image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
  430 + install_plugin: e17e38d6f504857748a3ec1299d8a2bbeeeea854
  431 + libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
  432 +>>>>>>> v5.4.4+
404 Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d 433 Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
405 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb 434 MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
406 - open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4  
407 - OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c  
408 - package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62  
409 - path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943  
410 - permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6  
411 - photo_manager: 4f6810b7dfc4feb03b461ac1a70dacf91fba7604 435 + open_filex: 432f3cd11432da3e39f47fcc0df2b1603854eff1
  436 + OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
  437 + package_info: cce50adca9873c79f931618469d2114b91d71189
  438 + path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
  439 + permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
  440 + photo_manager: d2fbcc0f2d82458700ee6256a15018210a81d413
412 ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda 441 ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda
413 SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8 442 SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8
414 SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380 443 SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
415 - sendsms: 4065f76018b22a3e6987b4630f161feab95cef23  
416 - shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126  
417 - sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440  
418 - sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a 444 + sendsms: 43a465a88ce570d59cc10ef0f3bdb922cc303c7b
  445 + shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
  446 + sign_in_with_apple: c5dcc141574c8c54d5ac99dd2163c0c72ad22418
  447 + sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
419 SwiftProtobuf: 4dbaffec76a39a8dc5da23b40af1a5dc01a4c02d 448 SwiftProtobuf: 4dbaffec76a39a8dc5da23b40af1a5dc01a4c02d
420 - Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e  
421 - TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863  
422 - TPNS-iOS: e13778e709e9ac84fe512476c6f4983f0011f7fe  
423 - tpns_flutter_plugin: d9fa7fdf77de4e1ee3b5a9cd61fd92eecb0e9b08  
424 - url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4  
425 - video_compress: fce97e4fb1dfd88175aa07d2ffc8a2f297f87fbe  
426 - video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126  
427 - video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1  
428 - webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b 449 + TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
  450 + TPNS-iOS: 38f2c743d01cd1e62cbdbb12455990a9a75fb492
  451 + tpns_flutter_plugin: 0d205d24df8b0959a3c5302c6648637665556aee
  452 + url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
  453 + video_compress: f2133a07762889d67f0711ac831faa26f956980e
  454 + video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
  455 + video_thumbnail: b637e0ad5f588ca9945f6e2c927f73a69a661140
  456 + webview_flutter: fa13f657fd0a01527ab6ba905b3be0fb3e3bfd4d
429 WechatOpenSDK-XCFramework: 36fb2bea0754266c17184adf4963d7e6ff98b69f 457 WechatOpenSDK-XCFramework: 36fb2bea0754266c17184adf4963d7e6ff98b69f
430 458
431 -PODFILE CHECKSUM: 1cefd2e71f0fcfa4f2430db723fe500dadb93e92 459 +PODFILE CHECKSUM: 9435259418d39cbc3076dcc2f688f77abaddd31d
432 460
433 COCOAPODS: 1.16.2 461 COCOAPODS: 1.16.2
@@ -3,33 +3,34 @@ @@ -3,33 +3,34 @@
3 archiveVersion = 1; 3 archiveVersion = 1;
4 classes = { 4 classes = {
5 }; 5 };
  6 +<<<<<<< HEAD
6 objectVersion = 50; 7 objectVersion = 50;
  8 +=======
  9 + objectVersion = 54;
  10 +>>>>>>> v5.4.4+
7 objects = { 11 objects = {
8 12
9 /* Begin PBXBuildFile section */ 13 /* Begin PBXBuildFile section */
10 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 14 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
  15 + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
11 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 16 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12 - 728D93682B1DBD6D00EFD19A /* tts_voice.caf in Resources */ = {isa = PBXBuildFile; fileRef = 728D93632B1DBD6C00EFD19A /* tts_voice.caf */; };  
13 - 728D93692B1DBD6D00EFD19A /* tts_deposit.caf in Resources */ = {isa = PBXBuildFile; fileRef = 728D93642B1DBD6C00EFD19A /* tts_deposit.caf */; };  
14 - 728D936A2B1DBD6D00EFD19A /* tts_wine_remind.caf in Resources */ = {isa = PBXBuildFile; fileRef = 728D93652B1DBD6C00EFD19A /* tts_wine_remind.caf */; };  
15 - 728D936B2B1DBD6D00EFD19A /* tts_recharge.caf in Resources */ = {isa = PBXBuildFile; fileRef = 728D93662B1DBD6C00EFD19A /* tts_recharge.caf */; };  
16 - 728D936C2B1DBD6D00EFD19A /* tts_commemoration_day.caf in Resources */ = {isa = PBXBuildFile; fileRef = 728D93672B1DBD6D00EFD19A /* tts_commemoration_day.caf */; };  
17 - 72DFBB9425BA6CD700EE1E5D /* tts_all.caf in Resources */ = {isa = PBXBuildFile; fileRef = 720060DA25B9912C0014BE3B /* tts_all.caf */; };  
18 - 72DFBB9525BA6CD700EE1E5D /* tts_cancel.caf in Resources */ = {isa = PBXBuildFile; fileRef = 72DFBB8C25BA6CBF00EE1E5D /* tts_cancel.caf */; };  
19 - 72DFBB9625BA6CD700EE1E5D /* tts_invoice.caf in Resources */ = {isa = PBXBuildFile; fileRef = 72DFBB9325BA6CBF00EE1E5D /* tts_invoice.caf */; };  
20 - 72DFBB9725BA6CD700EE1E5D /* tts_new.caf in Resources */ = {isa = PBXBuildFile; fileRef = 72DFBB8E25BA6CBF00EE1E5D /* tts_new.caf */; };  
21 - 72DFBB9825BA6CD700EE1E5D /* tts_online.caf in Resources */ = {isa = PBXBuildFile; fileRef = 72DFBB8F25BA6CBF00EE1E5D /* tts_online.caf */; };  
22 - 72DFBB9925BA6CD700EE1E5D /* tts_order.caf in Resources */ = {isa = PBXBuildFile; fileRef = 72DFBB9225BA6CBF00EE1E5D /* tts_order.caf */; };  
23 - 72DFBB9A25BA6CD700EE1E5D /* tts_pay.caf in Resources */ = {isa = PBXBuildFile; fileRef = 72DFBB8D25BA6CBF00EE1E5D /* tts_pay.caf */; };  
24 - 72DFBB9B25BA6CD700EE1E5D /* tts_pre_pay.caf in Resources */ = {isa = PBXBuildFile; fileRef = 72DFBB9125BA6CBF00EE1E5D /* tts_pre_pay.caf */; };  
25 - 72E2EB012B4E847E009FD712 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 72E2EB002B4E846E009FD712 /* libsqlite3.tbd */; }; 17 + 6BEC6C3B65B04502A3990DE7 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4E32EA6F002ADDE3266FC1B /* Pods_Runner.framework */; };
26 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 18 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
27 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 19 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
28 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 20 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
29 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; 21 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
30 - A7F352227F0F121A53D9A543 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F11082C59A1D00E83E0934D /* Pods_Runner.framework */; };  
31 /* End PBXBuildFile section */ 22 /* End PBXBuildFile section */
32 23
  24 +/* Begin PBXContainerItemProxy section */
  25 + 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = {
  26 + isa = PBXContainerItemProxy;
  27 + containerPortal = 97C146E61CF9000F007C117D /* Project object */;
  28 + proxyType = 1;
  29 + remoteGlobalIDString = 97C146ED1CF9000F007C117D;
  30 + remoteInfo = Runner;
  31 + };
  32 +/* End PBXContainerItemProxy section */
  33 +
33 /* Begin PBXCopyFilesBuildPhase section */ 34 /* Begin PBXCopyFilesBuildPhase section */
34 9705A1C41CF9048500538489 /* Embed Frameworks */ = { 35 9705A1C41CF9048500538489 /* Embed Frameworks */ = {
35 isa = PBXCopyFilesBuildPhase; 36 isa = PBXCopyFilesBuildPhase;
@@ -47,26 +48,10 @@ @@ -47,26 +48,10 @@
47 0771EF012D141AE300148DB8 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 48 0771EF012D141AE300148DB8 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
48 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; }; 49 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
49 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; }; 50 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
50 - 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>"; };  
51 - 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>"; }; 51 + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
  52 + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
52 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; }; 53 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
53 - 720060DA25B9912C0014BE3B /* tts_all.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_all.caf; sourceTree = "<group>"; };  
54 - 7206E2DB26200F770055D76E /* 一键订Debug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "一键订Debug.entitlements"; sourceTree = "<group>"; };  
55 - 72544E7E2B592D7D00A1A4EF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = "<group>"; };  
56 - 72544E7F2B592D7E00A1A4EF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };  
57 - 728D93632B1DBD6C00EFD19A /* tts_voice.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_voice.caf; sourceTree = "<group>"; };  
58 - 728D93642B1DBD6C00EFD19A /* tts_deposit.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_deposit.caf; sourceTree = "<group>"; };  
59 - 728D93652B1DBD6C00EFD19A /* tts_wine_remind.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_wine_remind.caf; sourceTree = "<group>"; };  
60 - 728D93662B1DBD6C00EFD19A /* tts_recharge.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_recharge.caf; sourceTree = "<group>"; };  
61 - 728D93672B1DBD6D00EFD19A /* tts_commemoration_day.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_commemoration_day.caf; sourceTree = "<group>"; };  
62 - 72DFBB8C25BA6CBF00EE1E5D /* tts_cancel.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_cancel.caf; sourceTree = "<group>"; };  
63 - 72DFBB8D25BA6CBF00EE1E5D /* tts_pay.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_pay.caf; sourceTree = "<group>"; };  
64 - 72DFBB8E25BA6CBF00EE1E5D /* tts_new.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_new.caf; sourceTree = "<group>"; };  
65 - 72DFBB8F25BA6CBF00EE1E5D /* tts_online.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_online.caf; sourceTree = "<group>"; };  
66 - 72DFBB9125BA6CBF00EE1E5D /* tts_pre_pay.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_pre_pay.caf; sourceTree = "<group>"; };  
67 - 72DFBB9225BA6CBF00EE1E5D /* tts_order.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_order.caf; sourceTree = "<group>"; };  
68 - 72DFBB9325BA6CBF00EE1E5D /* tts_invoice.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = tts_invoice.caf; sourceTree = "<group>"; };  
69 - 72E2EB002B4E846E009FD712 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; 54 + 5D2E701D6DE8C4040FECD4E8 /* Runner.entitlements */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
70 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; }; 55 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
71 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; 56 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
72 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; }; 57 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -76,10 +61,18 @@ @@ -76,10 +61,18 @@
76 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; }; 61 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
77 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; 62 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
78 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; }; 63 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
  64 +<<<<<<< HEAD
79 9F11082C59A1D00E83E0934D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 65 9F11082C59A1D00E83E0934D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
80 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>"; }; 66 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>"; };
81 EE6AF8FF2457DB720005E3B9 /* RunnerProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerProfile.entitlements; sourceTree = "<group>"; }; 67 EE6AF8FF2457DB720005E3B9 /* RunnerProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RunnerProfile.entitlements; sourceTree = "<group>"; };
82 EE6AF9002457DC0C0005E3B9 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; }; 68 EE6AF9002457DC0C0005E3B9 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
  69 +=======
  70 + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
  71 + B4E32EA6F002ADDE3266FC1B /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
  72 + 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>"; };
  73 + 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>"; };
  74 + 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>"; };
  75 +>>>>>>> v5.4.4+
83 /* End PBXFileReference section */ 76 /* End PBXFileReference section */
84 77
85 /* Begin PBXFrameworksBuildPhase section */ 78 /* Begin PBXFrameworksBuildPhase section */
@@ -87,31 +80,29 @@ @@ -87,31 +80,29 @@
87 isa = PBXFrameworksBuildPhase; 80 isa = PBXFrameworksBuildPhase;
88 buildActionMask = 2147483647; 81 buildActionMask = 2147483647;
89 files = ( 82 files = (
90 - 72E2EB012B4E847E009FD712 /* libsqlite3.tbd in Frameworks */,  
91 - A7F352227F0F121A53D9A543 /* Pods_Runner.framework in Frameworks */, 83 + 6BEC6C3B65B04502A3990DE7 /* Pods_Runner.framework in Frameworks */,
92 ); 84 );
93 runOnlyForDeploymentPostprocessing = 0; 85 runOnlyForDeploymentPostprocessing = 0;
94 }; 86 };
95 /* End PBXFrameworksBuildPhase section */ 87 /* End PBXFrameworksBuildPhase section */
96 88
97 /* Begin PBXGroup section */ 89 /* Begin PBXGroup section */
98 - 5F6C37E5A77D3FF43D0DBCC2 /* Pods */ = { 90 + 1201D8FB0352809AD89E4634 /* Pods */ = {
99 isa = PBXGroup; 91 isa = PBXGroup;
100 children = ( 92 children = (
101 - 22513BD076488FBD50F0303F /* Pods-Runner.debug.xcconfig */,  
102 - 2DCAB49DF131E02F3BAF38E1 /* Pods-Runner.release.xcconfig */,  
103 - CC19436D18202E6CAD07F931 /* Pods-Runner.profile.xcconfig */, 93 + C872893A1BAF0A487B493871 /* Pods-Runner.debug.xcconfig */,
  94 + DBDA9A3CA19A8342BD2C8436 /* Pods-Runner.release.xcconfig */,
  95 + FEE980E99826EDF475284386 /* Pods-Runner.profile.xcconfig */,
104 ); 96 );
105 path = Pods; 97 path = Pods;
106 sourceTree = "<group>"; 98 sourceTree = "<group>";
107 }; 99 };
108 - 8074F3926F79FEBA9CA1E157 /* Frameworks */ = { 100 + 331C8082294A63A400263BE5 /* RunnerTests */ = {
109 isa = PBXGroup; 101 isa = PBXGroup;
110 children = ( 102 children = (
111 - 72E2EB002B4E846E009FD712 /* libsqlite3.tbd */,  
112 - 9F11082C59A1D00E83E0934D /* Pods_Runner.framework */, 103 + 331C807B294A618700263BE5 /* RunnerTests.swift */,
113 ); 104 );
114 - name = Frameworks; 105 + path = RunnerTests;
115 sourceTree = "<group>"; 106 sourceTree = "<group>";
116 }; 107 };
117 9740EEB11CF90186004384FC /* Flutter */ = { 108 9740EEB11CF90186004384FC /* Flutter */ = {
@@ -128,24 +119,12 @@ @@ -128,24 +119,12 @@
128 97C146E51CF9000F007C117D = { 119 97C146E51CF9000F007C117D = {
129 isa = PBXGroup; 120 isa = PBXGroup;
130 children = ( 121 children = (
131 - 720060DA25B9912C0014BE3B /* tts_all.caf */,  
132 - 72DFBB8C25BA6CBF00EE1E5D /* tts_cancel.caf */,  
133 - 72DFBB9325BA6CBF00EE1E5D /* tts_invoice.caf */,  
134 - 72DFBB8E25BA6CBF00EE1E5D /* tts_new.caf */,  
135 - 728D93672B1DBD6D00EFD19A /* tts_commemoration_day.caf */,  
136 - 728D93642B1DBD6C00EFD19A /* tts_deposit.caf */,  
137 - 728D93662B1DBD6C00EFD19A /* tts_recharge.caf */,  
138 - 728D93632B1DBD6C00EFD19A /* tts_voice.caf */,  
139 - 728D93652B1DBD6C00EFD19A /* tts_wine_remind.caf */,  
140 - 72DFBB8F25BA6CBF00EE1E5D /* tts_online.caf */,  
141 - 72DFBB9225BA6CBF00EE1E5D /* tts_order.caf */,  
142 - 72DFBB8D25BA6CBF00EE1E5D /* tts_pay.caf */,  
143 - 72DFBB9125BA6CBF00EE1E5D /* tts_pre_pay.caf */,  
144 9740EEB11CF90186004384FC /* Flutter */, 122 9740EEB11CF90186004384FC /* Flutter */,
145 97C146F01CF9000F007C117D /* Runner */, 123 97C146F01CF9000F007C117D /* Runner */,
146 97C146EF1CF9000F007C117D /* Products */, 124 97C146EF1CF9000F007C117D /* Products */,
147 - 5F6C37E5A77D3FF43D0DBCC2 /* Pods */,  
148 - 8074F3926F79FEBA9CA1E157 /* Frameworks */, 125 + 331C8082294A63A400263BE5 /* RunnerTests */,
  126 + 1201D8FB0352809AD89E4634 /* Pods */,
  127 + CBA3FC8EF17C231CEC54AC20 /* Frameworks */,
149 ); 128 );
150 sourceTree = "<group>"; 129 sourceTree = "<group>";
151 }; 130 };
@@ -153,6 +132,7 @@ @@ -153,6 +132,7 @@
153 isa = PBXGroup; 132 isa = PBXGroup;
154 children = ( 133 children = (
155 97C146EE1CF9000F007C117D /* Runner.app */, 134 97C146EE1CF9000F007C117D /* Runner.app */,
  135 + 331C8081294A63A400263BE5 /* RunnerTests.xctest */,
156 ); 136 );
157 name = Products; 137 name = Products;
158 sourceTree = "<group>"; 138 sourceTree = "<group>";
@@ -160,45 +140,65 @@ @@ -160,45 +140,65 @@
160 97C146F01CF9000F007C117D /* Runner */ = { 140 97C146F01CF9000F007C117D /* Runner */ = {
161 isa = PBXGroup; 141 isa = PBXGroup;
162 children = ( 142 children = (
163 - 7206E2DB26200F770055D76E /* 一键订Debug.entitlements */,  
164 - EE6AF9002457DC0C0005E3B9 /* Runner.entitlements */,  
165 - EE6AF8FF2457DB720005E3B9 /* RunnerProfile.entitlements */,  
166 97C146FA1CF9000F007C117D /* Main.storyboard */, 143 97C146FA1CF9000F007C117D /* Main.storyboard */,
167 97C146FD1CF9000F007C117D /* Assets.xcassets */, 144 97C146FD1CF9000F007C117D /* Assets.xcassets */,
168 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, 145 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
  146 +<<<<<<< HEAD
169 0771EF012D141AE300148DB8 /* Info.plist */, 147 0771EF012D141AE300148DB8 /* Info.plist */,
170 97C146F11CF9000F007C117D /* Supporting Files */, 148 97C146F11CF9000F007C117D /* Supporting Files */,
  149 +=======
  150 + 97C147021CF9000F007C117D /* Info.plist */,
  151 +>>>>>>> v5.4.4+
171 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, 152 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
172 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, 153 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
173 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, 154 74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
174 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, 155 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
  156 + 5D2E701D6DE8C4040FECD4E8 /* Runner.entitlements */,
175 ); 157 );
176 path = Runner; 158 path = Runner;
177 sourceTree = "<group>"; 159 sourceTree = "<group>";
178 }; 160 };
179 - 97C146F11CF9000F007C117D /* Supporting Files */ = { 161 + CBA3FC8EF17C231CEC54AC20 /* Frameworks */ = {
180 isa = PBXGroup; 162 isa = PBXGroup;
181 children = ( 163 children = (
  164 + B4E32EA6F002ADDE3266FC1B /* Pods_Runner.framework */,
182 ); 165 );
183 - name = "Supporting Files"; 166 + name = Frameworks;
184 sourceTree = "<group>"; 167 sourceTree = "<group>";
185 }; 168 };
186 /* End PBXGroup section */ 169 /* End PBXGroup section */
187 170
188 /* Begin PBXNativeTarget section */ 171 /* Begin PBXNativeTarget section */
  172 + 331C8080294A63A400263BE5 /* RunnerTests */ = {
  173 + isa = PBXNativeTarget;
  174 + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
  175 + buildPhases = (
  176 + 331C807D294A63A400263BE5 /* Sources */,
  177 + 331C807F294A63A400263BE5 /* Resources */,
  178 + );
  179 + buildRules = (
  180 + );
  181 + dependencies = (
  182 + 331C8086294A63A400263BE5 /* PBXTargetDependency */,
  183 + );
  184 + name = RunnerTests;
  185 + productName = RunnerTests;
  186 + productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
  187 + productType = "com.apple.product-type.bundle.unit-test";
  188 + };
189 97C146ED1CF9000F007C117D /* Runner */ = { 189 97C146ED1CF9000F007C117D /* Runner */ = {
190 isa = PBXNativeTarget; 190 isa = PBXNativeTarget;
191 buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; 191 buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
192 buildPhases = ( 192 buildPhases = (
193 - 9C09FB22D919B3DDAB7B4DE4 /* [CP] Check Pods Manifest.lock */, 193 + 9D6E6C8DDD2621BB8784B52B /* [CP] Check Pods Manifest.lock */,
194 9740EEB61CF901F6004384FC /* Run Script */, 194 9740EEB61CF901F6004384FC /* Run Script */,
195 97C146EA1CF9000F007C117D /* Sources */, 195 97C146EA1CF9000F007C117D /* Sources */,
196 97C146EB1CF9000F007C117D /* Frameworks */, 196 97C146EB1CF9000F007C117D /* Frameworks */,
197 97C146EC1CF9000F007C117D /* Resources */, 197 97C146EC1CF9000F007C117D /* Resources */,
198 9705A1C41CF9048500538489 /* Embed Frameworks */, 198 9705A1C41CF9048500538489 /* Embed Frameworks */,
199 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 199 3B06AD1E1E4923F5004D2608 /* Thin Binary */,
200 - 9B9871E299FA5648CFE77D1A /* [CP] Embed Pods Frameworks */,  
201 - FE822B5E2C661DC46807EEC9 /* [CP] Copy Pods Resources */, 200 + 54CC91170D6A8CE2A0114D6E /* [CP] Embed Pods Frameworks */,
  201 + 8D6BE64BCA50732C7F2DB851 /* [CP] Copy Pods Resources */,
202 ); 202 );
203 buildRules = ( 203 buildRules = (
204 ); 204 );
@@ -215,25 +215,27 @@ @@ -215,25 +215,27 @@
215 97C146E61CF9000F007C117D /* Project object */ = { 215 97C146E61CF9000F007C117D /* Project object */ = {
216 isa = PBXProject; 216 isa = PBXProject;
217 attributes = { 217 attributes = {
218 - LastUpgradeCheck = 1300;  
219 - ORGANIZATIONNAME = "The Chromium Authors"; 218 + BuildIndependentTargetsInParallel = YES;
  219 + LastUpgradeCheck = 1510;
  220 + ORGANIZATIONNAME = "";
220 TargetAttributes = { 221 TargetAttributes = {
  222 + 331C8080294A63A400263BE5 = {
  223 + CreatedOnToolsVersion = 14.0;
  224 + TestTargetID = 97C146ED1CF9000F007C117D;
  225 + };
221 97C146ED1CF9000F007C117D = { 226 97C146ED1CF9000F007C117D = {
222 CreatedOnToolsVersion = 7.3.1; 227 CreatedOnToolsVersion = 7.3.1;
223 - DevelopmentTeam = 8J59HM8B82;  
224 LastSwiftMigration = 1100; 228 LastSwiftMigration = 1100;
225 - ProvisioningStyle = Automatic;  
226 }; 229 };
227 }; 230 };
228 }; 231 };
229 buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; 232 buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
230 - compatibilityVersion = "Xcode 3.2"; 233 + compatibilityVersion = "Xcode 9.3";
231 developmentRegion = en; 234 developmentRegion = en;
232 hasScannedForEncodings = 0; 235 hasScannedForEncodings = 0;
233 knownRegions = ( 236 knownRegions = (
234 en, 237 en,
235 Base, 238 Base,
236 - "zh-Hans",  
237 ); 239 );
238 mainGroup = 97C146E51CF9000F007C117D; 240 mainGroup = 97C146E51CF9000F007C117D;
239 productRefGroup = 97C146EF1CF9000F007C117D /* Products */; 241 productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
@@ -241,28 +243,23 @@ @@ -241,28 +243,23 @@
241 projectRoot = ""; 243 projectRoot = "";
242 targets = ( 244 targets = (
243 97C146ED1CF9000F007C117D /* Runner */, 245 97C146ED1CF9000F007C117D /* Runner */,
  246 + 331C8080294A63A400263BE5 /* RunnerTests */,
244 ); 247 );
245 }; 248 };
246 /* End PBXProject section */ 249 /* End PBXProject section */
247 250
248 /* Begin PBXResourcesBuildPhase section */ 251 /* Begin PBXResourcesBuildPhase section */
  252 + 331C807F294A63A400263BE5 /* Resources */ = {
  253 + isa = PBXResourcesBuildPhase;
  254 + buildActionMask = 2147483647;
  255 + files = (
  256 + );
  257 + runOnlyForDeploymentPostprocessing = 0;
  258 + };
249 97C146EC1CF9000F007C117D /* Resources */ = { 259 97C146EC1CF9000F007C117D /* Resources */ = {
250 isa = PBXResourcesBuildPhase; 260 isa = PBXResourcesBuildPhase;
251 buildActionMask = 2147483647; 261 buildActionMask = 2147483647;
252 files = ( 262 files = (
253 - 72DFBB9425BA6CD700EE1E5D /* tts_all.caf in Resources */,  
254 - 728D936A2B1DBD6D00EFD19A /* tts_wine_remind.caf in Resources */,  
255 - 728D93682B1DBD6D00EFD19A /* tts_voice.caf in Resources */,  
256 - 728D936B2B1DBD6D00EFD19A /* tts_recharge.caf in Resources */,  
257 - 72DFBB9525BA6CD700EE1E5D /* tts_cancel.caf in Resources */,  
258 - 72DFBB9625BA6CD700EE1E5D /* tts_invoice.caf in Resources */,  
259 - 72DFBB9725BA6CD700EE1E5D /* tts_new.caf in Resources */,  
260 - 72DFBB9825BA6CD700EE1E5D /* tts_online.caf in Resources */,  
261 - 728D936C2B1DBD6D00EFD19A /* tts_commemoration_day.caf in Resources */,  
262 - 72DFBB9925BA6CD700EE1E5D /* tts_order.caf in Resources */,  
263 - 72DFBB9A25BA6CD700EE1E5D /* tts_pay.caf in Resources */,  
264 - 72DFBB9B25BA6CD700EE1E5D /* tts_pre_pay.caf in Resources */,  
265 - 728D93692B1DBD6D00EFD19A /* tts_deposit.caf in Resources */,  
266 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, 263 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
267 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, 264 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
268 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 265 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
@@ -275,10 +272,12 @@ @@ -275,10 +272,12 @@
275 /* Begin PBXShellScriptBuildPhase section */ 272 /* Begin PBXShellScriptBuildPhase section */
276 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { 273 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
277 isa = PBXShellScriptBuildPhase; 274 isa = PBXShellScriptBuildPhase;
  275 + alwaysOutOfDate = 1;
278 buildActionMask = 2147483647; 276 buildActionMask = 2147483647;
279 files = ( 277 files = (
280 ); 278 );
281 inputPaths = ( 279 inputPaths = (
  280 + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
282 ); 281 );
283 name = "Thin Binary"; 282 name = "Thin Binary";
284 outputPaths = ( 283 outputPaths = (
@@ -287,8 +286,43 @@ @@ -287,8 +286,43 @@
287 shellPath = /bin/sh; 286 shellPath = /bin/sh;
288 shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n"; 287 shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
289 }; 288 };
  289 + 54CC91170D6A8CE2A0114D6E /* [CP] Embed Pods Frameworks */ = {
  290 + isa = PBXShellScriptBuildPhase;
  291 + buildActionMask = 2147483647;
  292 + files = (
  293 + );
  294 + inputFileListPaths = (
  295 + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
  296 + );
  297 + name = "[CP] Embed Pods Frameworks";
  298 + outputFileListPaths = (
  299 + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
  300 + );
  301 + runOnlyForDeploymentPostprocessing = 0;
  302 + shellPath = /bin/sh;
  303 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
  304 + showEnvVarsInLog = 0;
  305 + };
  306 + 8D6BE64BCA50732C7F2DB851 /* [CP] Copy Pods Resources */ = {
  307 + isa = PBXShellScriptBuildPhase;
  308 + buildActionMask = 2147483647;
  309 + files = (
  310 + );
  311 + inputFileListPaths = (
  312 + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
  313 + );
  314 + name = "[CP] Copy Pods Resources";
  315 + outputFileListPaths = (
  316 + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
  317 + );
  318 + runOnlyForDeploymentPostprocessing = 0;
  319 + shellPath = /bin/sh;
  320 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
  321 + showEnvVarsInLog = 0;
  322 + };
290 9740EEB61CF901F6004384FC /* Run Script */ = { 323 9740EEB61CF901F6004384FC /* Run Script */ = {
291 isa = PBXShellScriptBuildPhase; 324 isa = PBXShellScriptBuildPhase;
  325 + alwaysOutOfDate = 1;
292 buildActionMask = 2147483647; 326 buildActionMask = 2147483647;
293 files = ( 327 files = (
294 ); 328 );
@@ -301,6 +335,7 @@ @@ -301,6 +335,7 @@
301 shellPath = /bin/sh; 335 shellPath = /bin/sh;
302 shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n"; 336 shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
303 }; 337 };
  338 +<<<<<<< HEAD
304 9B9871E299FA5648CFE77D1A /* [CP] Embed Pods Frameworks */ = { 339 9B9871E299FA5648CFE77D1A /* [CP] Embed Pods Frameworks */ = {
305 isa = PBXShellScriptBuildPhase; 340 isa = PBXShellScriptBuildPhase;
306 buildActionMask = 2147483647; 341 buildActionMask = 2147483647;
@@ -414,6 +449,9 @@ @@ -414,6 +449,9 @@
414 showEnvVarsInLog = 0; 449 showEnvVarsInLog = 0;
415 }; 450 };
416 9C09FB22D919B3DDAB7B4DE4 /* [CP] Check Pods Manifest.lock */ = { 451 9C09FB22D919B3DDAB7B4DE4 /* [CP] Check Pods Manifest.lock */ = {
  452 +=======
  453 + 9D6E6C8DDD2621BB8784B52B /* [CP] Check Pods Manifest.lock */ = {
  454 +>>>>>>> v5.4.4+
417 isa = PBXShellScriptBuildPhase; 455 isa = PBXShellScriptBuildPhase;
418 buildActionMask = 2147483647; 456 buildActionMask = 2147483647;
419 files = ( 457 files = (
@@ -435,6 +473,7 @@ @@ -435,6 +473,7 @@
435 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"; 473 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";
436 showEnvVarsInLog = 0; 474 showEnvVarsInLog = 0;
437 }; 475 };
  476 +<<<<<<< HEAD
438 FE822B5E2C661DC46807EEC9 /* [CP] Copy Pods Resources */ = { 477 FE822B5E2C661DC46807EEC9 /* [CP] Copy Pods Resources */ = {
439 isa = PBXShellScriptBuildPhase; 478 isa = PBXShellScriptBuildPhase;
440 buildActionMask = 2147483647; 479 buildActionMask = 2147483647;
@@ -455,9 +494,19 @@ @@ -455,9 +494,19 @@
455 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; 494 shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
456 showEnvVarsInLog = 0; 495 showEnvVarsInLog = 0;
457 }; 496 };
  497 +=======
  498 +>>>>>>> v5.4.4+
458 /* End PBXShellScriptBuildPhase section */ 499 /* End PBXShellScriptBuildPhase section */
459 500
460 /* Begin PBXSourcesBuildPhase section */ 501 /* Begin PBXSourcesBuildPhase section */
  502 + 331C807D294A63A400263BE5 /* Sources */ = {
  503 + isa = PBXSourcesBuildPhase;
  504 + buildActionMask = 2147483647;
  505 + files = (
  506 + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */,
  507 + );
  508 + runOnlyForDeploymentPostprocessing = 0;
  509 + };
461 97C146EA1CF9000F007C117D /* Sources */ = { 510 97C146EA1CF9000F007C117D /* Sources */ = {
462 isa = PBXSourcesBuildPhase; 511 isa = PBXSourcesBuildPhase;
463 buildActionMask = 2147483647; 512 buildActionMask = 2147483647;
@@ -469,12 +518,19 @@ @@ -469,12 +518,19 @@
469 }; 518 };
470 /* End PBXSourcesBuildPhase section */ 519 /* End PBXSourcesBuildPhase section */
471 520
  521 +/* Begin PBXTargetDependency section */
  522 + 331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
  523 + isa = PBXTargetDependency;
  524 + target = 97C146ED1CF9000F007C117D /* Runner */;
  525 + targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
  526 + };
  527 +/* End PBXTargetDependency section */
  528 +
472 /* Begin PBXVariantGroup section */ 529 /* Begin PBXVariantGroup section */
473 97C146FA1CF9000F007C117D /* Main.storyboard */ = { 530 97C146FA1CF9000F007C117D /* Main.storyboard */ = {
474 isa = PBXVariantGroup; 531 isa = PBXVariantGroup;
475 children = ( 532 children = (
476 97C146FB1CF9000F007C117D /* Base */, 533 97C146FB1CF9000F007C117D /* Base */,
477 - 72544E7E2B592D7D00A1A4EF /* zh-Hans */,  
478 ); 534 );
479 name = Main.storyboard; 535 name = Main.storyboard;
480 sourceTree = "<group>"; 536 sourceTree = "<group>";
@@ -483,7 +539,6 @@ @@ -483,7 +539,6 @@
483 isa = PBXVariantGroup; 539 isa = PBXVariantGroup;
484 children = ( 540 children = (
485 97C147001CF9000F007C117D /* Base */, 541 97C147001CF9000F007C117D /* Base */,
486 - 72544E7F2B592D7E00A1A4EF /* zh-Hans */,  
487 ); 542 );
488 name = LaunchScreen.storyboard; 543 name = LaunchScreen.storyboard;
489 sourceTree = "<group>"; 544 sourceTree = "<group>";
@@ -495,7 +550,7 @@ @@ -495,7 +550,7 @@
495 isa = XCBuildConfiguration; 550 isa = XCBuildConfiguration;
496 buildSettings = { 551 buildSettings = {
497 ALWAYS_SEARCH_USER_PATHS = NO; 552 ALWAYS_SEARCH_USER_PATHS = NO;
498 - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; 553 + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
499 CLANG_ANALYZER_NONNULL = YES; 554 CLANG_ANALYZER_NONNULL = YES;
500 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; 555 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
501 CLANG_CXX_LIBRARY = "libc++"; 556 CLANG_CXX_LIBRARY = "libc++";
@@ -520,12 +575,12 @@ @@ -520,12 +575,12 @@
520 CLANG_WARN_SUSPICIOUS_MOVE = YES; 575 CLANG_WARN_SUSPICIOUS_MOVE = YES;
521 CLANG_WARN_UNREACHABLE_CODE = YES; 576 CLANG_WARN_UNREACHABLE_CODE = YES;
522 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 577 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
523 - CODE_SIGN_IDENTITY = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)";  
524 - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Naji (Beijing) Technology Co., Ltd. (8J59HM8B82)"; 578 + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
525 COPY_PHASE_STRIP = NO; 579 COPY_PHASE_STRIP = NO;
526 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; 580 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
527 ENABLE_NS_ASSERTIONS = NO; 581 ENABLE_NS_ASSERTIONS = NO;
528 ENABLE_STRICT_OBJC_MSGSEND = YES; 582 ENABLE_STRICT_OBJC_MSGSEND = YES;
  583 + ENABLE_USER_SCRIPT_SANDBOXING = NO;
529 GCC_C_LANGUAGE_STANDARD = gnu99; 584 GCC_C_LANGUAGE_STANDARD = gnu99;
530 GCC_NO_COMMON_BLOCKS = YES; 585 GCC_NO_COMMON_BLOCKS = YES;
531 GCC_WARN_64_TO_32_BIT_CONVERSION = YES; 586 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -534,9 +589,8 @@ @@ -534,9 +589,8 @@
534 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; 589 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
535 GCC_WARN_UNUSED_FUNCTION = YES; 590 GCC_WARN_UNUSED_FUNCTION = YES;
536 GCC_WARN_UNUSED_VARIABLE = YES; 591 GCC_WARN_UNUSED_VARIABLE = YES;
537 - IPHONEOS_DEPLOYMENT_TARGET = 11.0; 592 + IPHONEOS_DEPLOYMENT_TARGET = 12.0;
538 MTL_ENABLE_DEBUG_INFO = NO; 593 MTL_ENABLE_DEBUG_INFO = NO;
539 - PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile";  
540 SDKROOT = iphoneos; 594 SDKROOT = iphoneos;
541 SUPPORTED_PLATFORMS = iphoneos; 595 SUPPORTED_PLATFORMS = iphoneos;
542 TARGETED_DEVICE_FAMILY = "1,2"; 596 TARGETED_DEVICE_FAMILY = "1,2";
@@ -548,50 +602,88 @@ @@ -548,50 +602,88 @@
548 isa = XCBuildConfiguration; 602 isa = XCBuildConfiguration;
549 baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; 603 baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
550 buildSettings = { 604 buildSettings = {
551 - ARCHS = "$(ARCHS_STANDARD)";  
552 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 605 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
553 CLANG_ENABLE_MODULES = YES; 606 CLANG_ENABLE_MODULES = YES;
554 - CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;  
555 - CODE_SIGN_IDENTITY = "Apple Development";  
556 - CODE_SIGN_STYLE = Automatic;  
557 - CURRENT_PROJECT_VERSION = 542; 607 + CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
  608 + CURRENT_PROJECT_VERSION = 5503;
558 DEVELOPMENT_TEAM = 8J59HM8B82; 609 DEVELOPMENT_TEAM = 8J59HM8B82;
559 ENABLE_BITCODE = NO; 610 ENABLE_BITCODE = NO;
560 - FLUTTER_BUILD_MODE = release;  
561 - FLUTTER_ROOT = /Users/naji2021/Documents/flutter;  
562 - FRAMEWORK_SEARCH_PATHS = (  
563 - "$(inherited)",  
564 - "$(PROJECT_DIR)/Flutter",  
565 - );  
566 INFOPLIST_FILE = Runner/Info.plist; 611 INFOPLIST_FILE = Runner/Info.plist;
567 - IPHONEOS_DEPLOYMENT_TARGET = 12.0;  
568 - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";  
569 - LIBRARY_SEARCH_PATHS = ( 612 + IPHONEOS_DEPLOYMENT_TARGET = 15.6;
  613 + LD_RUNPATH_SEARCH_PATHS = (
570 "$(inherited)", 614 "$(inherited)",
571 - "$(PROJECT_DIR)/Flutter", 615 + "@executable_path/Frameworks",
572 ); 616 );
573 <<<<<<< HEAD 617 <<<<<<< HEAD
  618 +<<<<<<< HEAD
574 MARKETING_VERSION = 6.0.0; 619 MARKETING_VERSION = 6.0.0;
575 ======= 620 =======
576 MARKETING_VERSION = 5.4.3; 621 MARKETING_VERSION = 5.4.3;
577 >>>>>>> 58718afe (预订安排页人数变更修改) 622 >>>>>>> 58718afe (预订安排页人数变更修改)
578 PODS_ROOT = "$(inherited)"; 623 PODS_ROOT = "$(inherited)";
  624 +=======
  625 + MARKETING_VERSION = 5.5.0;
  626 +>>>>>>> v5.4.4+
579 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 627 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
580 - PRODUCT_NAME = Runner;  
581 - PROVISIONING_PROFILE_SPECIFIER = "";  
582 - SWIFT_ENABLE_BATCH_MODE = NO; 628 + PRODUCT_NAME = "$(TARGET_NAME)";
583 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 629 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
584 SWIFT_VERSION = 5.0; 630 SWIFT_VERSION = 5.0;
585 - VALID_ARCHS = "$(inherited)";  
586 VERSIONING_SYSTEM = "apple-generic"; 631 VERSIONING_SYSTEM = "apple-generic";
587 }; 632 };
588 name = Profile; 633 name = Profile;
589 }; 634 };
  635 + 331C8088294A63A400263BE5 /* Debug */ = {
  636 + isa = XCBuildConfiguration;
  637 + buildSettings = {
  638 + BUNDLE_LOADER = "$(TEST_HOST)";
  639 + CODE_SIGN_STYLE = Automatic;
  640 + CURRENT_PROJECT_VERSION = 1;
  641 + GENERATE_INFOPLIST_FILE = YES;
  642 + MARKETING_VERSION = 1.0;
  643 + PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterReserveapp.RunnerTests;
  644 + PRODUCT_NAME = "$(TARGET_NAME)";
  645 + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
  646 + SWIFT_OPTIMIZATION_LEVEL = "-Onone";
  647 + SWIFT_VERSION = 5.0;
  648 + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
  649 + };
  650 + name = Debug;
  651 + };
  652 + 331C8089294A63A400263BE5 /* Release */ = {
  653 + isa = XCBuildConfiguration;
  654 + buildSettings = {
  655 + BUNDLE_LOADER = "$(TEST_HOST)";
  656 + CODE_SIGN_STYLE = Automatic;
  657 + CURRENT_PROJECT_VERSION = 1;
  658 + GENERATE_INFOPLIST_FILE = YES;
  659 + MARKETING_VERSION = 1.0;
  660 + PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterReserveapp.RunnerTests;
  661 + PRODUCT_NAME = "$(TARGET_NAME)";
  662 + SWIFT_VERSION = 5.0;
  663 + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
  664 + };
  665 + name = Release;
  666 + };
  667 + 331C808A294A63A400263BE5 /* Profile */ = {
  668 + isa = XCBuildConfiguration;
  669 + buildSettings = {
  670 + BUNDLE_LOADER = "$(TEST_HOST)";
  671 + CODE_SIGN_STYLE = Automatic;
  672 + CURRENT_PROJECT_VERSION = 1;
  673 + GENERATE_INFOPLIST_FILE = YES;
  674 + MARKETING_VERSION = 1.0;
  675 + PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterReserveapp.RunnerTests;
  676 + PRODUCT_NAME = "$(TARGET_NAME)";
  677 + SWIFT_VERSION = 5.0;
  678 + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
  679 + };
  680 + name = Profile;
  681 + };
590 97C147031CF9000F007C117D /* Debug */ = { 682 97C147031CF9000F007C117D /* Debug */ = {
591 isa = XCBuildConfiguration; 683 isa = XCBuildConfiguration;
592 buildSettings = { 684 buildSettings = {
593 ALWAYS_SEARCH_USER_PATHS = NO; 685 ALWAYS_SEARCH_USER_PATHS = NO;
594 - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; 686 + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
595 CLANG_ANALYZER_NONNULL = YES; 687 CLANG_ANALYZER_NONNULL = YES;
596 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; 688 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
597 CLANG_CXX_LIBRARY = "libc++"; 689 CLANG_CXX_LIBRARY = "libc++";
@@ -616,12 +708,12 @@ @@ -616,12 +708,12 @@
616 CLANG_WARN_SUSPICIOUS_MOVE = YES; 708 CLANG_WARN_SUSPICIOUS_MOVE = YES;
617 CLANG_WARN_UNREACHABLE_CODE = YES; 709 CLANG_WARN_UNREACHABLE_CODE = YES;
618 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 710 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
619 - CODE_SIGN_IDENTITY = "Apple Development: 冬妮 王 (HK623XJ482)";  
620 - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: 冬妮 王 (HK623XJ482)"; 711 + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
621 COPY_PHASE_STRIP = NO; 712 COPY_PHASE_STRIP = NO;
622 DEBUG_INFORMATION_FORMAT = dwarf; 713 DEBUG_INFORMATION_FORMAT = dwarf;
623 ENABLE_STRICT_OBJC_MSGSEND = YES; 714 ENABLE_STRICT_OBJC_MSGSEND = YES;
624 ENABLE_TESTABILITY = YES; 715 ENABLE_TESTABILITY = YES;
  716 + ENABLE_USER_SCRIPT_SANDBOXING = NO;
625 GCC_C_LANGUAGE_STANDARD = gnu99; 717 GCC_C_LANGUAGE_STANDARD = gnu99;
626 GCC_DYNAMIC_NO_PIC = NO; 718 GCC_DYNAMIC_NO_PIC = NO;
627 GCC_NO_COMMON_BLOCKS = YES; 719 GCC_NO_COMMON_BLOCKS = YES;
@@ -636,10 +728,9 @@ @@ -636,10 +728,9 @@
636 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; 728 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
637 GCC_WARN_UNUSED_FUNCTION = YES; 729 GCC_WARN_UNUSED_FUNCTION = YES;
638 GCC_WARN_UNUSED_VARIABLE = YES; 730 GCC_WARN_UNUSED_VARIABLE = YES;
639 - IPHONEOS_DEPLOYMENT_TARGET = 11.0; 731 + IPHONEOS_DEPLOYMENT_TARGET = 12.0;
640 MTL_ENABLE_DEBUG_INFO = YES; 732 MTL_ENABLE_DEBUG_INFO = YES;
641 ONLY_ACTIVE_ARCH = YES; 733 ONLY_ACTIVE_ARCH = YES;
642 - PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile";  
643 SDKROOT = iphoneos; 734 SDKROOT = iphoneos;
644 TARGETED_DEVICE_FAMILY = "1,2"; 735 TARGETED_DEVICE_FAMILY = "1,2";
645 }; 736 };
@@ -649,7 +740,7 @@ @@ -649,7 +740,7 @@
649 isa = XCBuildConfiguration; 740 isa = XCBuildConfiguration;
650 buildSettings = { 741 buildSettings = {
651 ALWAYS_SEARCH_USER_PATHS = NO; 742 ALWAYS_SEARCH_USER_PATHS = NO;
652 - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; 743 + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
653 CLANG_ANALYZER_NONNULL = YES; 744 CLANG_ANALYZER_NONNULL = YES;
654 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; 745 CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
655 CLANG_CXX_LIBRARY = "libc++"; 746 CLANG_CXX_LIBRARY = "libc++";
@@ -674,12 +765,12 @@ @@ -674,12 +765,12 @@
674 CLANG_WARN_SUSPICIOUS_MOVE = YES; 765 CLANG_WARN_SUSPICIOUS_MOVE = YES;
675 CLANG_WARN_UNREACHABLE_CODE = YES; 766 CLANG_WARN_UNREACHABLE_CODE = YES;
676 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 767 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
677 - CODE_SIGN_IDENTITY = "Apple Development: 冬妮 王 (HK623XJ482)";  
678 - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: 冬妮 王 (HK623XJ482)"; 768 + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
679 COPY_PHASE_STRIP = NO; 769 COPY_PHASE_STRIP = NO;
680 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; 770 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
681 ENABLE_NS_ASSERTIONS = NO; 771 ENABLE_NS_ASSERTIONS = NO;
682 ENABLE_STRICT_OBJC_MSGSEND = YES; 772 ENABLE_STRICT_OBJC_MSGSEND = YES;
  773 + ENABLE_USER_SCRIPT_SANDBOXING = NO;
683 GCC_C_LANGUAGE_STANDARD = gnu99; 774 GCC_C_LANGUAGE_STANDARD = gnu99;
684 GCC_NO_COMMON_BLOCKS = YES; 775 GCC_NO_COMMON_BLOCKS = YES;
685 GCC_WARN_64_TO_32_BIT_CONVERSION = YES; 776 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -688,12 +779,12 @@ @@ -688,12 +779,12 @@
688 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; 779 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
689 GCC_WARN_UNUSED_FUNCTION = YES; 780 GCC_WARN_UNUSED_FUNCTION = YES;
690 GCC_WARN_UNUSED_VARIABLE = YES; 781 GCC_WARN_UNUSED_VARIABLE = YES;
691 - IPHONEOS_DEPLOYMENT_TARGET = 11.0; 782 + IPHONEOS_DEPLOYMENT_TARGET = 12.0;
692 MTL_ENABLE_DEBUG_INFO = NO; 783 MTL_ENABLE_DEBUG_INFO = NO;
693 - PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile";  
694 SDKROOT = iphoneos; 784 SDKROOT = iphoneos;
695 SUPPORTED_PLATFORMS = iphoneos; 785 SUPPORTED_PLATFORMS = iphoneos;
696 - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; 786 + SWIFT_COMPILATION_MODE = wholemodule;
  787 + SWIFT_OPTIMIZATION_LEVEL = "-O";
697 TARGETED_DEVICE_FAMILY = "1,2"; 788 TARGETED_DEVICE_FAMILY = "1,2";
698 VALIDATE_PRODUCT = YES; 789 VALIDATE_PRODUCT = YES;
699 }; 790 };
@@ -701,17 +792,15 @@ @@ -701,17 +792,15 @@
701 }; 792 };
702 97C147061CF9000F007C117D /* Debug */ = { 793 97C147061CF9000F007C117D /* Debug */ = {
703 isa = XCBuildConfiguration; 794 isa = XCBuildConfiguration;
704 - baseConfigurationReference = 22513BD076488FBD50F0303F /* Pods-Runner.debug.xcconfig */; 795 + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
705 buildSettings = { 796 buildSettings = {
706 - ARCHS = "$(ARCHS_STANDARD)";  
707 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 797 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
708 CLANG_ENABLE_MODULES = YES; 798 CLANG_ENABLE_MODULES = YES;
709 - CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";  
710 - CODE_SIGN_IDENTITY = "Apple Development";  
711 - CODE_SIGN_STYLE = Automatic;  
712 - CURRENT_PROJECT_VERSION = 542; 799 + CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
  800 + CURRENT_PROJECT_VERSION = 5503;
713 DEVELOPMENT_TEAM = 8J59HM8B82; 801 DEVELOPMENT_TEAM = 8J59HM8B82;
714 ENABLE_BITCODE = NO; 802 ENABLE_BITCODE = NO;
  803 +<<<<<<< HEAD
715 FLUTTER_BUILD_MODE = debug; 804 FLUTTER_BUILD_MODE = debug;
716 FLUTTER_ROOT = /Users/naji2021/Documents/flutter; 805 FLUTTER_ROOT = /Users/naji2021/Documents/flutter;
717 FLUTTER_TARGET = "/Users/naji2021/Desktop/Flutter-ReserveApp/lib/main.dart"; 806 FLUTTER_TARGET = "/Users/naji2021/Desktop/Flutter-ReserveApp/lib/main.dart";
@@ -719,28 +808,30 @@ @@ -719,28 +808,30 @@
719 "$(inherited)", 808 "$(inherited)",
720 "$(PROJECT_DIR)/Flutter", 809 "$(PROJECT_DIR)/Flutter",
721 ); 810 );
  811 +=======
  812 +>>>>>>> v5.4.4+
722 INFOPLIST_FILE = Runner/Info.plist; 813 INFOPLIST_FILE = Runner/Info.plist;
723 - IPHONEOS_DEPLOYMENT_TARGET = 12.0;  
724 - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";  
725 - LIBRARY_SEARCH_PATHS = ( 814 + IPHONEOS_DEPLOYMENT_TARGET = 15.6;
  815 + LD_RUNPATH_SEARCH_PATHS = (
726 "$(inherited)", 816 "$(inherited)",
727 - "$(PROJECT_DIR)/Flutter", 817 + "@executable_path/Frameworks",
728 ); 818 );
729 <<<<<<< HEAD 819 <<<<<<< HEAD
  820 +<<<<<<< HEAD
730 MARKETING_VERSION = 6.0.0; 821 MARKETING_VERSION = 6.0.0;
731 ======= 822 =======
732 MARKETING_VERSION = 5.4.3; 823 MARKETING_VERSION = 5.4.3;
733 >>>>>>> 58718afe (预订安排页人数变更修改) 824 >>>>>>> 58718afe (预订安排页人数变更修改)
734 PACKAGE_CONFIG = "/Users/naji2021/Desktop/Flutter-ReserveApp/.dart_tool/package_config.json"; 825 PACKAGE_CONFIG = "/Users/naji2021/Desktop/Flutter-ReserveApp/.dart_tool/package_config.json";
735 PODS_ROOT = "$(inherited)"; 826 PODS_ROOT = "$(inherited)";
  827 +=======
  828 + MARKETING_VERSION = 5.5.0;
  829 +>>>>>>> v5.4.4+
736 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 830 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
737 - PRODUCT_NAME = Runner;  
738 - PROVISIONING_PROFILE_SPECIFIER = "";  
739 - SWIFT_ENABLE_BATCH_MODE = NO; 831 + PRODUCT_NAME = "$(TARGET_NAME)";
740 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 832 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
741 SWIFT_OPTIMIZATION_LEVEL = "-Onone"; 833 SWIFT_OPTIMIZATION_LEVEL = "-Onone";
742 SWIFT_VERSION = 5.0; 834 SWIFT_VERSION = 5.0;
743 - VALID_ARCHS = "$(inherited)";  
744 VERSIONING_SYSTEM = "apple-generic"; 835 VERSIONING_SYSTEM = "apple-generic";
745 }; 836 };
746 name = Debug; 837 name = Debug;
@@ -749,41 +840,32 @@ @@ -749,41 +840,32 @@
749 isa = XCBuildConfiguration; 840 isa = XCBuildConfiguration;
750 baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; 841 baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
751 buildSettings = { 842 buildSettings = {
752 - ARCHS = "$(ARCHS_STANDARD)";  
753 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 843 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
754 CLANG_ENABLE_MODULES = YES; 844 CLANG_ENABLE_MODULES = YES;
755 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 845 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
756 - CODE_SIGN_IDENTITY = "Apple Development";  
757 - CODE_SIGN_STYLE = Automatic;  
758 - CURRENT_PROJECT_VERSION = 542; 846 + CURRENT_PROJECT_VERSION = 5503;
759 DEVELOPMENT_TEAM = 8J59HM8B82; 847 DEVELOPMENT_TEAM = 8J59HM8B82;
760 ENABLE_BITCODE = NO; 848 ENABLE_BITCODE = NO;
761 - FLUTTER_BUILD_MODE = release;  
762 - FLUTTER_ROOT = /Users/naji2021/Documents/flutter;  
763 - FRAMEWORK_SEARCH_PATHS = (  
764 - "$(inherited)",  
765 - "$(PROJECT_DIR)/Flutter",  
766 - );  
767 INFOPLIST_FILE = Runner/Info.plist; 849 INFOPLIST_FILE = Runner/Info.plist;
768 - IPHONEOS_DEPLOYMENT_TARGET = 12.0;  
769 - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";  
770 - LIBRARY_SEARCH_PATHS = ( 850 + IPHONEOS_DEPLOYMENT_TARGET = 15.6;
  851 + LD_RUNPATH_SEARCH_PATHS = (
771 "$(inherited)", 852 "$(inherited)",
772 - "$(PROJECT_DIR)/Flutter", 853 + "@executable_path/Frameworks",
773 ); 854 );
774 <<<<<<< HEAD 855 <<<<<<< HEAD
  856 +<<<<<<< HEAD
775 MARKETING_VERSION = 6.0.0; 857 MARKETING_VERSION = 6.0.0;
776 ======= 858 =======
777 MARKETING_VERSION = 5.4.3; 859 MARKETING_VERSION = 5.4.3;
778 >>>>>>> 58718afe (预订安排页人数变更修改) 860 >>>>>>> 58718afe (预订安排页人数变更修改)
779 PODS_ROOT = "$(inherited)"; 861 PODS_ROOT = "$(inherited)";
  862 +=======
  863 + MARKETING_VERSION = 5.5.0;
  864 +>>>>>>> v5.4.4+
780 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 865 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
781 - PRODUCT_NAME = Runner;  
782 - PROVISIONING_PROFILE_SPECIFIER = "";  
783 - SWIFT_ENABLE_BATCH_MODE = NO; 866 + PRODUCT_NAME = "$(TARGET_NAME)";
784 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 867 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
785 SWIFT_VERSION = 5.0; 868 SWIFT_VERSION = 5.0;
786 - VALID_ARCHS = "$(inherited)";  
787 VERSIONING_SYSTEM = "apple-generic"; 869 VERSIONING_SYSTEM = "apple-generic";
788 }; 870 };
789 name = Release; 871 name = Release;
@@ -791,6 +873,16 @@ @@ -791,6 +873,16 @@
791 /* End XCBuildConfiguration section */ 873 /* End XCBuildConfiguration section */
792 874
793 /* Begin XCConfigurationList section */ 875 /* Begin XCConfigurationList section */
  876 + 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = {
  877 + isa = XCConfigurationList;
  878 + buildConfigurations = (
  879 + 331C8088294A63A400263BE5 /* Debug */,
  880 + 331C8089294A63A400263BE5 /* Release */,
  881 + 331C808A294A63A400263BE5 /* Profile */,
  882 + );
  883 + defaultConfigurationIsVisible = 0;
  884 + defaultConfigurationName = Release;
  885 + };
794 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { 886 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
795 isa = XCConfigurationList; 887 isa = XCConfigurationList;
796 buildConfigurations = ( 888 buildConfigurations = (
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <Scheme 2 <Scheme
3 - LastUpgradeVersion = "1300" 3 + LastUpgradeVersion = "1510"
4 version = "1.3"> 4 version = "1.3">
5 <BuildAction 5 <BuildAction
6 parallelizeBuildables = "YES" 6 parallelizeBuildables = "YES"
@@ -37,6 +37,17 @@ @@ -37,6 +37,17 @@
37 </BuildableReference> 37 </BuildableReference>
38 </MacroExpansion> 38 </MacroExpansion>
39 <Testables> 39 <Testables>
  40 + <TestableReference
  41 + skipped = "NO"
  42 + parallelizable = "YES">
  43 + <BuildableReference
  44 + BuildableIdentifier = "primary"
  45 + BlueprintIdentifier = "331C8080294A63A400263BE5"
  46 + BuildableName = "RunnerTests.xctest"
  47 + BlueprintName = "RunnerTests"
  48 + ReferencedContainer = "container:Runner.xcodeproj">
  49 + </BuildableReference>
  50 + </TestableReference>
40 </Testables> 51 </Testables>
41 </TestAction> 52 </TestAction>
42 <LaunchAction 53 <LaunchAction
@@ -48,6 +59,7 @@ @@ -48,6 +59,7 @@
48 ignoresPersistentStateOnLaunch = "NO" 59 ignoresPersistentStateOnLaunch = "NO"
49 debugDocumentVersioning = "YES" 60 debugDocumentVersioning = "YES"
50 debugServiceExtension = "internal" 61 debugServiceExtension = "internal"
  62 + enableGPUValidationMode = "1"
51 allowLocationSimulation = "YES"> 63 allowLocationSimulation = "YES">
52 <BuildableProductRunnable 64 <BuildableProductRunnable
53 runnableDebuggingMode = "0"> 65 runnableDebuggingMode = "0">
@@ -3,7 +3,7 @@ import Flutter @@ -3,7 +3,7 @@ import Flutter
3 import flutter_downloader 3 import flutter_downloader
4 import GoogleMaps 4 import GoogleMaps
5 5
6 -@UIApplicationMain 6 +@main
7 @objc class AppDelegate: FlutterAppDelegate { 7 @objc class AppDelegate: FlutterAppDelegate {
8 override func application( 8 override func application(
9 _ application: UIApplication, 9 _ application: UIApplication,
1 -{  
2 - "info" : {  
3 - "version" : 1,  
4 - "author" : "xcode"  
5 - }  
6 -}  
@@ -2,12 +2,15 @@ @@ -2,12 +2,15 @@
2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> 2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 <plist version="1.0"> 3 <plist version="1.0">
4 <dict> 4 <dict>
  5 +<<<<<<< HEAD
5 <!-- <key>NSBonjourServices</key> 6 <!-- <key>NSBonjourServices</key>
6 <string>_dartobservatory._tcp</string> --> 7 <string>_dartobservatory._tcp</string> -->
7 <key>LSSupportsOpeningDocumentsInPlace</key> 8 <key>LSSupportsOpeningDocumentsInPlace</key>
8 <true/> 9 <true/>
9 <key>UIFileSharingEnabled</key> 10 <key>UIFileSharingEnabled</key>
10 <true/> 11 <true/>
  12 +=======
  13 +>>>>>>> v5.4.4+
11 <key>CADisableMinimumFrameDurationOnPhone</key> 14 <key>CADisableMinimumFrameDurationOnPhone</key>
12 <true/> 15 <true/>
13 <key>CFBundleAllowMixedLocalizations</key> 16 <key>CFBundleAllowMixedLocalizations</key>
@@ -19,7 +22,7 @@ @@ -19,7 +22,7 @@
19 <key>CFBundleExecutable</key> 22 <key>CFBundleExecutable</key>
20 <string>$(EXECUTABLE_NAME)</string> 23 <string>$(EXECUTABLE_NAME)</string>
21 <key>CFBundleIdentifier</key> 24 <key>CFBundleIdentifier</key>
22 - <string>com.naji.reserveLine</string> 25 + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
23 <key>CFBundleInfoDictionaryVersion</key> 26 <key>CFBundleInfoDictionaryVersion</key>
24 <string>6.0</string> 27 <string>6.0</string>
25 <key>CFBundleName</key> 28 <key>CFBundleName</key>
@@ -33,20 +36,20 @@ @@ -33,20 +36,20 @@
33 <key>CFBundleURLTypes</key> 36 <key>CFBundleURLTypes</key>
34 <array> 37 <array>
35 <dict> 38 <dict>
  39 + <key>CFBundleURLName</key>
  40 + <string>main</string>
36 <key>CFBundleURLSchemes</key> 41 <key>CFBundleURLSchemes</key>
37 <array> 42 <array>
38 <string>wwbdca186ec4257973</string> 43 <string>wwbdca186ec4257973</string>
39 </array> 44 </array>
40 - <key>CFBundleURLName</key>  
41 - <string>main</string>  
42 </dict> 45 </dict>
43 <dict> 46 <dict>
  47 + <key>CFBundleURLName</key>
  48 + <string>main</string>
44 <key>CFBundleURLSchemes</key> 49 <key>CFBundleURLSchemes</key>
45 <array> 50 <array>
46 <string>wwauthbdca186ec4257973000006</string> 51 <string>wwauthbdca186ec4257973000006</string>
47 </array> 52 </array>
48 - <key>CFBundleURLName</key>  
49 - <string>main</string>  
50 </dict> 53 </dict>
51 <dict> 54 <dict>
52 <key>CFBundleTypeRole</key> 55 <key>CFBundleTypeRole</key>
@@ -72,18 +75,23 @@ @@ -72,18 +75,23 @@
72 <string>weixin</string> 75 <string>weixin</string>
73 <string>iosamap</string> 76 <string>iosamap</string>
74 <string>amapuri</string> 77 <string>amapuri</string>
  78 +<<<<<<< HEAD
75 <string>whatsapp</string> 79 <string>whatsapp</string>
  80 +=======
  81 + <string>weixinURLParamsAPI</string>
  82 +>>>>>>> v5.4.4+
76 </array> 83 </array>
77 <key>LSRequiresIPhoneOS</key> 84 <key>LSRequiresIPhoneOS</key>
78 <true/> 85 <true/>
  86 + <key>LSSupportsOpeningDocumentsInPlace</key>
  87 + <true/>
79 <key>NSAppTransportSecurity</key> 88 <key>NSAppTransportSecurity</key>
80 <dict> 89 <dict>
81 <key>NSAllowsArbitraryLoads</key> 90 <key>NSAllowsArbitraryLoads</key>
82 <true/> 91 <true/>
  92 + <key>NSAllowsArbitraryLoadsInWebContent</key>
  93 + <true/>
83 </dict> 94 </dict>
84 -  
85 - <key>NSMicrophoneUsageDescription</key>  
86 - <string>需要您的同意,APP才能使用您的麦克风来录制店铺视频介绍</string>  
87 <key>NSAppleMusicUsageDescription</key> 95 <key>NSAppleMusicUsageDescription</key>
88 <string>需要您的同意,APP才能访问媒体资料库</string> 96 <string>需要您的同意,APP才能访问媒体资料库</string>
89 <key>NSCalendarsUsageDescription</key> 97 <key>NSCalendarsUsageDescription</key>
@@ -94,21 +102,30 @@ @@ -94,21 +102,30 @@
94 <string>允许访问您的通讯录来一键录入联系人</string> 102 <string>允许访问您的通讯录来一键录入联系人</string>
95 <key>NSLocationWhenInUseUsageDescription</key> 103 <key>NSLocationWhenInUseUsageDescription</key>
96 <string>需要您的同意,APP才能在创建店铺时选择店铺位置</string> 104 <string>需要您的同意,APP才能在创建店铺时选择店铺位置</string>
  105 + <key>NSMicrophoneUsageDescription</key>
  106 + <string>需要您的同意,APP才能使用您的麦克风来录制店铺视频介绍</string>
97 <key>NSMotionUsageDescription</key> 107 <key>NSMotionUsageDescription</key>
98 <string>需要您的同意,APP才能访问运动与健身</string> 108 <string>需要您的同意,APP才能访问运动与健身</string>
99 <key>NSPhotoLibraryUsageDescription</key> 109 <key>NSPhotoLibraryUsageDescription</key>
100 <string>需要您的同意,APP才能访问您的相册来上传消费清单</string> 110 <string>需要您的同意,APP才能访问您的相册来上传消费清单</string>
101 <key>NSSpeechRecognitionUsageDescription</key> 111 <key>NSSpeechRecognitionUsageDescription</key>
102 <string>需要您的同意,APP才能访问语音识别</string> 112 <string>需要您的同意,APP才能访问语音识别</string>
  113 +<<<<<<< HEAD
103 <key>NSLocationAlwaysAndWhenInUseUsageDescription</key> 114 <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
104 <string>需要您的同意,APP才能在创建店铺时选择店铺位置</string> 115 <string>需要您的同意,APP才能在创建店铺时选择店铺位置</string>
105 <key>NSLocationAlwaysUsageDescription</key> 116 <key>NSLocationAlwaysUsageDescription</key>
106 <string>需要您的同意,APP才能在创建店铺时选择店铺位置</string> 117 <string>需要您的同意,APP才能在创建店铺时选择店铺位置</string>
  118 +=======
  119 + <key>UIApplicationSupportsIndirectInputEvents</key>
  120 + <true/>
  121 +>>>>>>> v5.4.4+
107 <key>UIBackgroundModes</key> 122 <key>UIBackgroundModes</key>
108 <array> 123 <array>
109 <string>fetch</string> 124 <string>fetch</string>
110 <string>remote-notification</string> 125 <string>remote-notification</string>
111 </array> 126 </array>
  127 + <key>UIFileSharingEnabled</key>
  128 + <true/>
112 <key>UILaunchStoryboardName</key> 129 <key>UILaunchStoryboardName</key>
113 <string>LaunchScreen</string> 130 <string>LaunchScreen</string>
114 <key>UIMainStoryboardFile</key> 131 <key>UIMainStoryboardFile</key>
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> 2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 <plist version="1.0"> 3 <plist version="1.0">
4 -<dict>  
5 - <key>aps-environment</key>  
6 - <string>development</string>  
7 - <key>com.apple.developer.applesignin</key>  
8 - <array>  
9 - <string>Default</string>  
10 - </array>  
11 - <key>com.apple.developer.associated-domains</key>  
12 - <array>  
13 - <string>applinks:xt04.colorcun.com</string>  
14 - </array>  
15 -</dict> 4 +<dict/>
16 </plist> 5 </plist>
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">  
3 -<plist version="1.0">  
4 -<dict>  
5 - <key>aps-environment</key>  
6 - <string>development</string>  
7 - <key>com.apple.developer.applesignin</key>  
8 - <array>  
9 - <string>Default</string>  
10 - </array>  
11 - <key>com.apple.developer.associated-domains</key>  
12 - <array>  
13 - <string>applinks:xt04.colorcun.com</string>  
14 - </array>  
15 -</dict>  
16 -</plist>  
  1 +import Flutter
  2 +import UIKit
  3 +import XCTest
  4 +
  5 +class RunnerTests: XCTestCase {
  6 +
  7 + func testExample() {
  8 + // If you add code to the Runner application, consider adding tests here.
  9 + // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
  10 + }
  11 +
  12 +}
1 - extern const unsigned char RunnerVersionString[];  
2 - extern const double RunnerVersionNumber;  
3 -  
4 - const unsigned char RunnerVersionString[] __attribute__ ((used)) = "@(#)PROGRAM:Runner PROJECT:Runner-393" "\n";  
5 - const double RunnerVersionNumber __attribute__ ((used)) = (double)393.;  
1 -{"":{"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"}}  
1 -version: "Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)"  
2 -options: "31d1359b39fa124baf9b86a743115137d852f39fd379aa67ceb7d199d1a118f3"  
3 -build_start_time: [1662690689, 518762111]  
4 -build_end_time: [1662690689, 623396873]  
5 -inputs:  
6 - "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift": !private [1626855519, 779936790]  
1 -version: "Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)"  
2 -options: "31d1359b39fa124baf9b86a743115137d852f39fd379aa67ceb7d199d1a118f3"  
3 -build_start_time: [1662690146, 218652009]  
4 -build_end_time: [1662690146, 534229040]  
5 -inputs:  
6 - "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift": !private [1626855519, 779936790]  
1 -/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift  
1 -{"":{"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"}}  
1 -version: "Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)"  
2 -options: "31d1359b39fa124baf9b86a743115137d852f39fd379aa67ceb7d199d1a118f3"  
3 -build_start_time: [1662690277, 307630062]  
4 -build_end_time: [1662690277, 474601030]  
5 -inputs:  
6 - "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift": !private [1626855519, 779936790]  
1 -/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift  
1 -#!/bin/sh  
2 -diff "${PODS_PODFILE_DIR_PATH}/Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null  
3 -if [ $? != 0 ] ; then  
4 - # print error to STDERR  
5 - echo "error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation." >&2  
6 - exit 1  
7 -fi  
8 -# This output is used by Xcode 'outputs' to avoid re-running this script phase.  
9 -echo "SUCCESS" > "${SCRIPT_OUTPUT_FILE_0}"  
10 -  
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">  
3 -<plist version="1.0">  
4 -<dict>  
5 - <key>application-identifier</key>  
6 - <string>8J59HM8B82.com.naji.reserveLine</string>  
7 - <key>aps-environment</key>  
8 - <string>development</string>  
9 - <key>com.apple.developer.applesignin</key>  
10 - <array>  
11 - <string>Default</string>  
12 - </array>  
13 - <key>com.apple.developer.associated-domains</key>  
14 - <array>  
15 - <string>applinks:xt04.colorcun.com</string>  
16 - </array>  
17 -</dict>  
18 -</plist>  
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">  
3 -<plist version="1.0">  
4 -<dict>  
5 - <key>com.apple.security.get-task-allow</key>  
6 - <true/>  
7 -</dict>  
8 -</plist>  
1 - extern const unsigned char RunnerVersionString[];  
2 - extern const double RunnerVersionNumber;  
3 -  
4 - const unsigned char RunnerVersionString[] __attribute__ ((used)) = "@(#)PROGRAM:Runner PROJECT:Runner-393" "\n";  
5 - const double RunnerVersionNumber __attribute__ ((used)) = (double)393.;  
1 -{"":{"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"}}  
1 -version: "Apple Swift version 5.6.1 (swiftlang-5.6.0.323.66 clang-1316.0.20.12)"  
2 -options: "31d1359b39fa124baf9b86a743115137d852f39fd379aa67ceb7d199d1a118f3"  
3 -build_start_time: [1662689681, 339809894]  
4 -build_end_time: [1662689681, 450616836]  
5 -inputs:  
6 - "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner/AppDelegate.swift": !private [1626855519, 779936790]  
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">  
3 -<plist version="1.0">  
4 -<dict>  
5 - <key>application-identifier</key>  
6 - <string>8J59HM8B82.com.naji.reserveLine</string>  
7 - <key>aps-environment</key>  
8 - <string>development</string>  
9 - <key>com.apple.developer.applesignin</key>  
10 - <array>  
11 - <string>Default</string>  
12 - </array>  
13 - <key>com.apple.developer.associated-domains</key>  
14 - <array>  
15 - <string>applinks:xt04.colorcun.com</string>  
16 - </array>  
17 -</dict>  
18 -</plist>  
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">  
3 -<plist version="1.0">  
4 -<dict>  
5 - <key>com.apple.security.get-task-allow</key>  
6 - <true/>  
7 -</dict>  
8 -</plist>  
1 -#!/bin/sh  
2 -diff "${PODS_PODFILE_DIR_PATH}/Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null  
3 -if [ $? != 0 ] ; then  
4 - # print error to STDERR  
5 - echo "error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation." >&2  
6 - exit 1  
7 -fi  
8 -# This output is used by Xcode 'outputs' to avoid re-running this script phase.  
9 -echo "SUCCESS" > "${SCRIPT_OUTPUT_FILE_0}"  
10 -  
1 -{  
2 - "_buildCommand2" : {  
3 - "command" : "prepareForIndexing",  
4 - "enableIndexBuildArena" : false,  
5 - "targets" : null  
6 - },  
7 - "buildCommand" : "build",  
8 - "configuredTargets" : [  
9 - {  
10 - "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"  
11 - }  
12 - ],  
13 - "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",  
14 - "continueBuildingAfterErrors" : true,  
15 - "enableIndexBuildArena" : false,  
16 - "hideShellScriptEnvironment" : false,  
17 - "parameters" : {  
18 - "action" : "build",  
19 - "activeArchitecture" : "arm64e",  
20 - "activeRunDestination" : {  
21 - "disableOnlyActiveArch" : true,  
22 - "platform" : "iphoneos",  
23 - "sdk" : "iphoneos15.5",  
24 - "sdkVariant" : "iphoneos",  
25 - "supportedArchitectures" : [  
26 - "armv4t",  
27 - "armv5",  
28 - "armv6",  
29 - "armv7",  
30 - "armv7f",  
31 - "armv7s",  
32 - "armv7k",  
33 - "arm64",  
34 - "arm64e"  
35 - ],  
36 - "targetArchitecture" : "arm64e"  
37 - },  
38 - "arenaInfo" : {  
39 - "buildIntermediatesPath" : "",  
40 - "buildProductsPath" : "",  
41 - "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",  
42 - "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",  
43 - "indexEnableDataStore" : true,  
44 - "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",  
45 - "pchPath" : ""  
46 - },  
47 - "configurationName" : "Debug",  
48 - "overrides" : {  
49 - "synthesized" : {  
50 - "table" : {  
51 - "ENABLE_PREVIEWS" : "NO"  
52 - }  
53 - }  
54 - }  
55 - },  
56 - "qos" : "default",  
57 - "schemeCommand" : "launch",  
58 - "schemeCommand2" : "launch",  
59 - "shouldCollectMetrics" : false,  
60 - "showNonLoggedProgress" : true,  
61 - "useDryRun" : true,  
62 - "useImplicitDependencies" : true,  
63 - "useLegacyBuildLocations" : false,  
64 - "useParallelTargets" : true  
65 -}  
1 -Target dependency graph (1 target)  
2 -Runner in Runner, no dependencies  
1 -{  
2 - "_buildCommand2" : {  
3 - "command" : "prepareForIndexing",  
4 - "enableIndexBuildArena" : false,  
5 - "targets" : null  
6 - },  
7 - "buildCommand" : "build",  
8 - "configuredTargets" : [  
9 - {  
10 - "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"  
11 - }  
12 - ],  
13 - "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",  
14 - "continueBuildingAfterErrors" : true,  
15 - "enableIndexBuildArena" : false,  
16 - "hideShellScriptEnvironment" : false,  
17 - "parameters" : {  
18 - "action" : "build",  
19 - "activeArchitecture" : "arm64",  
20 - "activeRunDestination" : {  
21 - "disableOnlyActiveArch" : false,  
22 - "platform" : "iphoneos",  
23 - "sdk" : "iphoneos15.5",  
24 - "sdkVariant" : "iphoneos",  
25 - "supportedArchitectures" : [  
26 - "arm64e",  
27 - "arm64v8",  
28 - "arm64",  
29 - "armv8"  
30 - ],  
31 - "targetArchitecture" : "arm64"  
32 - },  
33 - "arenaInfo" : {  
34 - "buildIntermediatesPath" : "",  
35 - "buildProductsPath" : "",  
36 - "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",  
37 - "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",  
38 - "indexEnableDataStore" : true,  
39 - "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",  
40 - "pchPath" : ""  
41 - },  
42 - "configurationName" : "Debug",  
43 - "overrides" : {  
44 - "synthesized" : {  
45 - "table" : {  
46 - "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone12,8",  
47 - "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "14.4.2",  
48 - "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",  
49 - "ENABLE_PREVIEWS" : "NO",  
50 - "TARGET_DEVICE_IDENTIFIER" : "00008030-000640322103802E",  
51 - "TARGET_DEVICE_MODEL" : "iPhone12,8",  
52 - "TARGET_DEVICE_OS_VERSION" : "14.4.2",  
53 - "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"  
54 - }  
55 - }  
56 - }  
57 - },  
58 - "schemeCommand" : "launch",  
59 - "schemeCommand2" : "launch",  
60 - "shouldCollectMetrics" : false,  
61 - "showNonLoggedProgress" : true,  
62 - "useDryRun" : false,  
63 - "useImplicitDependencies" : true,  
64 - "useLegacyBuildLocations" : false,  
65 - "useParallelTargets" : true  
66 -}  
1 -Target dependency graph (1 target)  
2 -Runner in Runner, no dependencies  
1 -{  
2 - "_buildCommand2" : {  
3 - "command" : "prepareForIndexing",  
4 - "enableIndexBuildArena" : false,  
5 - "targets" : null  
6 - },  
7 - "buildCommand" : "build",  
8 - "configuredTargets" : [  
9 - {  
10 - "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"  
11 - }  
12 - ],  
13 - "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",  
14 - "continueBuildingAfterErrors" : true,  
15 - "enableIndexBuildArena" : false,  
16 - "hideShellScriptEnvironment" : false,  
17 - "parameters" : {  
18 - "action" : "build",  
19 - "activeArchitecture" : "arm64",  
20 - "activeRunDestination" : {  
21 - "disableOnlyActiveArch" : false,  
22 - "platform" : "iphoneos",  
23 - "sdk" : "iphoneos15.5",  
24 - "sdkVariant" : "iphoneos",  
25 - "supportedArchitectures" : [  
26 - "arm64e",  
27 - "arm64v8",  
28 - "arm64",  
29 - "armv8"  
30 - ],  
31 - "targetArchitecture" : "arm64"  
32 - },  
33 - "arenaInfo" : {  
34 - "buildIntermediatesPath" : "",  
35 - "buildProductsPath" : "",  
36 - "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",  
37 - "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",  
38 - "indexEnableDataStore" : true,  
39 - "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",  
40 - "pchPath" : ""  
41 - },  
42 - "configurationName" : "Debug",  
43 - "overrides" : {  
44 - "synthesized" : {  
45 - "table" : {  
46 - "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone12,8",  
47 - "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "14.4.2",  
48 - "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",  
49 - "ENABLE_PREVIEWS" : "NO",  
50 - "TARGET_DEVICE_IDENTIFIER" : "00008030-000640322103802E",  
51 - "TARGET_DEVICE_MODEL" : "iPhone12,8",  
52 - "TARGET_DEVICE_OS_VERSION" : "14.4.2",  
53 - "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"  
54 - }  
55 - }  
56 - }  
57 - },  
58 - "qos" : "default",  
59 - "schemeCommand" : "launch",  
60 - "schemeCommand2" : "launch",  
61 - "shouldCollectMetrics" : false,  
62 - "showNonLoggedProgress" : true,  
63 - "useDryRun" : true,  
64 - "useImplicitDependencies" : true,  
65 - "useLegacyBuildLocations" : false,  
66 - "useParallelTargets" : true  
67 -}  
1 -Target dependency graph (1 target)  
2 -Runner in Runner, no dependencies  
1 -{  
2 - "_buildCommand2" : {  
3 - "command" : "prepareForIndexing",  
4 - "enableIndexBuildArena" : false,  
5 - "targets" : null  
6 - },  
7 - "buildCommand" : "build",  
8 - "configuredTargets" : [  
9 - {  
10 - "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"  
11 - }  
12 - ],  
13 - "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",  
14 - "continueBuildingAfterErrors" : true,  
15 - "enableIndexBuildArena" : false,  
16 - "hideShellScriptEnvironment" : false,  
17 - "parameters" : {  
18 - "action" : "build",  
19 - "activeArchitecture" : "arm64",  
20 - "activeRunDestination" : {  
21 - "disableOnlyActiveArch" : false,  
22 - "platform" : "iphoneos",  
23 - "sdk" : "iphoneos15.5",  
24 - "sdkVariant" : "iphoneos",  
25 - "supportedArchitectures" : [  
26 - "arm64e",  
27 - "arm64v8",  
28 - "arm64",  
29 - "armv8"  
30 - ],  
31 - "targetArchitecture" : "arm64"  
32 - },  
33 - "arenaInfo" : {  
34 - "buildIntermediatesPath" : "",  
35 - "buildProductsPath" : "",  
36 - "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",  
37 - "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",  
38 - "indexEnableDataStore" : true,  
39 - "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",  
40 - "pchPath" : ""  
41 - },  
42 - "configurationName" : "Debug",  
43 - "overrides" : {  
44 - "synthesized" : {  
45 - "table" : {  
46 - "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone12,8",  
47 - "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "14.4.2",  
48 - "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",  
49 - "ENABLE_PREVIEWS" : "NO",  
50 - "TARGET_DEVICE_IDENTIFIER" : "00008030-000640322103802E",  
51 - "TARGET_DEVICE_MODEL" : "iPhone12,8",  
52 - "TARGET_DEVICE_OS_VERSION" : "14.4.2",  
53 - "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"  
54 - }  
55 - }  
56 - }  
57 - },  
58 - "qos" : "default",  
59 - "schemeCommand" : "launch",  
60 - "schemeCommand2" : "launch",  
61 - "shouldCollectMetrics" : false,  
62 - "showNonLoggedProgress" : true,  
63 - "useDryRun" : true,  
64 - "useImplicitDependencies" : true,  
65 - "useLegacyBuildLocations" : false,  
66 - "useParallelTargets" : true  
67 -}  
1 -Target dependency graph (1 target)  
2 -Runner in Runner, no dependencies  
1 -{  
2 - "_buildCommand2" : {  
3 - "command" : "prepareForIndexing",  
4 - "enableIndexBuildArena" : false,  
5 - "targets" : null  
6 - },  
7 - "buildCommand" : "build",  
8 - "configuredTargets" : [  
9 - {  
10 - "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"  
11 - }  
12 - ],  
13 - "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",  
14 - "continueBuildingAfterErrors" : true,  
15 - "enableIndexBuildArena" : false,  
16 - "hideShellScriptEnvironment" : false,  
17 - "parameters" : {  
18 - "action" : "build",  
19 - "activeArchitecture" : "arm64",  
20 - "activeRunDestination" : {  
21 - "disableOnlyActiveArch" : false,  
22 - "platform" : "iphoneos",  
23 - "sdk" : "iphoneos15.5",  
24 - "sdkVariant" : "iphoneos",  
25 - "supportedArchitectures" : [  
26 - "arm64v8",  
27 - "arm64",  
28 - "armv8"  
29 - ],  
30 - "targetArchitecture" : "arm64"  
31 - },  
32 - "arenaInfo" : {  
33 - "buildIntermediatesPath" : "",  
34 - "buildProductsPath" : "",  
35 - "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",  
36 - "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",  
37 - "indexEnableDataStore" : true,  
38 - "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",  
39 - "pchPath" : ""  
40 - },  
41 - "configurationName" : "Debug",  
42 - "overrides" : {  
43 - "synthesized" : {  
44 - "table" : {  
45 - "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone10,2",  
46 - "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "13.6",  
47 - "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",  
48 - "ENABLE_PREVIEWS" : "NO",  
49 - "TARGET_DEVICE_IDENTIFIER" : "fe000909aeb9328b501332bf921126c213f1c4a4",  
50 - "TARGET_DEVICE_MODEL" : "iPhone10,2",  
51 - "TARGET_DEVICE_OS_VERSION" : "13.6",  
52 - "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"  
53 - }  
54 - }  
55 - }  
56 - },  
57 - "schemeCommand" : "launch",  
58 - "schemeCommand2" : "launch",  
59 - "shouldCollectMetrics" : false,  
60 - "showNonLoggedProgress" : true,  
61 - "useDryRun" : false,  
62 - "useImplicitDependencies" : true,  
63 - "useLegacyBuildLocations" : false,  
64 - "useParallelTargets" : true  
65 -}  
This diff could not be displayed because it is too large.
1 -Target dependency graph (1 target)  
2 -Runner in Runner, no dependencies  
1 -{  
2 - "_buildCommand2" : {  
3 - "command" : "prepareForIndexing",  
4 - "enableIndexBuildArena" : false,  
5 - "targets" : null  
6 - },  
7 - "buildCommand" : "build",  
8 - "configuredTargets" : [  
9 - {  
10 - "guid" : "18c1723432283e0cc55f10a6dcfd9e0288a783a885d8b0b3beb2e9f90bde3f49"  
11 - }  
12 - ],  
13 - "containerPath" : "/Users/wangdongni/Desktop/oneKey_wdn/ios/Runner.xcodeproj",  
14 - "continueBuildingAfterErrors" : true,  
15 - "enableIndexBuildArena" : false,  
16 - "hideShellScriptEnvironment" : false,  
17 - "parameters" : {  
18 - "action" : "build",  
19 - "activeArchitecture" : "arm64",  
20 - "activeRunDestination" : {  
21 - "disableOnlyActiveArch" : false,  
22 - "platform" : "iphoneos",  
23 - "sdk" : "iphoneos15.5",  
24 - "sdkVariant" : "iphoneos",  
25 - "supportedArchitectures" : [  
26 - "arm64v8",  
27 - "arm64",  
28 - "armv8"  
29 - ],  
30 - "targetArchitecture" : "arm64"  
31 - },  
32 - "arenaInfo" : {  
33 - "buildIntermediatesPath" : "",  
34 - "buildProductsPath" : "",  
35 - "derivedDataPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData",  
36 - "indexDataStoreFolderPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/DataStore",  
37 - "indexEnableDataStore" : true,  
38 - "indexPCHPath" : "/Users/wangdongni/Library/Developer/Xcode/DerivedData/Runner-dieqwfmzzbhbuccvvsxgvwnqjtwj/Index/PrecompiledHeaders",  
39 - "pchPath" : ""  
40 - },  
41 - "configurationName" : "Debug",  
42 - "overrides" : {  
43 - "synthesized" : {  
44 - "table" : {  
45 - "ASSETCATALOG_FILTER_FOR_DEVICE_MODEL" : "iPhone10,2",  
46 - "ASSETCATALOG_FILTER_FOR_DEVICE_OS_VERSION" : "13.6",  
47 - "BUILD_ACTIVE_RESOURCES_ONLY" : "YES",  
48 - "ENABLE_PREVIEWS" : "NO",  
49 - "TARGET_DEVICE_IDENTIFIER" : "fe000909aeb9328b501332bf921126c213f1c4a4",  
50 - "TARGET_DEVICE_MODEL" : "iPhone10,2",  
51 - "TARGET_DEVICE_OS_VERSION" : "13.6",  
52 - "TARGET_DEVICE_PLATFORM_NAME" : "iphoneos"  
53 - }  
54 - }  
55 - }  
56 - },  
57 - "qos" : "default",  
58 - "schemeCommand" : "launch",  
59 - "schemeCommand2" : "launch",  
60 - "shouldCollectMetrics" : false,  
61 - "showNonLoggedProgress" : true,  
62 - "useDryRun" : true,  
63 - "useImplicitDependencies" : true,  
64 - "useLegacyBuildLocations" : false,  
65 - "useParallelTargets" : true  
66 -}