From 22f2d94e81e7f77df4a7a63b370a06a66dd1b93e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十月 2022 17:10:35 +0800
Subject: [PATCH] 0312 BT7sdk
---
SdkProject/channel/qkbt7game/java/com/secondworld/sdk/BtGamePlatform.java | 4 +-
Channel/Android/qkbt7game/debug/libs/library-debug-qkbt7game.aar | 0
Channel/Android/qkbt7game/release/libs/library-release-qkbt7game.aar | 0
SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java | 108 +++++++++++++++++++++++++++++++-----------------------
SdkProject/channel/qkbt7game/AndroidManifest.xml | 1
SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdRequestPermissionStart.java | 2 +
SdkProject/gradle.properties | 2
SdkProject/channel/qkbt7game/java/com/secondworld/sdk/BtGameMain.java | 2 +
8 files changed, 69 insertions(+), 50 deletions(-)
diff --git a/Channel/Android/qkbt7game/debug/libs/library-debug-qkbt7game.aar b/Channel/Android/qkbt7game/debug/libs/library-debug-qkbt7game.aar
index deebccc..6945024 100644
--- a/Channel/Android/qkbt7game/debug/libs/library-debug-qkbt7game.aar
+++ b/Channel/Android/qkbt7game/debug/libs/library-debug-qkbt7game.aar
Binary files differ
diff --git a/Channel/Android/qkbt7game/release/libs/library-release-qkbt7game.aar b/Channel/Android/qkbt7game/release/libs/library-release-qkbt7game.aar
index 793afd5..b003a9b 100644
--- a/Channel/Android/qkbt7game/release/libs/library-release-qkbt7game.aar
+++ b/Channel/Android/qkbt7game/release/libs/library-release-qkbt7game.aar
Binary files differ
diff --git a/SdkProject/channel/qkbt7game/AndroidManifest.xml b/SdkProject/channel/qkbt7game/AndroidManifest.xml
index eea4efb..0e65b82 100644
--- a/SdkProject/channel/qkbt7game/AndroidManifest.xml
+++ b/SdkProject/channel/qkbt7game/AndroidManifest.xml
@@ -8,7 +8,6 @@
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
diff --git a/SdkProject/channel/qkbt7game/java/com/secondworld/sdk/BtGameMain.java b/SdkProject/channel/qkbt7game/java/com/secondworld/sdk/BtGameMain.java
index 969072f..68e0023 100644
--- a/SdkProject/channel/qkbt7game/java/com/secondworld/sdk/BtGameMain.java
+++ b/SdkProject/channel/qkbt7game/java/com/secondworld/sdk/BtGameMain.java
@@ -9,12 +9,14 @@
import com.quicksdk.QuickSDK;
import com.quicksdk.Sdk;
+import com.secondworld.sdk.utils.LogUtil;
public class BtGameMain extends GameActivityProxy {
@Override
public void onCreate(Activity activity) {
super.onCreate(activity);
+ LogUtil.i("SdkManager", "BtGameMain onCreate");
QuickSdkMgr.I.requestPermissions(activity);
//QuickSdkMgr.I.init(activity);
com.quicksdk.Sdk.getInstance().onCreate(activity);
diff --git a/SdkProject/channel/qkbt7game/java/com/secondworld/sdk/BtGamePlatform.java b/SdkProject/channel/qkbt7game/java/com/secondworld/sdk/BtGamePlatform.java
index 9ae9bb3..8e107f3 100644
--- a/SdkProject/channel/qkbt7game/java/com/secondworld/sdk/BtGamePlatform.java
+++ b/SdkProject/channel/qkbt7game/java/com/secondworld/sdk/BtGamePlatform.java
@@ -9,11 +9,11 @@
@Override
public String platformProductCode() {
- return "41515786846775763118330293702907";
+ return "24741279556405026978672001418111";
}
@Override
public String platformProductKey() {
- return "16873632";
+ return "68571376";
}
}
diff --git a/SdkProject/gradle.properties b/SdkProject/gradle.properties
index e4fce8c..c6e06e5 100644
--- a/SdkProject/gradle.properties
+++ b/SdkProject/gradle.properties
@@ -18,4 +18,4 @@
## Automatically convert third-party libraries to use AndroidX
android.enableJetifier=false
#褰撳墠鏋勫缓鐨勬笭閬撳悕绉�
-CHANNEL_NAME=x7bt5
+CHANNEL_NAME=qkbt7game
diff --git a/SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdRequestPermissionStart.java b/SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdRequestPermissionStart.java
index 3caf031..6295969 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdRequestPermissionStart.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdRequestPermissionStart.java
@@ -4,6 +4,7 @@
import com.secondworld.sdk.PermissionManager;
import com.secondworld.sdk.QuickSdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
+import com.secondworld.sdk.utils.LogUtil;
import org.json.JSONException;
import org.json.JSONObject;
@@ -24,6 +25,7 @@
@Override
public void run()
{
+ LogUtil.i("SdkManager", "CmdRequestPermissionStart process");
QuickSdkMgr.I.requestPermissions(GameActivityProxy.I.activity);
}
});
diff --git a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
index 127419f..5b74e1f 100644
--- a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
+++ b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
@@ -48,64 +48,80 @@
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.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);
+ 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.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();
+// 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) {
--
Gitblit v1.8.0