From 88e174594ae5cc112858065129fc314b997d3aa7 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期日, 08 十月 2023 12:11:00 +0800
Subject: [PATCH] 0312 抖音-游戏兔最新版本
---
Channel/Android/hygame/debug/libs/library-debug-hygame.aar | 0
SdkProject/channel/hygame/java/com/secondworld/sdk/BtGamePlatform.java | 74 +-----------------------
SdkProject/library/src/main/java/com/secondworld/sdk/PlatformDiff.java | 14 +---
SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java | 34 ++++++++++-
Channel/Android/hygame/release/libs/library-release-hygame.aar | 0
SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdRequestPermissionStart.java | 2
6 files changed, 38 insertions(+), 86 deletions(-)
diff --git a/Channel/Android/hygame/debug/libs/library-debug-hygame.aar b/Channel/Android/hygame/debug/libs/library-debug-hygame.aar
index 36f93fd..65c4c7f 100644
--- a/Channel/Android/hygame/debug/libs/library-debug-hygame.aar
+++ b/Channel/Android/hygame/debug/libs/library-debug-hygame.aar
Binary files differ
diff --git a/Channel/Android/hygame/release/libs/library-release-hygame.aar b/Channel/Android/hygame/release/libs/library-release-hygame.aar
index 7bc16ff..c60b06b 100644
--- a/Channel/Android/hygame/release/libs/library-release-hygame.aar
+++ b/Channel/Android/hygame/release/libs/library-release-hygame.aar
Binary files differ
diff --git a/SdkProject/channel/hygame/java/com/secondworld/sdk/BtGamePlatform.java b/SdkProject/channel/hygame/java/com/secondworld/sdk/BtGamePlatform.java
index 807042a..7f303a4 100644
--- a/SdkProject/channel/hygame/java/com/secondworld/sdk/BtGamePlatform.java
+++ b/SdkProject/channel/hygame/java/com/secondworld/sdk/BtGamePlatform.java
@@ -99,74 +99,17 @@
return new String[] {};
}
- @Override
- public void RegisterEvent(String platform) {
-
- Boolean status = GameActivityProxy.I.activity.getSharedPreferences("file",Context.MODE_PRIVATE)
- .getBoolean("AGREE",false);
- if (status == true){
- Login();
- }
- }
@Override
- public void Login()
+ public void LoginSuccess()
{
- switch (QuickSdkMgr.I.sdkInitState) {
- case FAILED:
- {
- if (GameActivityProxy.I.activity == null)
- return;
- if (QuickSdkMgr.I.hasPermissions(GameActivityProxy.I.activity)) {
- //init(BtGameMain.I.activity);
- Toast.makeText(GameAppProxy.app, "寮傚父璇烽噸鍚父鎴�", Toast.LENGTH_LONG).show();
- }
- break;
- }
- case SUCCEED: {
-
- //User.getInstance().login(GameActivityProxy.I.activity);
- GameActivityProxy.I.activity.runOnUiThread(new Runnable()
- {
- @Override
- public void run()
- {
- User.getInstance().login(GameActivityProxy.I.activity);
- GameReportHelper.onEventRegister("youxitu",true);
- GameActivityProxy.I.activity.getSharedPreferences("file", Context.MODE_PRIVATE).edit()
- .putBoolean("AGREE", true)
- .apply();
- }
- });
- break;
- }
- case UNKNOWN:
- {
- QuickSdkMgr.I.sdkInitState = PlatformSdkMgr.SdkInitState.LOADING;
- break;
- }
- case LOADING: {
- //Toast.makeText(GameAppProxy.app, "璐﹀彿鐧诲綍鎴愬姛鍚庯紝璇峰啀娆＄偣鍑昏繘鍏ユ父鎴�", Toast.LENGTH_LONG).show();
- Boolean status = GameActivityProxy.I.activity.getSharedPreferences("file",Context.MODE_PRIVATE)
- .getBoolean("AGREE",false);
- if (status == false) {
- QuickSdkMgr.I.requestPermissions(GameActivityProxy.I.activity);
- }
- break;
- }
- }
+ LogUtil.i("unity", "LoginSuccess");
+ GameReportHelper.onEventRegister("youxitu",true);
}
+
@Override
public void StartRequestPermission()
{
- //璇绘爣蹇� 浜屾鐧诲綍鍙互鐩存帴鍒濆鍖�
- Boolean status = GameActivityProxy.I.activity.getSharedPreferences("file",Context.MODE_PRIVATE)
- .getBoolean("AGREE",false);
- if (status == true){
- QuickSdkMgr.I.requestPermissions(GameActivityProxy.I.activity);
- }
-
-
//鑾峰彇娓犻亾鍚嶇О context涓哄涓荤殑context
String channel = HumeSDK.getChannel(GameAppProxy.app.getApplicationContext());
if (channel == null || channel.isEmpty())
@@ -181,13 +124,4 @@
AppLog.start();
}
- @Override
- public void OnRequestPermissionsResult(int requestCode, int[] grantResults, String[] permissions)
- {
- LogUtil.i("unitysdk", "OnRequestPermissionsResult " + permissions.length);
- if (Arrays.asList(permissions).contains(Manifest.permission.READ_PHONE_STATE))
- {
- Login();
- }
- }
}
diff --git a/SdkProject/library/src/main/java/com/secondworld/sdk/PlatformDiff.java b/SdkProject/library/src/main/java/com/secondworld/sdk/PlatformDiff.java
index 9dd0996..b6feb06 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/PlatformDiff.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/PlatformDiff.java
@@ -17,18 +17,10 @@
public abstract void OnCreate(Context var0); //鍚姩鎴愬姛鍚庨渶瑕佸鐞嗙殑閫昏緫锛屽涓嶅悓sdk鐨勬眹鎶ユ帴鍙ｄ笉鍚�
- public abstract String[] platformPermission(); //璇锋眰鐨勬潈闄愮被鍨�
+ public abstract String[] platformPermission(); //璇锋眰鐨勬潈闄愮被鍨� 锛屽繀椤诲鐞嗭紒锛侊紒
- public abstract void RegisterEvent(String platform); //娉ㄥ唽鍚庨渶瑕佸鐞嗙殑閫昏緫锛屽涓嶅悓sdk鐨勬眹鎶ユ帴鍙ｄ笉鍚�
+ public abstract void LoginSuccess(); //sdk鐧诲綍鍚庨渶瑕佸鐞嗙殑閫昏緫锛屽涓嶅悓sdk鐨勬眹鎶ユ帴鍙ｄ笉鍚�
- public abstract void Login(); //鐧诲綍鍚庨渶瑕佸鐞嗙殑閫昏緫锛屽涓嶅悓sdk鐧诲綍娴佺▼涓嶅悓
+ public abstract void StartRequestPermission(); //璇锋眰鏉冮檺闇�瑕佸鐞嗙殑閫昏緫锛屽涓嶅悓sdk鐨勬眹鎶ユ帴鍙ｄ笉鍚�
- //璇锋眰鏉冮檺 甯歌quickSDK鐧诲綍娴佺▼ 1.娓告垙鏂瑰脊鍑洪殣绉佹斂绛栫瓑 2.娓告垙鏂硅姹傛潈闄愶紝鎷掔粷鏉冮檺涔熷彲杩涘叆涓嬩竴姝� 3.鍒濆鍖杚uicksdk 4.鐧诲綍
- //鍔犲叆鎶栭煶sdk鍚庯紝鎶栭煶蹇呴』鍦ㄧ敓鍛藉懆鏈熷垵濮嬪寲锛屽湪鏉冮檺璇锋眰鍚庡惎鍔紝鎸夎瀹氭祦绋嬩慨鏀逛负
- // 1.娓告垙鏂瑰脊鍑洪殣绉佹斂绛栫瓑
- // 2.蹇呴』鍦ㄧ敤鎴蜂富鍔ㄤ氦浜掑簲鐢ㄥ満鏅墠鑳借姹傛潈闄� 濡傚湪鐧诲綍鐣岄潰鍑虹幇鐐瑰嚮鐧诲綍鎸夐挳鍚庯紝鍒濆鍖杚uicksdk
- // 3.鐧诲綍
- public abstract void StartRequestPermission(); //璇锋眰鏉冮檺
-
- public abstract void OnRequestPermissionsResult(int requestCode, int[] grantResults, String[] permissions);
}
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 30d3f75..2be32e3 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
@@ -24,7 +24,7 @@
public void run()
{
LogUtil.i("SdkManager", "CmdRequestPermissionStart process");
- //QuickSdkMgr.I.requestPermissions(GameActivityProxy.I.activity);
+ QuickSdkMgr.I.requestPermissions(GameActivityProxy.I.activity);
PlatformDiff.I.StartRequestPermission();
}
});
diff --git a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
index 9cf0355..9531b08 100644
--- a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
+++ b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
@@ -84,7 +84,6 @@
}
public void onRequestPermissionsResult(Activity activity, int requestCode, int[] grantResults, String[] permissions) {
- PlatformDiff.I.OnRequestPermissionsResult(requestCode, grantResults, permissions);
if (requestCode != RequestCode.QUICK) return;
@@ -121,7 +120,7 @@
public void onActivityResult(Activity activity, int requestCode) {
if (requestCode == REQUEST_RECORD_PERMISSION_SETTING)
{
- LogUtil.i("SdkManager", "onActivityResult");
+ LogUtil.i("unity-sdk", "onActivityResult");
requestPermissions(activity);
}
@@ -134,7 +133,34 @@
}
public void login() {
- PlatformDiff.I.Login();
+ switch (sdkInitState) {
+ case FAILED:
+ case UNKNOWN: {
+ if (GameActivityProxy.I.activity == null)
+ return;
+ if (hasPermissions(GameActivityProxy.I.activity)) {
+ //init(BtGameMain.I.activity);
+ Toast.makeText(GameAppProxy.app, "寮傚父璇烽噸鍚父鎴�", Toast.LENGTH_LONG).show();
+ }
+ break;
+ }
+ case SUCCEED: {
+ //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();
+ break;
+ }
+ }
}
public void loginOut() {
@@ -229,7 +255,6 @@
sdkInitState = SdkInitState.SUCCEED;
LogUtil.debug("SdkManager", "鍒濆鍖栨垚鍔�");
UnityMsgHandler.sendMessageToUnity(CodeA2U.PlatformInitOk);
- PlatformDiff.I.RegisterEvent("youxitu");
}
@Override
public void onFailed(String message, String trace) {
@@ -262,6 +287,7 @@
e.printStackTrace();
LogUtil.e("SdkManager 鐧诲綍鎴愬姛", e);
}
+ PlatformDiff.I.LoginSuccess();
verifyRealName();
}
--
Gitblit v1.8.0