From 6f5f6928ec158d511a285393f73dfcb1f72a5f80 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 02 十一月 2022 17:46:55 +0800
Subject: [PATCH] 0312 ios充值
---
SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java | 164 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 114 insertions(+), 50 deletions(-)
diff --git a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
index 73d075c..e3e6b71 100644
--- a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
+++ b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
@@ -9,8 +9,8 @@
import android.content.pm.PackageManager;
import android.net.Uri;
import android.provider.Settings;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
import android.widget.Toast;
import com.quicksdk.BaseCallBack;
@@ -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,63 +44,93 @@
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);
+// 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;
}
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 {
- // check鏉冮檺
if (!hasPermissions(activity)) {
- // 娌℃湁鍒欑敵璇锋潈闄�
ActivityCompat.requestPermissions(activity, new String[]{
- Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
- } else {
- QuickSdkMgr.I.init(activity);
+ Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
}
- } catch (Exception e) {
+ QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
QuickSdkMgr.I.init(activity);
+ }
+ catch (Exception e) {
+ LogUtil.i("SdkManager", "requestPermissions 鍒濆鍖朣DK澶辫触");
}
}
public void onRequestPermissionsResult(Activity activity, int requestCode, int[] grantResults) {
if (requestCode != RequestCode.QUICK) return;
- if (hasPermissions(activity)) {
- QuickSdkMgr.I.init(activity);
- return;
+ if (hasPermissions(activity))
+ {
+ LogUtil.i("SdkManager", "onRequestPermissionsResult 鐢宠鎴愬姛");
}
- 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();
+
+// 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();
}
public void onActivityResult(Activity activity, int requestCode) {
- if (requestCode == REQUEST_RECORD_PERMISSION_SETTING)
- requestPermissions(activity);
+// if (requestCode == REQUEST_RECORD_PERMISSION_SETTING)
+// {
+// LogUtil.i("SdkManager", "onActivityResult");
+// requestPermissions(activity);
+// }
+
}
public void init(Activity activity) {
@@ -114,17 +145,25 @@
if (GameActivityProxy.I.activity == null)
return;
if (hasPermissions(GameActivityProxy.I.activity)) {
- init(BtGameMain.I.activity);
- Toast.makeText(GameAppProxy.app, "姝ｅ湪鍒濆鍖栦腑锛岃绋嶇瓑", Toast.LENGTH_LONG).show();
+ //init(BtGameMain.I.activity);
+ Toast.makeText(GameAppProxy.app, "寮傚父璇烽噸鍚父鎴�", Toast.LENGTH_LONG).show();
}
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: {
- Toast.makeText(GameAppProxy.app, "姝ｅ湪鍒濆鍖栦腑锛岃绋嶇瓑", Toast.LENGTH_LONG).show();
+ Toast.makeText(GameAppProxy.app, "姝ｅ湪鍒濆鍖栦腑锛岃绋嶇瓑锛�", Toast.LENGTH_LONG).show();
break;
}
}
@@ -133,19 +172,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 +281,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;
+ 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