Merge branch 'map_dev' into dev

# Conflicts:
#	ln_jq_app/android/app/src/main/AndroidManifest.xml
#	ln_jq_app/ios/Runner/Info.plist

ln_jq_app/ios/Podfile.lock

@@ -1,12 +1,26 @@
 PODS:
   - AlicloudELS (1.0.3)
   - AlicloudPush (3.2.3):
-    - AlicloudELS (= 1.0.3)
+    - AlicloudELS (~> 1.0.3)
     - AlicloudUTDID (~> 1.0)
   - AlicloudUTDID (1.6.1)
   - aliyun_push_flutter (0.0.1):
     - AlicloudPush (< 4.0, >= 3.2.3)
     - Flutter
+  - AMapFoundation-NO-IDFA (1.8.2)
+  - AMapLocation-NO-IDFA (2.11.0):
+    - AMapFoundation-NO-IDFA (>= 1.8.0)
+  - AMapNavi-NO-IDFA (10.1.600):
+    - AMapFoundation-NO-IDFA (>= 1.8.2)
+  - AMapNavIOSSDK (0.1.0):
+    - AMapLocation-NO-IDFA
+    - AMapNavi-NO-IDFA
+    - AMapSearch-NO-IDFA
+    - Masonry
+    - MBProgressHUD
+    - MJExtension
+  - AMapSearch-NO-IDFA (9.7.4):
+    - AMapFoundation-NO-IDFA (>= 1.8.0)
   - connectivity_plus (0.0.1):
     - Flutter
   - device_info_plus (0.0.1):
@@ -30,6 +44,9 @@ PODS:
     - FlutterMacOS
   - image_picker_ios (0.0.1):
     - Flutter
+  - Masonry (1.1.0)
+  - MBProgressHUD (1.2.0)
+  - MJExtension (3.4.2)
   - mobile_scanner (7.0.0):
     - Flutter
     - FlutterMacOS
@@ -51,6 +68,7 @@ PODS:
 
 DEPENDENCIES:
   - aliyun_push_flutter (from `.symlinks/plugins/aliyun_push_flutter/ios`)
+  - AMapNavIOSSDK (from `./AMapNavIOSSDK`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
@@ -75,11 +93,20 @@ SPEC REPOS:
     - AlicloudELS
     - AlicloudPush
   trunk:
+    - AMapFoundation-NO-IDFA
+    - AMapLocation-NO-IDFA
+    - AMapNavi-NO-IDFA
+    - AMapSearch-NO-IDFA
+    - Masonry
+    - MBProgressHUD
+    - MJExtension
     - OrderedSet
 
 EXTERNAL SOURCES:
   aliyun_push_flutter:
     :path: ".symlinks/plugins/aliyun_push_flutter/ios"
+  AMapNavIOSSDK:
+    :path: "./AMapNavIOSSDK"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
   device_info_plus:
@@ -115,9 +142,14 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   AlicloudELS: fbf821383330465a5af84a033f36f263ae46ca41
-  AlicloudPush: 95150880af380f64cf1741f5586047c17d36c1d9
+  AlicloudPush: 52cbf38ffc20c07f039cbc72d5738745fd986215
   AlicloudUTDID: 5d2f22d50e11eecd38f30bc7a48c71925ea90976
   aliyun_push_flutter: 0fc2f048a08687ef256c0cfdd72dd7a550ef3347
+  AMapFoundation-NO-IDFA: 6ce0ef596d4eb8d934ff498e56747b6de1247b05
+  AMapLocation-NO-IDFA: 590fd42af0c8ea9eac26978348221bbc16be4ef9
+  AMapNavi-NO-IDFA: 22edfa7d6a81d75c91756e31b6c26b7746152233
+  AMapNavIOSSDK: e06adcb48ac8abeace46ea31f72191564e54a186
+  AMapSearch-NO-IDFA: 53b2193244be8f07f3be0a4d5161200236960587
   connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
   device_info_plus: 71ffc6ab7634ade6267c7a93088ed7e4f74e5896
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
@@ -127,6 +159,9 @@ SPEC CHECKSUMS:
   flutter_pdfview: 32bf27bda6fd85b9dd2c09628a824df5081246cf
   geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
   image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
+  Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
+  MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
+  MJExtension: e97d164cb411aa9795cf576093a1fa208b4a8dd8
   mobile_scanner: 9157936403f5a0644ca3779a38ff8404c5434a93
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
@@ -136,6 +171,6 @@ SPEC CHECKSUMS:
   shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
   url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
 
-PODFILE CHECKSUM: 357c01ff4e7591871e8c4fd6462220a8c7447220
+PODFILE CHECKSUM: b4931d4490f04261e0fda802d44e275ab3619244
 
 COCOAPODS: 1.16.2