2 Commits

Autor SHA1 Mensaje Fecha
  mac 2489315d8e feat hace 1 año
  mac 5d66422d7b feat hace 1 año
Se han modificado 50 ficheros con 388 adiciones y 169 borrados
  1. 20
    20
      ios/Flutter/AppFrameworkInfo.plist
  2. 8
    0
      ios/Podfile
  3. 1
    1
      ios/Podfile.lock
  4. 144
    2
      ios/Runner.xcodeproj/project.pbxproj
  5. 1
    1
      ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
  6. 118
    120
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
  7. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
  8. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
  9. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
  10. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
  11. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
  12. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
  13. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
  14. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
  15. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
  16. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
  17. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
  18. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
  19. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
  20. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
  21. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
  22. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-1024.png
  23. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png
  24. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
  25. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png
  26. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
  27. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-38@2x.png
  28. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-38@3x.png
  29. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
  30. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
  31. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
  32. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
  33. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-64@2x.png
  34. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-64@3x.png
  35. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-68@2x.png
  36. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
  37. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
  38. 3
    3
      ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
  39. BIN
      ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
  40. BIN
      ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
  41. BIN
      ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
  42. BIN
      ios/Runner/Assets.xcassets/LaunchImage.imageset/launch_image.png
  43. 16
    8
      ios/Runner/Base.lproj/LaunchScreen.storyboard
  44. 8
    5
      ios/Runner/Base.lproj/Main.storyboard
  45. 21
    4
      ios/Runner/Info.plist
  46. 1
    0
      ios/Runner/en.lproj/LaunchScreen.strings
  47. 2
    2
      lib/models/app.dart
  48. 9
    1
      lib/pages/jobDetail/index.dart
  49. 2
    1
      lib/utils/amap/const_config.dart
  50. 34
    1
      lib/utils/location.dart

+ 20
- 20
ios/Flutter/AppFrameworkInfo.plist Ver fichero

@@ -2,25 +2,25 @@
2 2
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 3
 <plist version="1.0">
4 4
 <dict>
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>9.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>16.0</string>
25 25
 </dict>
26 26
 </plist>

+ 8
- 0
ios/Podfile Ver fichero

@@ -37,5 +37,13 @@ end
37 37
 post_install do |installer|
38 38
   installer.pods_project.targets.each do |target|
39 39
     flutter_additional_ios_build_settings(target)
40
+    target.build_configurations.each do |config|
41
+      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
42
+        '$(inherited)',
43
+
44
+        ## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse]
45
+        'PERMISSION_LOCATION=1',
46
+      ]
47
+    end
40 48
   end
41 49
 end

+ 1
- 1
ios/Podfile.lock Ver fichero

@@ -61,6 +61,6 @@ SPEC CHECKSUMS:
61 61
   permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
62 62
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
63 63
 
64
-PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
64
+PODFILE CHECKSUM: d05a6e09138b62ce426e7410987614b7b1b6cefc
65 65
 
66 66
 COCOAPODS: 1.11.3

+ 144
- 2
ios/Runner.xcodeproj/project.pbxproj Ver fichero

@@ -3,7 +3,7 @@
3 3
 	archiveVersion = 1;
4 4
 	classes = {
5 5
 	};
6
-	objectVersion = 50;
6
+	objectVersion = 54;
7 7
 	objects = {
8 8
 
9 9
 /* Begin PBXBuildFile section */
@@ -121,7 +121,6 @@
121 121
 				F86B34B25E86537F43C34E27 /* Pods-Runner.release.xcconfig */,
122 122
 				DE87C961FF082167615F504D /* Pods-Runner.profile.xcconfig */,
123 123
 			);
124
-			name = Pods;
125 124
 			path = Pods;
126 125
 			sourceTree = "<group>";
127 126
 		};
@@ -313,6 +312,8 @@
313 312
 			);
314 313
 			name = LaunchScreen.storyboard;
315 314
 			sourceTree = "<group>";
315
+			usesTabs = 0;
316
+			wrapsLines = 1;
316 317
 		};
317 318
 /* End PBXVariantGroup section */
318 319
 
@@ -360,6 +361,7 @@
360 361
 				GCC_WARN_UNUSED_VARIABLE = YES;
361 362
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
362 363
 				MTL_ENABLE_DEBUG_INFO = NO;
364
+				OTHER_LDFLAGS = "";
363 365
 				SDKROOT = iphoneos;
364 366
 				SUPPORTED_PLATFORMS = iphoneos;
365 367
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -374,12 +376,58 @@
374 376
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
375 377
 				CLANG_ENABLE_MODULES = YES;
376 378
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
379
+				DEVELOPMENT_TEAM = W48DPW925L;
377 380
 				ENABLE_BITCODE = NO;
378 381
 				INFOPLIST_FILE = Runner/Info.plist;
382
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
379 383
 				LD_RUNPATH_SEARCH_PATHS = (
380 384
 					"$(inherited)",
381 385
 					"@executable_path/Frameworks",
382 386
 				);
387
+				OTHER_LDFLAGS = (
388
+					"$(inherited)",
389
+					"-ObjC",
390
+					"-l\"c++\"",
391
+					"-l\"z\"",
392
+					"-framework",
393
+					"\"AMapFoundationKit\"",
394
+					"-framework",
395
+					"\"AMapLocationKit\"",
396
+					"-framework",
397
+					"\"CoreGraphics\"",
398
+					"-framework",
399
+					"\"CoreLocation\"",
400
+					"-framework",
401
+					"\"CoreTelephony\"",
402
+					"-framework",
403
+					"\"CoreText\"",
404
+					"-framework",
405
+					"\"ExternalAccessory\"",
406
+					"-framework",
407
+					"\"GLKit\"",
408
+					"-framework",
409
+					"\"MAMapKit\"",
410
+					"-framework",
411
+					"\"OpenGLES\"",
412
+					"-framework",
413
+					"\"QuartzCore\"",
414
+					"-framework",
415
+					"\"Security\"",
416
+					"-framework",
417
+					"\"SystemConfiguration\"",
418
+					"-framework",
419
+					"\"Toast\"",
420
+					"-framework",
421
+					"\"amap_flutter_location\"",
422
+					"-framework",
423
+					"\"amap_flutter_map\"",
424
+					"-framework",
425
+					"\"fluttertoast\"",
426
+					"-framework",
427
+					"\"path_provider_ios\"",
428
+					"-framework",
429
+					"\"permission_handler_apple\"",
430
+				);
383 431
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.workerClient;
384 432
 				PRODUCT_NAME = "$(TARGET_NAME)";
385 433
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -438,6 +486,7 @@
438 486
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
439 487
 				MTL_ENABLE_DEBUG_INFO = YES;
440 488
 				ONLY_ACTIVE_ARCH = YES;
489
+				OTHER_LDFLAGS = "";
441 490
 				SDKROOT = iphoneos;
442 491
 				TARGETED_DEVICE_FAMILY = "1,2";
443 492
 			};
@@ -486,6 +535,7 @@
486 535
 				GCC_WARN_UNUSED_VARIABLE = YES;
487 536
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
488 537
 				MTL_ENABLE_DEBUG_INFO = NO;
538
+				OTHER_LDFLAGS = "";
489 539
 				SDKROOT = iphoneos;
490 540
 				SUPPORTED_PLATFORMS = iphoneos;
491 541
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -502,12 +552,58 @@
502 552
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
503 553
 				CLANG_ENABLE_MODULES = YES;
504 554
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
555
+				DEVELOPMENT_TEAM = W48DPW925L;
505 556
 				ENABLE_BITCODE = NO;
506 557
 				INFOPLIST_FILE = Runner/Info.plist;
558
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
507 559
 				LD_RUNPATH_SEARCH_PATHS = (
508 560
 					"$(inherited)",
509 561
 					"@executable_path/Frameworks",
510 562
 				);
563
+				OTHER_LDFLAGS = (
564
+					"$(inherited)",
565
+					"-ObjC",
566
+					"-l\"c++\"",
567
+					"-l\"z\"",
568
+					"-framework",
569
+					"\"AMapFoundationKit\"",
570
+					"-framework",
571
+					"\"AMapLocationKit\"",
572
+					"-framework",
573
+					"\"CoreGraphics\"",
574
+					"-framework",
575
+					"\"CoreLocation\"",
576
+					"-framework",
577
+					"\"CoreTelephony\"",
578
+					"-framework",
579
+					"\"CoreText\"",
580
+					"-framework",
581
+					"\"ExternalAccessory\"",
582
+					"-framework",
583
+					"\"GLKit\"",
584
+					"-framework",
585
+					"\"MAMapKit\"",
586
+					"-framework",
587
+					"\"OpenGLES\"",
588
+					"-framework",
589
+					"\"QuartzCore\"",
590
+					"-framework",
591
+					"\"Security\"",
592
+					"-framework",
593
+					"\"SystemConfiguration\"",
594
+					"-framework",
595
+					"\"Toast\"",
596
+					"-framework",
597
+					"\"amap_flutter_location\"",
598
+					"-framework",
599
+					"\"amap_flutter_map\"",
600
+					"-framework",
601
+					"\"fluttertoast\"",
602
+					"-framework",
603
+					"\"path_provider_ios\"",
604
+					"-framework",
605
+					"\"permission_handler_apple\"",
606
+				);
511 607
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.workerClient;
512 608
 				PRODUCT_NAME = "$(TARGET_NAME)";
513 609
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -524,12 +620,58 @@
524 620
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
525 621
 				CLANG_ENABLE_MODULES = YES;
526 622
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
623
+				DEVELOPMENT_TEAM = W48DPW925L;
527 624
 				ENABLE_BITCODE = NO;
528 625
 				INFOPLIST_FILE = Runner/Info.plist;
626
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
529 627
 				LD_RUNPATH_SEARCH_PATHS = (
530 628
 					"$(inherited)",
531 629
 					"@executable_path/Frameworks",
532 630
 				);
631
+				OTHER_LDFLAGS = (
632
+					"$(inherited)",
633
+					"-ObjC",
634
+					"-l\"c++\"",
635
+					"-l\"z\"",
636
+					"-framework",
637
+					"\"AMapFoundationKit\"",
638
+					"-framework",
639
+					"\"AMapLocationKit\"",
640
+					"-framework",
641
+					"\"CoreGraphics\"",
642
+					"-framework",
643
+					"\"CoreLocation\"",
644
+					"-framework",
645
+					"\"CoreTelephony\"",
646
+					"-framework",
647
+					"\"CoreText\"",
648
+					"-framework",
649
+					"\"ExternalAccessory\"",
650
+					"-framework",
651
+					"\"GLKit\"",
652
+					"-framework",
653
+					"\"MAMapKit\"",
654
+					"-framework",
655
+					"\"OpenGLES\"",
656
+					"-framework",
657
+					"\"QuartzCore\"",
658
+					"-framework",
659
+					"\"Security\"",
660
+					"-framework",
661
+					"\"SystemConfiguration\"",
662
+					"-framework",
663
+					"\"Toast\"",
664
+					"-framework",
665
+					"\"amap_flutter_location\"",
666
+					"-framework",
667
+					"\"amap_flutter_map\"",
668
+					"-framework",
669
+					"\"fluttertoast\"",
670
+					"-framework",
671
+					"\"path_provider_ios\"",
672
+					"-framework",
673
+					"\"permission_handler_apple\"",
674
+				);
533 675
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.workerClient;
534 676
 				PRODUCT_NAME = "$(TARGET_NAME)";
535 677
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

+ 1
- 1
ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme Ver fichero

@@ -40,7 +40,7 @@
40 40
       </Testables>
41 41
    </TestAction>
42 42
    <LaunchAction
43
-      buildConfiguration = "Debug"
43
+      buildConfiguration = "Release"
44 44
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
45 45
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
46 46
       launchStyle = "0"

+ 118
- 120
ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json Ver fichero

@@ -1,122 +1,120 @@
1 1
 {
2
-  "images" : [
3
-    {
4
-      "size" : "20x20",
5
-      "idiom" : "iphone",
6
-      "filename" : "Icon-App-20x20@2x.png",
7
-      "scale" : "2x"
8
-    },
9
-    {
10
-      "size" : "20x20",
11
-      "idiom" : "iphone",
12
-      "filename" : "Icon-App-20x20@3x.png",
13
-      "scale" : "3x"
14
-    },
15
-    {
16
-      "size" : "29x29",
17
-      "idiom" : "iphone",
18
-      "filename" : "Icon-App-29x29@1x.png",
19
-      "scale" : "1x"
20
-    },
21
-    {
22
-      "size" : "29x29",
23
-      "idiom" : "iphone",
24
-      "filename" : "Icon-App-29x29@2x.png",
25
-      "scale" : "2x"
26
-    },
27
-    {
28
-      "size" : "29x29",
29
-      "idiom" : "iphone",
30
-      "filename" : "Icon-App-29x29@3x.png",
31
-      "scale" : "3x"
32
-    },
33
-    {
34
-      "size" : "40x40",
35
-      "idiom" : "iphone",
36
-      "filename" : "Icon-App-40x40@2x.png",
37
-      "scale" : "2x"
38
-    },
39
-    {
40
-      "size" : "40x40",
41
-      "idiom" : "iphone",
42
-      "filename" : "Icon-App-40x40@3x.png",
43
-      "scale" : "3x"
44
-    },
45
-    {
46
-      "size" : "60x60",
47
-      "idiom" : "iphone",
48
-      "filename" : "Icon-App-60x60@2x.png",
49
-      "scale" : "2x"
50
-    },
51
-    {
52
-      "size" : "60x60",
53
-      "idiom" : "iphone",
54
-      "filename" : "Icon-App-60x60@3x.png",
55
-      "scale" : "3x"
56
-    },
57
-    {
58
-      "size" : "20x20",
59
-      "idiom" : "ipad",
60
-      "filename" : "Icon-App-20x20@1x.png",
61
-      "scale" : "1x"
62
-    },
63
-    {
64
-      "size" : "20x20",
65
-      "idiom" : "ipad",
66
-      "filename" : "Icon-App-20x20@2x.png",
67
-      "scale" : "2x"
68
-    },
69
-    {
70
-      "size" : "29x29",
71
-      "idiom" : "ipad",
72
-      "filename" : "Icon-App-29x29@1x.png",
73
-      "scale" : "1x"
74
-    },
75
-    {
76
-      "size" : "29x29",
77
-      "idiom" : "ipad",
78
-      "filename" : "Icon-App-29x29@2x.png",
79
-      "scale" : "2x"
80
-    },
81
-    {
82
-      "size" : "40x40",
83
-      "idiom" : "ipad",
84
-      "filename" : "Icon-App-40x40@1x.png",
85
-      "scale" : "1x"
86
-    },
87
-    {
88
-      "size" : "40x40",
89
-      "idiom" : "ipad",
90
-      "filename" : "Icon-App-40x40@2x.png",
91
-      "scale" : "2x"
92
-    },
93
-    {
94
-      "size" : "76x76",
95
-      "idiom" : "ipad",
96
-      "filename" : "Icon-App-76x76@1x.png",
97
-      "scale" : "1x"
98
-    },
99
-    {
100
-      "size" : "76x76",
101
-      "idiom" : "ipad",
102
-      "filename" : "Icon-App-76x76@2x.png",
103
-      "scale" : "2x"
104
-    },
105
-    {
106
-      "size" : "83.5x83.5",
107
-      "idiom" : "ipad",
108
-      "filename" : "Icon-App-83.5x83.5@2x.png",
109
-      "scale" : "2x"
110
-    },
111
-    {
112
-      "size" : "1024x1024",
113
-      "idiom" : "ios-marketing",
114
-      "filename" : "Icon-App-1024x1024@1x.png",
115
-      "scale" : "1x"
2
+    "images": [
3
+        {
4
+            "size": "20x20",
5
+            "idiom": "universal",
6
+            "filename": "icon-20@2x.png",
7
+            "scale": "2x",
8
+            "platform": "ios"
9
+        },
10
+        {
11
+            "size": "20x20",
12
+            "idiom": "universal",
13
+            "filename": "icon-20@3x.png",
14
+            "scale": "3x",
15
+            "platform": "ios"
16
+        },
17
+        {
18
+            "size": "29x29",
19
+            "idiom": "universal",
20
+            "filename": "icon-29@2x.png",
21
+            "scale": "2x",
22
+            "platform": "ios"
23
+        },
24
+        {
25
+            "size": "29x29",
26
+            "idiom": "universal",
27
+            "filename": "icon-29@3x.png",
28
+            "scale": "3x",
29
+            "platform": "ios"
30
+        },
31
+        {
32
+            "size": "38x38",
33
+            "idiom": "universal",
34
+            "filename": "icon-38@2x.png",
35
+            "scale": "2x",
36
+            "platform": "ios"
37
+        },
38
+        {
39
+            "size": "38x38",
40
+            "idiom": "universal",
41
+            "filename": "icon-38@3x.png",
42
+            "scale": "3x",
43
+            "platform": "ios"
44
+        },
45
+        {
46
+            "size": "40x40",
47
+            "idiom": "universal",
48
+            "filename": "icon-40@2x.png",
49
+            "scale": "2x",
50
+            "platform": "ios"
51
+        },
52
+        {
53
+            "size": "40x40",
54
+            "idiom": "universal",
55
+            "filename": "icon-40@3x.png",
56
+            "scale": "3x",
57
+            "platform": "ios"
58
+        },
59
+        {
60
+            "size": "60x60",
61
+            "idiom": "universal",
62
+            "filename": "icon-60@2x.png",
63
+            "scale": "2x",
64
+            "platform": "ios"
65
+        },
66
+        {
67
+            "size": "60x60",
68
+            "idiom": "universal",
69
+            "filename": "icon-60@3x.png",
70
+            "scale": "3x",
71
+            "platform": "ios"
72
+        },
73
+        {
74
+            "size": "64x64",
75
+            "idiom": "universal",
76
+            "filename": "icon-64@2x.png",
77
+            "scale": "2x",
78
+            "platform": "ios"
79
+        },
80
+        {
81
+            "size": "64x64",
82
+            "idiom": "universal",
83
+            "filename": "icon-64@3x.png",
84
+            "scale": "3x",
85
+            "platform": "ios"
86
+        },
87
+        {
88
+            "size": "68x68",
89
+            "idiom": "universal",
90
+            "filename": "icon-68@2x.png",
91
+            "scale": "2x",
92
+            "platform": "ios"
93
+        },
94
+        {
95
+            "size": "76x76",
96
+            "idiom": "universal",
97
+            "filename": "icon-76@2x.png",
98
+            "scale": "2x",
99
+            "platform": "ios"
100
+        },
101
+        {
102
+            "size": "83.5x83.5",
103
+            "idiom": "universal",
104
+            "filename": "icon-83.5@2x.png",
105
+            "scale": "2x",
106
+            "platform": "ios"
107
+        },
108
+        {
109
+            "size": "1024x1024",
110
+            "idiom": "universal",
111
+            "filename": "icon-1024.png",
112
+            "scale": "1x",
113
+            "platform": "ios"
114
+        }
115
+    ],
116
+    "info": {
117
+        "version": 1,
118
+        "author": "icon.wuruihong.com"
116 119
     }
117
-  ],
118
-  "info" : {
119
-    "version" : 1,
120
-    "author" : "xcode"
121
-  }
122
-}
120
+}

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-1024.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-38@2x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-38@3x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-64@2x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-64@3x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-68@2x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png Ver fichero


+ 3
- 3
ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json Ver fichero

@@ -2,17 +2,17 @@
2 2
   "images" : [
3 3
     {
4 4
       "idiom" : "universal",
5
-      "filename" : "LaunchImage.png",
5
+      "filename" : "launch_image.png",
6 6
       "scale" : "1x"
7 7
     },
8 8
     {
9 9
       "idiom" : "universal",
10
-      "filename" : "LaunchImage@2x.png",
10
+      "filename" : "launch_image.png",
11 11
       "scale" : "2x"
12 12
     },
13 13
     {
14 14
       "idiom" : "universal",
15
-      "filename" : "LaunchImage@3x.png",
15
+      "filename" : "launch_image.png",
16 16
       "scale" : "3x"
17 17
     }
18 18
   ],

BIN
ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png Ver fichero


BIN
ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png Ver fichero


BIN
ios/Runner/Assets.xcassets/LaunchImage.imageset/launch_image.png Ver fichero


+ 16
- 8
ios/Runner/Base.lproj/LaunchScreen.storyboard Ver fichero

@@ -1,8 +1,10 @@
1
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
3
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
3 4
     <dependencies>
4 5
         <deployment identifier="iOS"/>
5
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
6
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
7
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
6 8
     </dependencies>
7 9
     <scenes>
8 10
         <!--View Controller-->
@@ -10,28 +12,34 @@
10 12
             <objects>
11 13
                 <viewController id="01J-lp-oVM" sceneMemberID="viewController">
12 14
                     <layoutGuides>
13
-                        <viewControllerLayoutGuide type="top" id="Ydg-fD-yQy"/>
14
-                        <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
15
+                        <viewControllerLayoutGuide type="top" id="a44-U1-OzV"/>
16
+                        <viewControllerLayoutGuide type="bottom" id="y2S-WU-J3H"/>
15 17
                     </layoutGuides>
16 18
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
19
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
17 20
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18 21
                         <subviews>
19
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
22
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
23
+                                <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
20 24
                             </imageView>
21 25
                         </subviews>
22 26
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
23 27
                         <constraints>
24 28
                             <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
25 29
                             <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
30
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="PY3-Rw-gLu"/>
31
+                            <constraint firstAttribute="trailing" secondItem="YRO-k0-Ey4" secondAttribute="trailing" id="mu3-0D-dEw"/>
32
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="tqz-5w-dIW"/>
33
+                            <constraint firstAttribute="bottom" secondItem="YRO-k0-Ey4" secondAttribute="bottom" id="w4B-k6-cVG"/>
26 34
                         </constraints>
27 35
                     </view>
28 36
                 </viewController>
29 37
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
30 38
             </objects>
31
-            <point key="canvasLocation" x="53" y="375"/>
39
+            <point key="canvasLocation" x="80.152671755725194" y="264.08450704225356"/>
32 40
         </scene>
33 41
     </scenes>
34 42
     <resources>
35
-        <image name="LaunchImage" width="168" height="185"/>
43
+        <image name="LaunchImage" width="250" height="541.33331298828125"/>
36 44
     </resources>
37 45
 </document>

+ 8
- 5
ios/Runner/Base.lproj/Main.storyboard Ver fichero

@@ -1,8 +1,10 @@
1
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
3
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
3 4
     <dependencies>
4 5
         <deployment identifier="iOS"/>
5
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
6
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
7
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
6 8
     </dependencies>
7 9
     <scenes>
8 10
         <!--Flutter View Controller-->
@@ -14,13 +16,14 @@
14 16
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
15 17
                     </layoutGuides>
16 18
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
17
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
19
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
18 20
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
19
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
21
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
20 22
                     </view>
21 23
                 </viewController>
22 24
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
23 25
             </objects>
26
+            <point key="canvasLocation" x="-26" y="-76"/>
24 27
         </scene>
25 28
     </scenes>
26 29
 </document>

+ 21
- 4
ios/Runner/Info.plist Ver fichero

@@ -2,10 +2,12 @@
2 2
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 3
 <plist version="1.0">
4 4
 <dict>
5
+	<key>CADisableMinimumFrameDurationOnPhone</key>
6
+	<true/>
5 7
 	<key>CFBundleDevelopmentRegion</key>
6 8
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
7 9
 	<key>CFBundleDisplayName</key>
8
-	<string>Worker Client</string>
10
+	<string>农机手</string>
9 11
 	<key>CFBundleExecutable</key>
10 12
 	<string>$(EXECUTABLE_NAME)</string>
11 13
 	<key>CFBundleIdentifier</key>
@@ -20,12 +22,29 @@
20 22
 	<string>$(FLUTTER_BUILD_NAME)</string>
21 23
 	<key>CFBundleSignature</key>
22 24
 	<string>????</string>
25
+	<key>CFBundleURLTypes</key>
26
+	<array>
27
+		<dict/>
28
+	</array>
23 29
 	<key>CFBundleVersion</key>
24 30
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
25 31
 	<key>LSRequiresIPhoneOS</key>
26 32
 	<true/>
33
+	<key>NSAppTransportSecurity</key>
34
+	<dict>
35
+		<key>NSAllowsArbitraryLoads</key>
36
+		<true/>
37
+	</dict>
38
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
39
+	<string>需要使用您的定位,显示农机车辆信息</string>
40
+	<key>NSLocationAlwaysUsageDescription</key>
41
+	<string>需要使用您的定位,显示农机车辆信息</string>
42
+	<key>NSLocationUsageDescription</key>
43
+	<string>需要使用您的定位,显示农机车辆信息</string>
44
+	<key>NSLocationWhenInUseUsageDescription</key>
45
+	<string>需要使用您的定位,显示农机车辆信息</string>
27 46
 	<key>UILaunchStoryboardName</key>
28
-	<string>LaunchScreen</string>
47
+	<string>LaunchScreen.storyboard</string>
29 48
 	<key>UIMainStoryboardFile</key>
30 49
 	<string>Main</string>
31 50
 	<key>UISupportedInterfaceOrientations</key>
@@ -43,7 +62,5 @@
43 62
 	</array>
44 63
 	<key>UIViewControllerBasedStatusBarAppearance</key>
45 64
 	<false/>
46
-	<key>CADisableMinimumFrameDurationOnPhone</key>
47
-	<true/>
48 65
 </dict>
49 66
 </plist>

+ 1
- 0
ios/Runner/en.lproj/LaunchScreen.strings Ver fichero

@@ -0,0 +1 @@
1
+

+ 2
- 2
lib/models/app.dart Ver fichero

@@ -23,8 +23,8 @@ class AppController extends GetxController {
23 23
   get locationStr {
24 24
     if (null == location.value) return null;
25 25
 
26
-    double longitude = location.value!['longitude'] as double;
27
-    double latitude = location.value!['latitude'] as double;
26
+    String longitude = location.value!['longitude'] as String;
27
+    String latitude = location.value!['latitude'] as String;
28 28
 
29 29
     return longitude.toString() + "," + latitude.toString();
30 30
   }

+ 9
- 1
lib/pages/jobDetail/index.dart Ver fichero

@@ -154,6 +154,7 @@ class JobDetail extends BasicPage {
154 154
   @override
155 155
   Widget builder(BuildContext context) {
156 156
     naviTitle = '详情';
157
+
157 158
     return Container(
158 159
         alignment: Alignment.topCenter,
159 160
         child: Column(
@@ -163,7 +164,7 @@ class JobDetail extends BasicPage {
163 164
                   job: true,
164 165
                   detail: true,
165 166
                   onClick: () {
166
-                    changeJob(job());
167
+                    // changeJob(job());
167 168
                   },
168 169
                   buttomText: job().status == 0 ? '开始作业' : '完成作业',
169 170
                 ))
@@ -171,3 +172,10 @@ class JobDetail extends BasicPage {
171 172
         ));
172 173
   }
173 174
 }
175
+
176
+// class JobDetail extends BasicPage {
177
+//   @override
178
+//   Widget builder(BuildContext context) {
179
+//     return new Text("hello world");
180
+//   }
181
+// }

+ 2
- 1
lib/utils/amap/const_config.dart Ver fichero

@@ -7,7 +7,8 @@ class ConstConfig {
7 7
   ///注意:使用[AMapWidget]的`apiKey`属性设置的key的优先级高于通过Native配置key的优先级,
8 8
   ///使用[AMapWidget]的`apiKey`属性配置后Native配置的key将失效,请根据实际情况选择使用
9 9
   static const AMapApiKey amapApiKeys = AMapApiKey(
10
-      androidKey: 'b481b4187e24e625fa0056fd0530e663', iosKey: '您申请的iOS平台的key');
10
+      androidKey: 'b481b4187e24e625fa0056fd0530e663',
11
+      iosKey: '47d11e6f7c80924cdb00abc20862eca9');
11 12
 
12 13
   ///高德隐私合规声明,这里只是示例,实际使用中请按照实际参数设置[AMapPrivacyStatement]的'hasContains''hasShow''hasAgree'这三个参数
13 14
   ///

+ 34
- 1
lib/utils/location.dart Ver fichero

@@ -39,6 +39,7 @@ Future _requirePermission() async {
39 39
     _permissionGranted = await Permission.location.request();
40 40
     if (_permissionGranted != PermissionStatus.granted) {
41 41
       throw Exception("请设置允许当前程序定位功能");
42
+      // openAppSettings();
42 43
     }
43 44
   }
44 45
 }
@@ -47,7 +48,8 @@ Future requireLocation(AMAPListener listener) async {
47 48
   AMapFlutterLocation.setApiKey(
48 49
       ConstConfig.amapApiKeys.androidKey!, ConstConfig.amapApiKeys.iosKey!);
49 50
   showPrivacy();
50
-  await _requirePermission();
51
+  // await _requirePermission();
52
+  await checkPermission();
51 53
   final AMapFlutterLocation location = AMapFlutterLocation();
52 54
   location.onLocationChanged().listen(listener);
53 55
   location.setLocationOption(_getAMapLocationOption());
@@ -132,3 +134,34 @@ _getAMapLocationOption() {
132 134
 //
133 135
 //   return location;
134 136
 // }
137
+
138
+//判断是否有权限
139
+Future checkPermission() async {
140
+  Permission permission = Permission.locationAlways;
141
+  PermissionStatus status = await permission.status;
142
+  print('检测权限 $status');
143
+  if (status.isGranted) {
144
+    //权限通过
145
+  } else if (status.isDenied) {
146
+    //权限拒绝, 需要区分IOS和Android,二者不一样
147
+    requestPermission(permission);
148
+  } else if (status.isPermanentlyDenied) {
149
+    //权限永久拒绝,且不在提示,需要进入设置界面
150
+    openAppSettings();
151
+  } else if (status.isRestricted) {
152
+    //活动限制(例如,设置了家长///控件,仅在iOS以上受支持。
153
+    openAppSettings();
154
+  } else {
155
+    //第一次申请
156
+    requestPermission(permission);
157
+  }
158
+}
159
+
160
+//申请权限
161
+Future requestPermission(Permission permission) async {
162
+  PermissionStatus status = await permission.request();
163
+  print('权限状态 $status');
164
+  if (!status.isGranted) {
165
+    openAppSettings();
166
+  }
167
+}