From 30582ed5faa3a35caaec64deec3b376d0998f6fc Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 18 一月 2024 20:48:20 +0800
Subject: [PATCH] 0312 越南sdk
---
SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java | 80 +++++++++++++++++++++++++++------------
1 files changed, 55 insertions(+), 25 deletions(-)
diff --git a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
index 18c0e02..9531b08 100644
--- a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
+++ b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
@@ -44,37 +44,51 @@
String productCode;
String productKey;
-
+ public String channelID;
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);
+ public 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);
+
+ String[] permissionStr = PlatformDiff.I.platformPermission();
+ for (int i = 0; i < permissionStr.length; i++)
+ {
+ if (ContextCompat.checkSelfPermission(activity, permissionStr[i]) != PackageManager.PERMISSION_GRANTED)
+ {
+ return false;
+ }
+ }
+ return true;
}
public void requestPermissions(Activity activity) {
+
try {
- // check鏉冮檺
if (!hasPermissions(activity)) {
- // 娌℃湁鍒欑敵璇锋潈闄�
- ActivityCompat.requestPermissions(activity, new String[]{
- Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
- } else {
+ ActivityCompat.requestPermissions(activity, PlatformDiff.I.platformPermission(), 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) {
+ public void onRequestPermissionsResult(Activity activity, int requestCode, int[] grantResults, String[] permissions) {
if (requestCode != RequestCode.QUICK) return;
+
+
if (hasPermissions(activity)) {
+ LogUtil.i("SdkManager", "onRequestPermissionsResult 鐢宠鎴愬姛");
//鐢宠鎴愬姛
QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
QuickSdkMgr.I.init(activity);
@@ -82,7 +96,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,9 +118,14 @@
}
public void onActivityResult(Activity activity, int requestCode) {
-// if (requestCode == REQUEST_RECORD_PERMISSION_SETTING)
-// requestPermissions(activity);
+ if (requestCode == REQUEST_RECORD_PERMISSION_SETTING)
+ {
+ LogUtil.i("unity-sdk", "onActivityResult");
+ requestPermissions(activity);
+ }
+
}
+
public void init(Activity activity) {
sdkInitState = SdkInitState.LOADING;
@@ -237,7 +256,6 @@
LogUtil.debug("SdkManager", "鍒濆鍖栨垚鍔�");
UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformInitOk);
}
-
@Override
public void onFailed(String message, String trace) {
//鍒濆鍖栧け璐�
@@ -256,10 +274,10 @@
try {
args.clear();
JSONObject info = new JSONObject();
- String channel = com.quicksdk.Extend.getInstance().getExtrasConfig("channel");
- if (channel == null || channel.isEmpty())
- channel = com.quicksdk.Extend.getInstance().getChannelType() + "";
- String account = userInfo.getUID() + "@" + channel;
+ channelID = com.quicksdk.Extend.getInstance().getExtrasConfig("channel");
+ if (channelID == null || channelID.isEmpty())
+ channelID = com.quicksdk.Extend.getInstance().getChannelType() + "";
+ String account = userInfo.getUID() + "@" + channelID;
info.put("account", account);
info.put("userName", userInfo.getUID());
info.put("token", userInfo.getToken());
@@ -269,6 +287,7 @@
e.printStackTrace();
LogUtil.e("SdkManager 鐧诲綍鎴愬姛", e);
}
+ PlatformDiff.I.LoginSuccess();
verifyRealName();
}
@@ -357,7 +376,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