mac 3 vuotta sitten
vanhempi
commit
b63218524c

+ 1
- 0
ios/Flutter/Debug.xcconfig Näytä tiedosto

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

+ 1
- 0
ios/Flutter/Release.xcconfig Näytä tiedosto

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

+ 41
- 0
ios/Podfile Näytä tiedosto

@@ -0,0 +1,41 @@
1
+# Uncomment this line to define a global platform for your project
2
+# platform :ios, '9.0'
3
+
4
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
5
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
6
+
7
+project 'Runner', {
8
+  'Debug' => :debug,
9
+  'Profile' => :release,
10
+  'Release' => :release,
11
+}
12
+
13
+def flutter_root
14
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
15
+  unless File.exist?(generated_xcode_build_settings_path)
16
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
17
+  end
18
+
19
+  File.foreach(generated_xcode_build_settings_path) do |line|
20
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
21
+    return matches[1].strip if matches
22
+  end
23
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
24
+end
25
+
26
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
27
+
28
+flutter_ios_podfile_setup
29
+
30
+target 'Runner' do
31
+  use_frameworks!
32
+  use_modular_headers!
33
+
34
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
35
+end
36
+
37
+post_install do |installer|
38
+  installer.pods_project.targets.each do |target|
39
+    flutter_additional_ios_build_settings(target)
40
+  end
41
+end

+ 66
- 0
ios/Podfile.lock Näytä tiedosto

@@ -0,0 +1,66 @@
1
+PODS:
2
+  - AMap3DMap (9.3.0):
3
+    - AMapFoundation (~> 1.7.0)
4
+  - amap_flutter_location (0.0.1):
5
+    - AMapLocation
6
+    - Flutter
7
+  - amap_flutter_map (0.0.1):
8
+    - AMap3DMap
9
+    - Flutter
10
+  - AMapFoundation (1.7.0)
11
+  - AMapLocation (2.9.0):
12
+    - AMapFoundation (>= 1.7.0)
13
+  - Flutter (1.0.0)
14
+  - fluttertoast (0.0.2):
15
+    - Flutter
16
+    - Toast
17
+  - path_provider_ios (0.0.1):
18
+    - Flutter
19
+  - permission_handler_apple (9.0.4):
20
+    - Flutter
21
+  - Toast (4.0.0)
22
+
23
+DEPENDENCIES:
24
+  - amap_flutter_location (from `.symlinks/plugins/amap_flutter_location/ios`)
25
+  - amap_flutter_map (from `.symlinks/plugins/amap_flutter_map/ios`)
26
+  - Flutter (from `Flutter`)
27
+  - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
28
+  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
29
+  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
30
+
31
+SPEC REPOS:
32
+  trunk:
33
+    - AMap3DMap
34
+    - AMapFoundation
35
+    - AMapLocation
36
+    - Toast
37
+
38
+EXTERNAL SOURCES:
39
+  amap_flutter_location:
40
+    :path: ".symlinks/plugins/amap_flutter_location/ios"
41
+  amap_flutter_map:
42
+    :path: ".symlinks/plugins/amap_flutter_map/ios"
43
+  Flutter:
44
+    :path: Flutter
45
+  fluttertoast:
46
+    :path: ".symlinks/plugins/fluttertoast/ios"
47
+  path_provider_ios:
48
+    :path: ".symlinks/plugins/path_provider_ios/ios"
49
+  permission_handler_apple:
50
+    :path: ".symlinks/plugins/permission_handler_apple/ios"
51
+
52
+SPEC CHECKSUMS:
53
+  AMap3DMap: e429ea5e1d76b1793b75029db007241d67d2ebdf
54
+  amap_flutter_location: 44ff5beb64f42e0bf5feb402fe299dac0013af6f
55
+  amap_flutter_map: 979e54d227cedac6c7504a2151bfbf3bcf96760a
56
+  AMapFoundation: c14fcebd8e4267c593bd2e25067ac86b0ce64aba
57
+  AMapLocation: f5eb11e11c62f0f599f80b578eec8a1f70deb985
58
+  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
59
+  fluttertoast: 16fbe6039d06a763f3533670197d01fc73459037
60
+  path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
61
+  permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
62
+  Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
63
+
64
+PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
65
+
66
+COCOAPODS: 1.11.3

+ 86
- 0
ios/Runner.xcodeproj/project.pbxproj Näytä tiedosto

@@ -13,6 +13,7 @@
13 13
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
14 14
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
15 15
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
16
+		B568A2A010B7AE954203BBC5 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D36D2817E00A25C0B2E8327 /* Pods_Runner.framework */; };
16 17
 /* End PBXBuildFile section */
17 18
 
18 19
 /* Begin PBXCopyFilesBuildPhase section */
@@ -32,6 +33,7 @@
32 33
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
33 34
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
34 35
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
36
+		5D36D2817E00A25C0B2E8327 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
35 37
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
36 38
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
37 39
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -42,6 +44,9 @@
42 44
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
43 45
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
44 46
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
47
+		D60AF8132E40E0544C9BF362 /* 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>"; };
48
+		DE87C961FF082167615F504D /* 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>"; };
49
+		F86B34B25E86537F43C34E27 /* 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>"; };
45 50
 /* End PBXFileReference section */
46 51
 
47 52
 /* Begin PBXFrameworksBuildPhase section */
@@ -49,12 +54,21 @@
49 54
 			isa = PBXFrameworksBuildPhase;
50 55
 			buildActionMask = 2147483647;
51 56
 			files = (
57
+				B568A2A010B7AE954203BBC5 /* Pods_Runner.framework in Frameworks */,
52 58
 			);
53 59
 			runOnlyForDeploymentPostprocessing = 0;
54 60
 		};
55 61
 /* End PBXFrameworksBuildPhase section */
56 62
 
57 63
 /* Begin PBXGroup section */
64
+		32BBE99C8D5968C2B169CC47 /* Frameworks */ = {
65
+			isa = PBXGroup;
66
+			children = (
67
+				5D36D2817E00A25C0B2E8327 /* Pods_Runner.framework */,
68
+			);
69
+			name = Frameworks;
70
+			sourceTree = "<group>";
71
+		};
58 72
 		9740EEB11CF90186004384FC /* Flutter */ = {
59 73
 			isa = PBXGroup;
60 74
 			children = (
@@ -72,6 +86,8 @@
72 86
 				9740EEB11CF90186004384FC /* Flutter */,
73 87
 				97C146F01CF9000F007C117D /* Runner */,
74 88
 				97C146EF1CF9000F007C117D /* Products */,
89
+				E244E1B155514CCCBAD6C213 /* Pods */,
90
+				32BBE99C8D5968C2B169CC47 /* Frameworks */,
75 91
 			);
76 92
 			sourceTree = "<group>";
77 93
 		};
@@ -98,6 +114,17 @@
98 114
 			path = Runner;
99 115
 			sourceTree = "<group>";
100 116
 		};
117
+		E244E1B155514CCCBAD6C213 /* Pods */ = {
118
+			isa = PBXGroup;
119
+			children = (
120
+				D60AF8132E40E0544C9BF362 /* Pods-Runner.debug.xcconfig */,
121
+				F86B34B25E86537F43C34E27 /* Pods-Runner.release.xcconfig */,
122
+				DE87C961FF082167615F504D /* Pods-Runner.profile.xcconfig */,
123
+			);
124
+			name = Pods;
125
+			path = Pods;
126
+			sourceTree = "<group>";
127
+		};
101 128
 /* End PBXGroup section */
102 129
 
103 130
 /* Begin PBXNativeTarget section */
@@ -105,12 +132,15 @@
105 132
 			isa = PBXNativeTarget;
106 133
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
107 134
 			buildPhases = (
135
+				887B1354755FF7E28C0D9407 /* [CP] Check Pods Manifest.lock */,
108 136
 				9740EEB61CF901F6004384FC /* Run Script */,
109 137
 				97C146EA1CF9000F007C117D /* Sources */,
110 138
 				97C146EB1CF9000F007C117D /* Frameworks */,
111 139
 				97C146EC1CF9000F007C117D /* Resources */,
112 140
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
113 141
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
142
+				000CDF669E345B7E51019FA5 /* [CP] Embed Pods Frameworks */,
143
+				2B4B6499C4D0CF5E3ECF075F /* [CP] Copy Pods Resources */,
114 144
 			);
115 145
 			buildRules = (
116 146
 			);
@@ -169,6 +199,40 @@
169 199
 /* End PBXResourcesBuildPhase section */
170 200
 
171 201
 /* Begin PBXShellScriptBuildPhase section */
202
+		000CDF669E345B7E51019FA5 /* [CP] Embed Pods Frameworks */ = {
203
+			isa = PBXShellScriptBuildPhase;
204
+			buildActionMask = 2147483647;
205
+			files = (
206
+			);
207
+			inputFileListPaths = (
208
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
209
+			);
210
+			name = "[CP] Embed Pods Frameworks";
211
+			outputFileListPaths = (
212
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
213
+			);
214
+			runOnlyForDeploymentPostprocessing = 0;
215
+			shellPath = /bin/sh;
216
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
217
+			showEnvVarsInLog = 0;
218
+		};
219
+		2B4B6499C4D0CF5E3ECF075F /* [CP] Copy Pods Resources */ = {
220
+			isa = PBXShellScriptBuildPhase;
221
+			buildActionMask = 2147483647;
222
+			files = (
223
+			);
224
+			inputFileListPaths = (
225
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
226
+			);
227
+			name = "[CP] Copy Pods Resources";
228
+			outputFileListPaths = (
229
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
230
+			);
231
+			runOnlyForDeploymentPostprocessing = 0;
232
+			shellPath = /bin/sh;
233
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
234
+			showEnvVarsInLog = 0;
235
+		};
172 236
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
173 237
 			isa = PBXShellScriptBuildPhase;
174 238
 			buildActionMask = 2147483647;
@@ -183,6 +247,28 @@
183 247
 			shellPath = /bin/sh;
184 248
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
185 249
 		};
250
+		887B1354755FF7E28C0D9407 /* [CP] Check Pods Manifest.lock */ = {
251
+			isa = PBXShellScriptBuildPhase;
252
+			buildActionMask = 2147483647;
253
+			files = (
254
+			);
255
+			inputFileListPaths = (
256
+			);
257
+			inputPaths = (
258
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
259
+				"${PODS_ROOT}/Manifest.lock",
260
+			);
261
+			name = "[CP] Check Pods Manifest.lock";
262
+			outputFileListPaths = (
263
+			);
264
+			outputPaths = (
265
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
266
+			);
267
+			runOnlyForDeploymentPostprocessing = 0;
268
+			shellPath = /bin/sh;
269
+			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";
270
+			showEnvVarsInLog = 0;
271
+		};
186 272
 		9740EEB61CF901F6004384FC /* Run Script */ = {
187 273
 			isa = PBXShellScriptBuildPhase;
188 274
 			buildActionMask = 2147483647;

+ 3
- 0
ios/Runner.xcworkspace/contents.xcworkspacedata Näytä tiedosto

@@ -4,4 +4,7 @@
4 4
    <FileRef
5 5
       location = "group:Runner.xcodeproj">
6 6
    </FileRef>
7
+   <FileRef
8
+      location = "group:Pods/Pods.xcodeproj">
9
+   </FileRef>
7 10
 </Workspace>

+ 0
- 8
ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings Näytä tiedosto

@@ -1,8 +0,0 @@
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>PreviewsEnabled</key>
6
-	<false/>
7
-</dict>
8
-</plist>

+ 2
- 0
ios/Runner/Info.plist Näytä tiedosto

@@ -43,5 +43,7 @@
43 43
 	</array>
44 44
 	<key>UIViewControllerBasedStatusBarAppearance</key>
45 45
 	<false/>
46
+	<key>CADisableMinimumFrameDurationOnPhone</key>
47
+	<true/>
46 48
 </dict>
47 49
 </plist>

+ 1
- 1
lib/widgets/Modal.dart Näytä tiedosto

@@ -1,7 +1,7 @@
1 1
 import 'package:flutter/material.dart';
2 2
 import 'package:flutter_screenutil/flutter_screenutil.dart';
3 3
 import 'package:get/get.dart';
4
-import 'dart:ffi';
4
+// import 'dart:ffi';
5 5
 
6 6
 typedef ModalFunc = dynamic Function();
7 7
 

+ 9
- 9
pubspec.lock Näytä tiedosto

@@ -112,7 +112,7 @@ packages:
112 112
       name: collection
113 113
       url: "https://pub.flutter-io.cn"
114 114
     source: hosted
115
-    version: "1.15.0"
115
+    version: "1.16.0"
116 116
   convert:
117 117
     dependency: transitive
118 118
     description:
@@ -161,7 +161,7 @@ packages:
161 161
       name: fake_async
162 162
       url: "https://pub.flutter-io.cn"
163 163
     source: hosted
164
-    version: "1.2.0"
164
+    version: "1.3.0"
165 165
   ffi:
166 166
     dependency: transitive
167 167
     description:
@@ -281,7 +281,7 @@ packages:
281 281
       name: js
282 282
       url: "https://pub.flutter-io.cn"
283 283
     source: hosted
284
-    version: "0.6.3"
284
+    version: "0.6.4"
285 285
   json_annotation:
286 286
     dependency: transitive
287 287
     description:
@@ -323,7 +323,7 @@ packages:
323 323
       name: material_color_utilities
324 324
       url: "https://pub.flutter-io.cn"
325 325
     source: hosted
326
-    version: "0.1.3"
326
+    version: "0.1.4"
327 327
   meta:
328 328
     dependency: transitive
329 329
     description:
@@ -344,7 +344,7 @@ packages:
344 344
       name: path
345 345
       url: "https://pub.flutter-io.cn"
346 346
     source: hosted
347
-    version: "1.8.0"
347
+    version: "1.8.1"
348 348
   path_drawing:
349 349
     dependency: transitive
350 350
     description:
@@ -503,7 +503,7 @@ packages:
503 503
       name: source_span
504 504
       url: "https://pub.flutter-io.cn"
505 505
     source: hosted
506
-    version: "1.8.1"
506
+    version: "1.8.2"
507 507
   stack_trace:
508 508
     dependency: transitive
509 509
     description:
@@ -545,7 +545,7 @@ packages:
545 545
       name: test_api
546 546
       url: "https://pub.flutter-io.cn"
547 547
     source: hosted
548
-    version: "0.4.8"
548
+    version: "0.4.9"
549 549
   typed_data:
550 550
     dependency: transitive
551 551
     description:
@@ -559,7 +559,7 @@ packages:
559 559
       name: vector_math
560 560
       url: "https://pub.flutter-io.cn"
561 561
     source: hosted
562
-    version: "2.1.1"
562
+    version: "2.1.2"
563 563
   watcher:
564 564
     dependency: transitive
565 565
     description:
@@ -589,5 +589,5 @@ packages:
589 589
     source: hosted
590 590
     version: "3.1.1"
591 591
 sdks:
592
-  dart: ">=2.16.1 <3.0.0"
592
+  dart: ">=2.17.0-0 <3.0.0"
593 593
   flutter: ">=2.8.1"