diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 38e89163..7e315834 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/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 = ( diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index e12a98a1..173f6c23 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -177,5 +177,11 @@ location + LSApplicationQueriesSchemes + + iosamap + qqmap + baidumap + diff --git a/lib/union/location_map_page.dart b/lib/union/location_map_page.dart index 2d0eaff1..819eda41 100644 --- a/lib/union/location_map_page.dart +++ b/lib/union/location_map_page.dart @@ -471,7 +471,7 @@ class _LocationMap extends State 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); diff --git a/lib/union/union_list.dart b/lib/union/union_list.dart index d4d4ed08..6e554855 100644 --- a/lib/union/union_list.dart +++ b/lib/union/union_list.dart @@ -315,7 +315,7 @@ class _UnionList extends State with AutomaticKeepAliveClientMixin { : storeList[position].productShow?.length ?? 0, scrollDirection: Axis.horizontal, shrinkWrap: true, - physics: NeverScrollableScrollPhysics(), + physics:BouncingScrollPhysics(), itemBuilder: (context, index) { return GestureDetector( onTap: () {}, diff --git a/lib/union/union_page.dart b/lib/union/union_page.dart index d1cb3c36..204d3f89 100644 --- a/lib/union/union_page.dart +++ b/lib/union/union_page.dart @@ -72,7 +72,7 @@ class UnionPageState extends State } 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 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 areaName = baseData.city.replaceAll("市", ""); } } finally { - startLocation(); + startLocation(showLoading: false); } }