权限插件升级后适配，地图年审，新建店铺OK

wdn127929
1 parent 2b62acb7
Showing 10 changed files with 62 additions and 14 deletions
android/app/build.gradle
android/app/src/main/AndroidManifest.xml
ios/Podfile
ios/Podfile.lock
ios/Runner.xcodeproj/project.pbxproj
lib/main.dart
lib/pages/create_store/map_choice_point.dart
lib/utils/misc.dart
pubspec.lock
pubspec.yaml
--- a/android/app/build.gradle
View file @f87f61d
+++ b/android/app/build.gradle
View file @f87f61d
@@ -28,7 +28,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 apply plugin: 'com.huawei.agconnect'
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
     sourceSets {
--- a/android/app/src/main/AndroidManifest.xml
View file @f87f61d
+++ b/android/app/src/main/AndroidManifest.xml
View file @f87f61d
@@ -109,7 +109,7 @@
         <!-- End FlutterDownloader customization -->
         <meta-data
             android:name="com.amap.api.v2.apikey"
-            android:value="dbced781d0acd36184d5b4b54da7188d"/>
+            android:value="13464ddadd6a5d825e79f90e10ba72d2"/>
     </application>
 </manifest>
--- a/ios/Podfile
View file @f87f61d
+++ b/ios/Podfile
View file @f87f61d
@@ -44,5 +44,26 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
+    target.build_configurations.each do |config|
+      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
+        '$(inherited)',
+          # dart: PermissionGroup.calendar
+        'PERMISSION_EVENTS=1',
+        # dart: PermissionGroup.contacts
+        'PERMISSION_CONTACTS=1',
+
+        # dart: PermissionGroup.camera
+        'PERMISSION_CAMERA=1',
+         # dart: PermissionGroup.photos
+        'PERMISSION_PHOTOS=1',
+        # dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse]
+        'PERMISSION_LOCATION=1',
+         # dart: PermissionGroup.notification
+        'PERMISSION_NOTIFICATIONS=1',
+        # dart: PermissionGroup.mediaLibrary
+        'PERMISSION_MEDIA_LIBRARY=1', 
+      ]
+
+      end 
   end
 end
--- a/ios/Podfile.lock
View file @f87f61d
+++ b/ios/Podfile.lock
View file @f87f61d
@@ -289,6 +289,6 @@ SPEC CHECKSUMS:
   wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
   webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b
-PODFILE CHECKSUM: 5ec332e49a00fefb68bb9a3e9c76de96e5761cec
+PODFILE CHECKSUM: 1574ae4cc03174899add0135a43cdaf8019bd5fd
 COCOAPODS: 1.11.3
--- a/ios/Runner.xcodeproj/project.pbxproj
View file @f87f61d
+++ b/ios/Runner.xcodeproj/project.pbxproj
View file @f87f61d
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 50;
 	objects = {
 /* Begin PBXBuildFile section */
@@ -636,7 +636,7 @@
 				CURRENT_PROJECT_VERSION = 380;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
-				FLUTTER_BUILD_MODE = release;
+				FLUTTER_BUILD_MODE = debug;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
--- a/lib/main.dart
View file @f87f61d
+++ b/lib/main.dart
View file @f87f61d
@@ -122,9 +122,15 @@ Future<void> main() async {
       ));
     });
     // await App.initSp();
+    await AmapLocation.instance.updatePrivacyShow(true);
+    await AmapLocation.instance.updatePrivacyAgree(true);
     await AmapService.instance.init(
-        iosKey: 'e373581528f8fd901c01dfbda236159e',
-        androidKey: 'dbced781d0acd36184d5b4b54da7188d');
+        iosKey: '24fe3a700e69114a4328d4e46823dcda',
+        androidKey: '13464ddadd6a5d825e79f90e10ba72d2');
+
+    await AmapLocation.instance.init(
+      iosKey: '24fe3a700e69114a4328d4e46823dcda',
+    );
     /// 如果你觉得引擎的日志太多, 可以关闭Fluttify引擎的日志
     await enableFluttifyLog(false); // 关闭log
--- a/lib/pages/create_store/map_choice_point.dart
View file @f87f61d
+++ b/lib/pages/create_store/map_choice_point.dart
View file @f87f61d
@@ -66,10 +66,14 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> {
   /// 获取定位权限
   _requestLocationPermission() async {
+    await AmapLocation.instance.updatePrivacyShow(true);
+    await AmapLocation.instance.updatePrivacyAgree(true);
     bool canLocation = await requestPermission(Permission.location);
     // 单次定位
     if (canLocation) {
       Future.delayed(Duration(milliseconds: 200), () async {
+        await AmapLocation.instance.updatePrivacyShow(true);
+        await AmapLocation.instance.updatePrivacyAgree(true);
         final location = await AmapLocation.instance.fetchLocation(
             // needAddress: true,
             // mode: LocationAccuracy.High,
@@ -84,8 +88,11 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> {
         } else {
           latitude = location.latLng.latitude;
           longitude = location.latLng.longitude;
-          _controller.setCenterCoordinate(
-              LatLng(location.latLng.latitude, location.latLng.longitude));
+          if (_controller != null) {
+            _controller.setCenterCoordinate(
+                LatLng(location.latLng.latitude, location.latLng.longitude));
+          }
+
           setState(() {});
         }
       });
@@ -193,6 +200,8 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> {
                   zoomLevel: 16,
                   onMapCreated: (controller) async {
                     _controller = controller;
+                    _controller
+                        .setCenterCoordinate(LatLng(latitude, longitude));
                     // if (await requestPermission(PermissionGroup.location)) {
                     //   await controller.showMyLocation(true);
                     //   await controller?.showLocateControl(true);
@@ -300,13 +309,18 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> {
     });
     /// 逆地理编码（坐标转地址）
+    ///
+    ///
+    await AmapLocation.instance.updatePrivacyShow(true);
+    await AmapLocation.instance.updatePrivacyAgree(true);
     ReGeocode reGeocodeList = await AmapSearch.instance.searchReGeocode(
       latLng,
     );
     // print(await reGeocodeList.toFutureString());
-    address = await reGeocodeList.formatAddress;
-
+    address = reGeocodeList.formatAddress;
+    await AmapLocation.instance.updatePrivacyShow(true);
+    await AmapLocation.instance.updatePrivacyAgree(true);
     final poiList = await AmapSearch.instance.searchKeyword(
       address.toString(),
       city: "西安",
@@ -334,6 +348,8 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> {
   }
   void searchAroundAddress(String text) async {
+    await AmapLocation.instance.updatePrivacyShow(true);
+    await AmapLocation.instance.updatePrivacyAgree(true);
     final poiList = await AmapSearch.instance.searchKeyword(
       text,
       city: "西安",
--- a/lib/utils/misc.dart
View file @f87f61d
+++ b/lib/utils/misc.dart
View file @f87f61d
@@ -21,6 +21,11 @@ Future<bool> checkPermission(Permission permissionGroup) async {
 Future<bool> requestPermission(Permission permissionGroup) async {
   final permissions = await [permissionGroup].request();
+  if (await permissionGroup.request().isGranted) {
+    print(true);
+    // Either the permission was already granted before or the user just granted it.
+  }
+
   if (permissions[permissionGroup] == PermissionStatus.granted) {
     return true;
   } else {
--- a/pubspec.lock
View file @f87f61d
+++ b/pubspec.lock
View file @f87f61d
@@ -820,14 +820,14 @@ packages:
       name: permission_handler
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "9.2.0"
+    version: "10.0.0"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "9.0.2+1"
+    version: "10.0.0"
   permission_handler_apple:
     dependency: transitive
     description:
--- a/pubspec.yaml
View file @f87f61d
+++ b/pubspec.yaml
View file @f87f61d
@@ -45,7 +45,7 @@ dependencies:
   # fluttertoast: ^3.1.3
   fluttertoast: ^8.0.9
 #  权限管理
-  permission_handler: ^9.2.0
+  permission_handler: ^10.0.0
   # permission_handler: ^5.0.1
   # permission_handler: ^5.0.1+1  ^6.1.1  4.4.0
 #  文件系统访问