Merge branch 'master' into dev_6.5.5

2023-08-24 15:02:05 +08:00
parent cee1476ab1 20a6bae5ff
commit 2b59b1b4fe
8 changed files with 685 additions and 617 deletions
--- a/common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java
+++ b/common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java
@@ -49,6 +49,15 @@ public class ProcessImageUtil extends ProcessResultUtil {
                Manifest.permission.READ_EXTERNAL_STORAGE,
                Manifest.permission.WRITE_EXTERNAL_STORAGE,
        };
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            mCameraPermissions = new String[]{
+                    Manifest.permission.READ_MEDIA_IMAGES,
+                    Manifest.permission.CAMERA
+            };
+            mAlumbPermissions = new String[]{
+                    Manifest.permission.READ_MEDIA_IMAGES,
+            };
+        }
        mCameraPermissionCallback = new Runnable() {
            @Override
            public void run() {