From 5837b6e09a6072eca67f6ca8d4c76fbb36e93e5e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 26 六月 2023 15:51:15 +0800
Subject: [PATCH] 0312 增加欢游-小7专服SDK 安卓和ios
---
SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java | 62 +++++++++++++++----------------
1 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
index 95c127b..cec977f 100644
--- a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
+++ b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
@@ -48,41 +48,28 @@
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;
+// 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 {
if (!hasPermissions(activity)) {
ActivityCompat.requestPermissions(activity, new String[]{
- Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
+ Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
+ }
+ else
+ {
+ QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
+ QuickSdkMgr.I.init(activity);
}
- //QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
- //QuickSdkMgr.I.init(activity);
}
catch (Exception e) {
LogUtil.i("SdkManager", "requestPermissions 鍒濆鍖朣DK澶辫触");
@@ -124,11 +111,11 @@
}
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);
+ }
}
@@ -381,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