From de194e17cb621923d0d7f9d22ac8bc711b4b571c Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 20 十一月 2023 16:57:27 +0800
Subject: [PATCH] 0312 目标改31
---
SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java b/SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java
index 7163eac..1a1fd09 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java
@@ -2,13 +2,17 @@
import android.app.Activity;
import android.content.pm.PackageManager;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.PermissionChecker;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.PermissionChecker;
import com.secondworld.sdk.utils.CallBackState;
import com.secondworld.sdk.utils.CodeA2U;
+import com.secondworld.sdk.utils.LogUtil;
+import com.secondworld.sdk.utils.RequestCode;
+
import java.util.HashMap;
import java.util.Map;
@@ -20,14 +24,12 @@
public static PermissionManager I = new PermissionManager();
- private static final int REQUEST_CODE = 9527;
-
/**
* 鏌ヨ鏄惁鏈夋潈闄�
*/
public boolean hasPermission(String permission) {
- return ContextCompat.checkSelfPermission(GameApp.I, permission) == PackageManager.PERMISSION_GRANTED
- && PermissionChecker.checkSelfPermission(GameApp.I, permission) == PackageManager.PERMISSION_GRANTED;
+ return ContextCompat.checkSelfPermission(GameAppProxy.app, permission) == PackageManager.PERMISSION_GRANTED
+ && PermissionChecker.checkSelfPermission(GameAppProxy.app, permission) == PermissionChecker.PERMISSION_GRANTED;
}
/**
@@ -36,15 +38,16 @@
public void requestPermissions(String permission) {
if (GameActivityProxy.I == null || GameActivityProxy.I.activity == null)
return;
- ActivityCompat.requestPermissions(GameActivityProxy.I.activity, new String[]{permission}, REQUEST_CODE);
+ //ActivityCompat.requestPermissions(GameActivityProxy.I.activity, new String[]{permission}, RequestCode.UNITY);
+
}
public void onRequestPermissionsResult(Activity activity, int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
- if (activity == null||permissions.length==0||requestCode!=REQUEST_CODE)
+ if (activity == null || permissions.length == 0 || requestCode != RequestCode.UNITY)
return;
Map<String, Object> map = new HashMap<>();
- map.put("permission",permissions[0]);
+ map.put("permission", permissions[0]);
if (hasPermission(permissions[0])) {
map.put("state", CallBackState.Success);
} else {
@@ -55,6 +58,7 @@
}
}
UnityMsgHandler.sendMessageToUnity(CodeA2U.PermissionCallBack, map);
+ LogUtil.i("onRequestPermissionsResult", permissions[0]);
}
}
--
Gitblit v1.8.0