Merge branch 'master' of gitee.com:starlock-cn/app-starlock

star_lock/ios/Podfile.lock

@@ -125,6 +125,8 @@ PODS:
     - Flutter
   - package_info_plus (0.4.5):
     - Flutter
+  - partial_media_permissions (0.0.1):
+    - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -184,6 +186,7 @@ DEPENDENCIES:
   - just_audio (from `.symlinks/plugins/just_audio/ios`)
   - network_info_plus (from `.symlinks/plugins/network_info_plus/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
+  - partial_media_permissions (from `.symlinks/plugins/partial_media_permissions/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
@@ -274,6 +277,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/network_info_plus/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
+  partial_media_permissions:
+    :path: ".symlinks/plugins/partial_media_permissions/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
@@ -335,6 +340,7 @@ SPEC CHECKSUMS:
   just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
   network_info_plus: 6d0c3eb8367b8164fa3fb0c19875e3f59d49697f
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
+  partial_media_permissions: 0fd34002b1dbfd5e8b4c60eb0d99e8e755a77f76
   path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
   ReachabilitySwift: 2128f3a8c9107e1ad33574c6e58e8285d460b149

star_lock/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_logic.dart

@@ -121,11 +121,7 @@ class MinePersonInfoLogic extends BaseGetXController {
 
   //权限判断 访问相册
   Future<void> _checkPhotoPermission() async {
-    bool isAndroid33 =
-        AppPlatform.isAndroid && AppPlatform.getSdkIntValue() >= 33;
-    var status = isAndroid33
-        ? await PermissionDialog.request(Permission.photos)
-        : await PermissionDialog.request(Permission.storage);
+    var status = await PermissionDialog.requestPhotos();
     if (status) {
       selectImage();
     }

star_lock/lib/widget/permission/permission_dialog.dart

@@ -83,6 +83,94 @@ class PermissionDialog {
     return false;
   }
 
+  //相册
+  static Future<bool> requestPhotos() async {
+    if (Get.context == null) {
+      return false;
+    }
+    bool isAndroid33 =
+        AppPlatform.isAndroid && AppPlatform.getSdkIntValue() >= 33;
+
+    //通用的局部函数
+    List<Permission> requestPermission() {
+      List<Permission> permissions;
+      if (isAndroid33) {
+        permissions = [
+          Permission.mediaLibrary,
+          Permission.photos,
+          Permission.videos,
+        ];
+      } else {
+        permissions = [
+          Permission.storage,
+        ];
+      }
+      return permissions;
+    }
+
+    Future<bool> permissionStatus(List<Permission> permissions) async {
+      bool isGranted = true;
+      for (Permission permission in permissions) {
+        isGranted =
+            isGranted && (await permission.status) == PermissionStatus.granted;
+      }
+      if (isAndroid33) {
+        // android 33以上需要申请媒体库权限
+        isGranted =
+            (await Permission.mediaLibrary.status) == PermissionStatus.granted;
+      }
+      return isGranted;
+    }
+
+    bool application = true;
+    Permission permission = Permission.photos;
+    List<Permission> permissions = requestPermission();
+    dynamic cache = await Storage.getString(titles[permission]);
+    bool isGranted = await permissionStatus(permissions);
+    if (AppPlatform.isAndroid && !isGranted && cache is! String) {
+      application = await showCupertinoDialog(
+        context: Get.context!,
+        builder: (context) {
+          return PopScope(
+              canPop: false,
+              child: CupertinoAlertDialog(
+                title: Text('${'申请'.tr}${titles[permission] ?? ''}${'权限'.tr}'),
+                content: Text(contents[permission] ?? ''),
+                actions: [
+                  CupertinoDialogAction(
+                    child: Text('不允许'.tr),
+                    onPressed: () {
+                      Get.back(result: false);
+                    },
+                  ),
+                  CupertinoDialogAction(
+                    child: Text('允许'.tr),
+                    onPressed: () {
+                      Get.back(result: true);
+                    },
+                  ),
+                ],
+              ));
+        },
+      );
+      if (application) {
+        await Storage.setString(titles[permission], titles[permission]);
+      }
+    } else if (cache is String) {
+      bool isDenied = !(await permissionStatus(permissions));
+      if (isDenied) {
+        showSet(permission);
+        return false;
+      }
+    }
+    if (application) {
+      Map<Permission, PermissionStatus> statuses = await permissions.request();
+      bool isGranted = await permissionStatus(statuses.keys.toList());
+      return isGranted;
+    }
+    return false;
+  }
+
   //显示权限判断申请框
   static Future<bool> request(Permission permission, [String? content]) async {
     if (Get.context == null) {