From 392f8bd6ae98ae0a5f3d42b3c92afba40edc702e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 25 七月 2022 11:01:53 +0800
Subject: [PATCH] 0312 测试权限
---
SdkProject/channel/x7bt5/AndroidManifest.xml | 5 +++--
SdkProject/plugins/x7sm/java/com/secondworld/sdk/SplashActivity.java | 1 +
Channel/Android/x7bt5/debug/libs/library-debug-x7bt5.aar | 0
Channel/Android/x7bt5/release/libs/library-release-x7bt5.aar | 0
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Channel/Android/x7bt5/debug/libs/library-debug-x7bt5.aar b/Channel/Android/x7bt5/debug/libs/library-debug-x7bt5.aar
index ff0b778..5b0f7c3 100644
--- a/Channel/Android/x7bt5/debug/libs/library-debug-x7bt5.aar
+++ b/Channel/Android/x7bt5/debug/libs/library-debug-x7bt5.aar
Binary files differ
diff --git a/Channel/Android/x7bt5/release/libs/library-release-x7bt5.aar b/Channel/Android/x7bt5/release/libs/library-release-x7bt5.aar
index cf5c2d5..c9eb607 100644
--- a/Channel/Android/x7bt5/release/libs/library-release-x7bt5.aar
+++ b/Channel/Android/x7bt5/release/libs/library-release-x7bt5.aar
Binary files differ
diff --git a/SdkProject/channel/x7bt5/AndroidManifest.xml b/SdkProject/channel/x7bt5/AndroidManifest.xml
index fa653ae..e780ed5 100644
--- a/SdkProject/channel/x7bt5/AndroidManifest.xml
+++ b/SdkProject/channel/x7bt5/AndroidManifest.xml
@@ -7,9 +7,10 @@
<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" tools:node="replace"/>
+ <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="merge"/>
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
- <uses-permission android:name="android.permission.RECORD_AUDIO" tools:node="replace"/>
+ <uses-permission android:name="android.permission.RECORD_AUDIO" tools:node="merge"/>
+ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<application
android:name=".BtGameApp"
diff --git a/SdkProject/plugins/x7sm/java/com/secondworld/sdk/SplashActivity.java b/SdkProject/plugins/x7sm/java/com/secondworld/sdk/SplashActivity.java
index cbe5789..22370e4 100644
--- a/SdkProject/plugins/x7sm/java/com/secondworld/sdk/SplashActivity.java
+++ b/SdkProject/plugins/x7sm/java/com/secondworld/sdk/SplashActivity.java
@@ -11,6 +11,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ setContentView(R.layout.x7_act_splash);
//淇鍒囨崲鍒板悗鍙板悗鐐瑰嚮鍥炬爣閲嶆柊鍚姩鐨勯棶棰�
if ((getIntent().getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) {
finish();
--
Gitblit v1.8.0