From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 cbc69e5..ba503bb 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java
@@ -48,7 +48,7 @@
* @param activity -
* @param strings -
*/
- public static void askPermission(Activity activity, String[] strings) {
+ public static void activityPermission(Activity activity, String[] strings) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
List<String> newList = new ArrayList<>();
for (String permission : strings) {
@@ -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