From 47356493abc78892a760dc1002df4a7dbe39f43f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 18 四月 2023 23:11:23 +0800
Subject: [PATCH] 0312 升级UnityPlayerActivity
---
SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
index 127419f..4e92c13 100644
--- a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
+++ b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
@@ -48,33 +48,56 @@
int REQUEST_RECORD_PERMISSION_SETTING = 110;
private boolean hasPermissions(Activity activity) {
- return (ContextCompat.checkSelfPermission(activity,
- Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED)
- && (ContextCompat.checkSelfPermission(activity,
- Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED);
+// return (ContextCompat.checkSelfPermission(activity,
+// Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED)
+// && (ContextCompat.checkSelfPermission(activity,
+// Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED);
+
+ return ContextCompat.checkSelfPermission(activity,
+ Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
}
public void requestPermissions(Activity activity) {
+// try {
+// // check鏉冮檺
+// if (!hasPermissions(activity)) {
+// // 娌℃湁鍒欑敵璇锋潈闄�
+// ActivityCompat.requestPermissions(activity, new String[]{
+// Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
+// } else {
+// QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
+// QuickSdkMgr.I.init(activity);
+// }
+// } catch (Exception e) {
+// //QuickSdkMgr.I.init(activity);
+// ActivityCompat.requestPermissions(activity, new String[]{
+// Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
+// }
+// ActivityCompat.requestPermissions(activity, new String[]{
+// Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
try {
- // check鏉冮檺
if (!hasPermissions(activity)) {
- // 娌℃湁鍒欑敵璇锋潈闄�
ActivityCompat.requestPermissions(activity, new String[]{
- Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
- } else {
+ Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
+ }
+ else
+ {
QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
QuickSdkMgr.I.init(activity);
}
- } catch (Exception e) {
- //QuickSdkMgr.I.init(activity);
- ActivityCompat.requestPermissions(activity, new String[]{
- Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
+
+ }
+ catch (Exception e) {
+ LogUtil.i("SdkManager", "requestPermissions 鍒濆鍖朣DK澶辫触");
}
}
public void onRequestPermissionsResult(Activity activity, int requestCode, int[] grantResults) {
if (requestCode != RequestCode.QUICK) return;
+
+ //1768娓犻亾涓�瀹氶渶瑕佹潈闄�
if (hasPermissions(activity)) {
+ LogUtil.i("SdkManager", "onRequestPermissionsResult 鐢宠鎴愬姛");
//鐢宠鎴愬姛
QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
QuickSdkMgr.I.init(activity);
@@ -82,7 +105,7 @@
}
final AlertDialog.Builder normalDialog = new AlertDialog.Builder(activity);
normalDialog.setTitle("鏉冮檺璁剧疆");
- normalDialog.setMessage("娓告垙闇�瑕侀儴鍒嗘潈闄愭墠鑳芥甯歌繍琛岋紝璇峰墠寰�璁剧疆涓墦寮�鐢佃瘽鏉冮檺涓庡瓨鍌ㄦ潈闄�");
+ normalDialog.setMessage("娓告垙闇�瑕侀儴鍒嗘潈闄愭墠鑳芥甯歌繍琛岋紝璇峰墠寰�璁剧疆涓墦寮�瀛樺偍鏉冮檺");
normalDialog.setPositiveButton("鍓嶅線璁剧疆", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
@@ -104,8 +127,12 @@
}
public void onActivityResult(Activity activity, int requestCode) {
-// if (requestCode == REQUEST_RECORD_PERMISSION_SETTING)
-// requestPermissions(activity);
+ if (requestCode == REQUEST_RECORD_PERMISSION_SETTING)
+ {
+ LogUtil.i("SdkManager", "onActivityResult");
+ requestPermissions(activity);
+ }
+
}
public void init(Activity activity) {
--
Gitblit v1.8.0