From 24e75aea46eb84bd96c3525e23db4e3f449e19f2 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 17 八月 2023 18:59:11 +0800
Subject: [PATCH] 0312 恢复申请电话和存储权限
---
SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java | 108 ++++++++++++++++++++++++++----------------------------
1 files changed, 52 insertions(+), 56 deletions(-)
diff --git a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
index 3920dc4..3f3cbb5 100644
--- a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
+++ b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
@@ -58,30 +58,18 @@
}
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 {
if (!hasPermissions(activity)) {
ActivityCompat.requestPermissions(activity, new String[]{
Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
}
- //QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
- //QuickSdkMgr.I.init(activity);
+ else
+ {
+ QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
+ QuickSdkMgr.I.init(activity);
+ }
+
}
catch (Exception e) {
LogUtil.i("SdkManager", "requestPermissions 鍒濆鍖朣DK澶辫触");
@@ -90,47 +78,44 @@
public void onRequestPermissionsResult(Activity activity, int requestCode, int[] grantResults) {
if (requestCode != RequestCode.QUICK) return;
- if (hasPermissions(activity))
- {
+
+ //1768娓犻亾涓�瀹氶渶瑕佹潈闄�
+ if (hasPermissions(activity)) {
LogUtil.i("SdkManager", "onRequestPermissionsResult 鐢宠鎴愬姛");
+ //鐢宠鎴愬姛
+ QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
+ QuickSdkMgr.I.init(activity);
+ return;
}
- QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
- QuickSdkMgr.I.init(activity);
-// if (hasPermissions(activity)) {
-// //鐢宠鎴愬姛
-// QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
-// QuickSdkMgr.I.init(activity);
-// return;
-// }
-// final AlertDialog.Builder normalDialog = new AlertDialog.Builder(activity);
-// normalDialog.setTitle("鏉冮檺璁剧疆");
-// normalDialog.setMessage("娓告垙闇�瑕侀儴鍒嗘潈闄愭墠鑳芥甯歌繍琛岋紝璇峰墠寰�璁剧疆涓墦寮�鐢佃瘽鏉冮檺涓庡瓨鍌ㄦ潈闄�");
-// normalDialog.setPositiveButton("鍓嶅線璁剧疆", new DialogInterface.OnClickListener() {
-// @Override
-// public void onClick(DialogInterface dialog, int which) {
-// Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-// Uri uri = Uri.fromParts("package", activity.getPackageName(), null);
-// intent.setData(uri);
-// activity.startActivityForResult(intent, REQUEST_RECORD_PERMISSION_SETTING);
-// dialog.dismiss();
-// }
-// });
-// normalDialog.setNegativeButton("閫�鍑�", new DialogInterface.OnClickListener() {
-// @Override
-// public void onClick(DialogInterface dialog, int which) {
-// GameAppProxy.appExit();
-// }
-// });
-// // 鏄剧ず
-// normalDialog.show();
+ final AlertDialog.Builder normalDialog = new AlertDialog.Builder(activity);
+ normalDialog.setTitle("鏉冮檺璁剧疆");
+ normalDialog.setMessage("娓告垙闇�瑕侀儴鍒嗘潈闄愭墠鑳芥甯歌繍琛岋紝璇峰墠寰�璁剧疆涓墦寮�瀛樺偍鏉冮檺");
+ normalDialog.setPositiveButton("鍓嶅線璁剧疆", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+ Uri uri = Uri.fromParts("package", activity.getPackageName(), null);
+ intent.setData(uri);
+ activity.startActivityForResult(intent, REQUEST_RECORD_PERMISSION_SETTING);
+ dialog.dismiss();
+ }
+ });
+ normalDialog.setNegativeButton("閫�鍑�", new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ GameAppProxy.appExit();
+ }
+ });
+ // 鏄剧ず
+ normalDialog.show();
}
public void onActivityResult(Activity activity, int requestCode) {
-// if (requestCode == REQUEST_RECORD_PERMISSION_SETTING)
-// {
-// LogUtil.i("SdkManager", "onActivityResult");
-// requestPermissions(activity);
-// }
+ if (requestCode == REQUEST_RECORD_PERMISSION_SETTING)
+ {
+ LogUtil.i("SdkManager", "onActivityResult");
+ requestPermissions(activity);
+ }
}
@@ -383,7 +368,18 @@
@Override
public void onSuccess() {
//閫�鍑烘垚鍔燂紝娓告垙鍦ㄦ鍋氳嚜韬殑閫�鍑洪�昏緫澶勭悊
- UnityMsgHandler.sendMessageToUnity(CodeA2U.ExitGame);
+ //UnityMsgHandler.sendMessageToUnity(CodeA2U.ExitGame);
+ if (GameActivityProxy.I.activity == null)
+ {
+ UnityMsgHandler.sendMessageToUnity(CodeA2U.ExitGame);
+ return;
+ }
+ LogUtil.i("SdkManager", "activity閫�鍑�");
+ GameActivityProxy.I.activity.finish();
+ android.os.Process.killProcess(android.os.Process.myPid());
+ System.exit(0);
+
+
}
@Override
--
Gitblit v1.8.0