From 056de02aa07079b11bc9d82696a9f5d943e90f18 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 16 五月 2023 15:52:16 +0800
Subject: [PATCH] 0312 qkbt10game 母包三 需要存储权限和电话权限
---
Channel/Android/qkbt10game/release/libs/library-release-qkbt10game.aar | 0
Channel/Android/qkbt10game/debug/libs/library-debug-qkbt10game.aar | 0
SdkProject/channel/qkbt10game/AndroidManifest.xml | 1 +
SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java | 32 ++++++++------------------------
4 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/Channel/Android/qkbt10game/debug/libs/library-debug-qkbt10game.aar b/Channel/Android/qkbt10game/debug/libs/library-debug-qkbt10game.aar
index 4eb04d5..fb5e24f 100644
--- a/Channel/Android/qkbt10game/debug/libs/library-debug-qkbt10game.aar
+++ b/Channel/Android/qkbt10game/debug/libs/library-debug-qkbt10game.aar
Binary files differ
diff --git a/Channel/Android/qkbt10game/release/libs/library-release-qkbt10game.aar b/Channel/Android/qkbt10game/release/libs/library-release-qkbt10game.aar
index 9599e85..ca3d1c5 100644
--- a/Channel/Android/qkbt10game/release/libs/library-release-qkbt10game.aar
+++ b/Channel/Android/qkbt10game/release/libs/library-release-qkbt10game.aar
Binary files differ
diff --git a/SdkProject/channel/qkbt10game/AndroidManifest.xml b/SdkProject/channel/qkbt10game/AndroidManifest.xml
index 0e65b82..a657cef 100644
--- a/SdkProject/channel/qkbt10game/AndroidManifest.xml
+++ b/SdkProject/channel/qkbt10game/AndroidManifest.xml
@@ -7,6 +7,7 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
diff --git a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
index 4e92c13..11ffcc3 100644
--- a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
+++ b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
@@ -48,37 +48,21 @@
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;
+// 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 {
if (!hasPermissions(activity)) {
ActivityCompat.requestPermissions(activity, new String[]{
- Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
+ Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
}
else
{
--
Gitblit v1.8.0