Merge remote-tracking branch 'origin/wu_2023_map' into wu_2023_map

# Conflicts:
#	lib/union/location_map_page.dart

ios/Runner.xcodeproj/project.pbxproj

@@ -617,7 +617,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -819,7 +819,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -912,7 +912,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

ios/Runner/Info.plist

@@ -177,5 +177,11 @@
 	<array>
         <string>location</string>
     </array>
+    <key>LSApplicationQueriesSchemes</key>
+    <array>
+        <string>iosamap</string>
+        <string>qqmap</string>
+        <string>baidumap</string>
+    </array>
 </dict>
 </plist>

lib/union/location_map_page.dart

@@ -471,7 +471,7 @@ class _LocationMap extends State<LocationMap> with WidgetsBindingObserver {
                 ? 'assets/image/traffic_texture_unknown.png'
                 : 'assets/image/traffic_texture_smooth.png'
           ],
-          width: 16.w.toInt(),
+          width: Platform.isAndroid ? 16 :10,
           lineDashType: BMFLineDashType.LineDashTypeNone,
           lineCapType: BMFLineCapType.LineCapButt,
           lineJoinType: BMFLineJoinType.LineJoinRound);

lib/union/union_list.dart

@@ -315,7 +315,7 @@ class _UnionList extends State<UnionList> with AutomaticKeepAliveClientMixin {
                             : storeList[position].productShow?.length ?? 0,
                     scrollDirection: Axis.horizontal,
                     shrinkWrap: true,
-                    physics: NeverScrollableScrollPhysics(),
+                    physics:BouncingScrollPhysics(),
                     itemBuilder: (context, index) {
                       return GestureDetector(
                         onTap: () {},

lib/union/union_page.dart

@@ -72,7 +72,7 @@ class UnionPageState extends State<UnionPage>
   }
 
   void permissionSettings() async {
-    if (await Permission.location.isGranted){
+    if (_isShowLocalTips && await Permission.location.isGranted){
       _isShowLocalTips = false;
       startLocation();
     }
@@ -111,7 +111,10 @@ class UnionPageState extends State<UnionPage>
     queryIpInfo();
   }
 
-  startLocation() async {
+  startLocation({bool showLoading = true}) async {
+    if(showLoading)
+    EasyLoading.show(
+        status: S.current.zhengzaijiazai, maskType: EasyLoadingMaskType.black);
     bool powerFlag = false;
     // bool finallyFlag = false;
     try {
@@ -184,7 +187,7 @@ class UnionPageState extends State<UnionPage>
         areaName = baseData.city.replaceAll("市", "");
       }
     } finally {
-      startLocation();
+      startLocation(showLoading: false);
     }
   }