From cbd0384e4e68c3d838981aba0602c6d76fdc091b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 22 四月 2025 19:26:28 +0800
Subject: [PATCH] Merge branch '1.5.1_google' into 1.5.2
---
app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java
index 2aa33c7..ba503bb 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java
@@ -79,7 +79,7 @@
* 妫�鏌ュ涓潈闄�
*
* @param activity -
- * @param strings -
+ * @param strings -鏉冮檺鐨勬暟鎹�
* @return -
*/
public static String[] checkPermission(Activity activity, String[] strings) {
@@ -139,12 +139,15 @@
public void onGranted(List<String> permissions, boolean all) {
SharedPreUtils.putBoolean(permission, true);
if (permissionStateCallback != null) {
- permissionStateCallback.Success(STATUS_REFUSE);
+ permissionStateCallback.Success(STATUS_SUCCESS);
}
}
@Override
public void onDenied(List<String> permissions, boolean never) {
+ if (permissionStateCallback != null) {
+ permissionStateCallback.Success(STATUS_REFUSE);
+ }
if (is_skip) {
SharedPreUtils.putBoolean(permission, true);
}
@@ -155,6 +158,9 @@
// if (permissionStateCallback != null) {
// permissionStateCallback.Success(STATUS_REFUSE_PERMANENT);
// }
+ if (permissionStateCallback != null) {
+ permissionStateCallback.Success(STATUS_REFUSE_PERMANENT);
+ }
if (is_skip) {
HdlDialogLogic.getInstance().showSettingPermissionDialog(activity);
}
--
Gitblit v1.8.0