From 7945b97c50d99e23b57e4b359e6c623bde1a8a25 Mon Sep 17 00:00:00 2001
From: liuxue <q3213421wrwqr>
Date: 星期三, 28 四月 2021 18:03:31 +0800
Subject: [PATCH] 8918 【BTZF】9917平台接入专服增加快手SDK 修正
---
SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 44 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 eff80fe..850f03a 100644
--- a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
+++ b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
@@ -9,10 +9,9 @@
import android.content.pm.PackageManager;
import android.net.Uri;
import android.provider.Settings;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
import android.widget.Toast;
-
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
import com.quicksdk.BaseCallBack;
import com.quicksdk.Extend;
@@ -33,6 +32,7 @@
import com.secondworld.sdk.utils.CodeA2U;
import com.secondworld.sdk.utils.LogUtil;
import com.secondworld.sdk.utils.RequestCode;
+import com.unity3d.player.UnityPlayer;
import org.json.JSONException;
import org.json.JSONObject;
@@ -120,7 +120,15 @@
break;
}
case SUCCEED: {
- User.getInstance().login(GameActivityProxy.I.activity);
+ //User.getInstance().login(GameActivityProxy.I.activity);
+ GameActivityProxy.I.activity.runOnUiThread(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ User.getInstance().login(GameActivityProxy.I.activity);
+ }
+ });
break;
}
case LOADING: {
@@ -133,19 +141,44 @@
public void loginOut() {
if (GameActivityProxy.I.activity == null)
return;
- User.getInstance().logout(GameActivityProxy.I.activity);
+ //User.getInstance().logout(GameActivityProxy.I.activity);
+ GameActivityProxy.I.activity.runOnUiThread(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ User.getInstance().logout(GameActivityProxy.I.activity);
+ }
+ });
}
public void setGameRoleInfo(GameRoleInfo roleInfo, boolean createRole) {
if (GameActivityProxy.I.activity == null)
return;
- User.getInstance().setGameRoleInfo(GameActivityProxy.I.activity, roleInfo, createRole);
+ //User.getInstance().setGameRoleInfo(GameActivityProxy.I.activity, roleInfo, createRole);
+
+ GameActivityProxy.I.activity.runOnUiThread(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ User.getInstance().setGameRoleInfo(GameActivityProxy.I.activity, roleInfo, createRole);
+ }
+ });
}
public void pay(OrderInfo orderInfo, GameRoleInfo roleInfo) {
if (GameActivityProxy.I.activity == null)
return;
- Payment.getInstance().pay(GameActivityProxy.I.activity, orderInfo, roleInfo);
+ //Payment.getInstance().pay(GameActivityProxy.I.activity, orderInfo, roleInfo);
+ GameActivityProxy.I.activity.runOnUiThread(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ Payment.getInstance().pay(GameActivityProxy.I.activity, orderInfo, roleInfo);
+ }
+ });
}
public void verifyRealName() {
@@ -217,10 +250,10 @@
try {
args.clear();
JSONObject info = new JSONObject();
- String cid = com.quicksdk.Extend.getInstance().getExtrasConfig("cid");
- if (cid == null || cid.isEmpty())
- cid = com.quicksdk.Extend.getInstance().getChannelType() + "";
- String account = userInfo.getUID() + "@" + cid;
+ String channel = com.quicksdk.Extend.getInstance().getExtrasConfig("channel");
+ if (channel == null || channel.isEmpty())
+ channel = com.quicksdk.Extend.getInstance().getChannelType() + "";
+ String account = userInfo.getUID() + "@" + channel;
info.put("account", account);
info.put("userName", userInfo.getUID());
info.put("token", userInfo.getToken());
--
Gitblit v1.8.0