From 8acf6f219bb59b342c6560e5aed4f103aa83ea89 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期日, 24 七月 2022 14:43:45 +0800
Subject: [PATCH] 0312 测试

---
 SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
index 850f03a..127419f 100644
--- a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
+++ b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
@@ -33,6 +33,7 @@
 import com.secondworld.sdk.utils.LogUtil;
 import com.secondworld.sdk.utils.RequestCode;
 import com.unity3d.player.UnityPlayer;
+import com.secondworld.sdk.PlatformDiff;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -43,7 +44,7 @@
 
     String productCode;
     String productKey;
-
+    public String channelID;
     int REQUEST_RECORD_PERMISSION_SETTING = 110;
 
     private boolean hasPermissions(Activity activity) {
@@ -61,16 +62,21 @@
                 ActivityCompat.requestPermissions(activity, new String[]{
                         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);
             }
         } catch (Exception e) {
-            QuickSdkMgr.I.init(activity);
+            //QuickSdkMgr.I.init(activity);
+            ActivityCompat.requestPermissions(activity, new String[]{
+                    Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
         }
     }
 
     public void onRequestPermissionsResult(Activity activity, int requestCode, int[] grantResults) {
         if (requestCode != RequestCode.QUICK) return;
         if (hasPermissions(activity)) {
+            //鐢宠鎴愬姛
+            QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
             QuickSdkMgr.I.init(activity);
             return;
         }
@@ -98,8 +104,8 @@
     }
 
     public void onActivityResult(Activity activity, int requestCode) {
-        if (requestCode == REQUEST_RECORD_PERMISSION_SETTING)
-            requestPermissions(activity);
+//        if (requestCode == REQUEST_RECORD_PERMISSION_SETTING)
+//            requestPermissions(activity);
     }
 
     public void init(Activity activity) {
@@ -114,8 +120,8 @@
                 if (GameActivityProxy.I.activity == null)
                     return;
                 if (hasPermissions(GameActivityProxy.I.activity)) {
-                    init(BtGameMain.I.activity);
-                    Toast.makeText(GameAppProxy.app, "姝e湪鍒濆鍖栦腑锛岃绋嶇瓑", Toast.LENGTH_LONG).show();
+                    //init(BtGameMain.I.activity);
+                    Toast.makeText(GameAppProxy.app, "寮傚父璇烽噸鍚父鎴�", Toast.LENGTH_LONG).show();
                 }
                 break;
             }
@@ -132,7 +138,7 @@
                 break;
             }
             case LOADING: {
-                Toast.makeText(GameAppProxy.app, "姝e湪鍒濆鍖栦腑锛岃绋嶇瓑", Toast.LENGTH_LONG).show();
+                Toast.makeText(GameAppProxy.app, "姝e湪鍒濆鍖栦腑锛岃绋嶇瓑锛�", Toast.LENGTH_LONG).show();
                 break;
             }
         }
@@ -250,10 +256,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());

--
Gitblit v1.8.0