From ce2ac0ad7882cd88724410e79f4604c2e4769060 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 28 九月 2023 01:09:55 +0800
Subject: [PATCH] 0312 游戏兔+抖音的请求权限后登录
---
Channel/Android/hygame/debug/libs/library-debug-hygame.aar | 0
SdkProject/channel/hygame/java/com/secondworld/sdk/BtGamePlatform.java | 27 ++++++++++++++++++++++-----
SdkProject/library/src/main/java/com/secondworld/sdk/PlatformDiff.java | 2 ++
SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java | 5 +++--
Channel/Android/hygame/release/libs/library-release-hygame.aar | 0
SdkProject/channel/hygame/java/com/secondworld/sdk/BtGameMain.java | 3 ++-
6 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/Channel/Android/hygame/debug/libs/library-debug-hygame.aar b/Channel/Android/hygame/debug/libs/library-debug-hygame.aar
index 1776976..4eed146 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 803ceb7..b15a013 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/BtGameMain.java b/SdkProject/channel/hygame/java/com/secondworld/sdk/BtGameMain.java
index 8b5816b..e5eef44 100644
--- a/SdkProject/channel/hygame/java/com/secondworld/sdk/BtGameMain.java
+++ b/SdkProject/channel/hygame/java/com/secondworld/sdk/BtGameMain.java
@@ -76,7 +76,8 @@
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
- QuickSdkMgr.I.onRequestPermissionsResult(activity, requestCode, grantResults);
+
+ QuickSdkMgr.I.onRequestPermissionsResult(activity, requestCode, grantResults, permissions);
}
@Override
diff --git a/SdkProject/channel/hygame/java/com/secondworld/sdk/BtGamePlatform.java b/SdkProject/channel/hygame/java/com/secondworld/sdk/BtGamePlatform.java
index 77f36d3..807042a 100644
--- a/SdkProject/channel/hygame/java/com/secondworld/sdk/BtGamePlatform.java
+++ b/SdkProject/channel/hygame/java/com/secondworld/sdk/BtGamePlatform.java
@@ -15,6 +15,8 @@
import org.json.JSONException;
import org.json.JSONObject;
+import java.util.Arrays;
+
public class BtGamePlatform extends PlatformDiff {
@Override
@@ -99,12 +101,12 @@
@Override
public void RegisterEvent(String platform) {
- GameReportHelper.onEventRegister(platform,true);
- Login();
- GameActivityProxy.I.activity.getSharedPreferences("file", Context.MODE_PRIVATE).edit()
- .putBoolean("AGREE", true)
- .apply();
+ Boolean status = GameActivityProxy.I.activity.getSharedPreferences("file",Context.MODE_PRIVATE)
+ .getBoolean("AGREE",false);
+ if (status == true){
+ Login();
+ }
}
@Override
@@ -122,6 +124,7 @@
break;
}
case SUCCEED: {
+
//User.getInstance().login(GameActivityProxy.I.activity);
GameActivityProxy.I.activity.runOnUiThread(new Runnable()
{
@@ -129,6 +132,10 @@
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;
@@ -173,4 +180,14 @@
AppLog.getInitConfig().setChannel(channel);
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 d80b3c3..9dd0996 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/PlatformDiff.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/PlatformDiff.java
@@ -29,4 +29,6 @@
// 2.蹇呴』鍦ㄧ敤鎴蜂富鍔ㄤ氦浜掑簲鐢ㄥ満鏅墠鑳借姹傛潈闄� 濡傚湪鐧诲綍鐣岄潰鍑虹幇鐐瑰嚮鐧诲綍鎸夐挳鍚庯紝鍒濆鍖杚uicksdk
// 3.鐧诲綍
public abstract void StartRequestPermission(); //璇锋眰鏉冮檺
+
+ public abstract void OnRequestPermissionsResult(int requestCode, int[] grantResults, String[] permissions);
}
diff --git a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
index 4b46510..9cf0355 100644
--- a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
+++ b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
@@ -83,10 +83,11 @@
}
}
- public void onRequestPermissionsResult(Activity activity, int requestCode, int[] grantResults) {
+ public void onRequestPermissionsResult(Activity activity, int requestCode, int[] grantResults, String[] permissions) {
+ PlatformDiff.I.OnRequestPermissionsResult(requestCode, grantResults, permissions);
if (requestCode != RequestCode.QUICK) return;
- //1768娓犻亾涓�瀹氶渶瑕佹潈闄�
+
if (hasPermissions(activity)) {
LogUtil.i("SdkManager", "onRequestPermissionsResult 鐢宠鎴愬姛");
//鐢宠鎴愬姛
--
Gitblit v1.8.0