From dcfc2f44cba508334f561690663182f71b3d232b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=90=9B=E9=99=B6?= Date: Mon, 18 Sep 2023 09:34:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98=20https://jira.shanqu.cc/b?= =?UTF-8?q?rowse/GHZS-3484?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/module_login/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java b/module_login/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java index d13091e642..5430dfa07e 100644 --- a/module_login/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java +++ b/module_login/src/main/java/com/gh/gamecenter/wxapi/WXEntryActivity.java @@ -90,7 +90,10 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler, WeC break; } } - } else if (baseResp.getType() == ConstantsAPI.COMMAND_SENDAUTH && baseResp instanceof SendAuth.Resp) { + } else if (baseResp.getType() == ConstantsAPI.COMMAND_SENDAUTH + && baseResp instanceof SendAuth.Resp + && ((SendAuth.Resp) baseResp).state.contains("qqminigame") + ) { IQGameProvider iqGameProvider = (IQGameProvider) ARouter.getInstance().build(RouteConsts.provider.qGame).navigation(); if (iqGameProvider != null) { From eab8bc846c06fde0168b26723e87ca4028e8384f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=90=9B=E9=99=B6?= Date: Wed, 20 Sep 2023 11:01:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E5=90=88=E8=A7=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=90=88=E5=B9=B6=20https://jira.shanqu.cc/browse/GHZ?= =?UTF-8?q?S-3510?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/SplashScreenActivity.kt | 2 -- .../gamecenter/entity/PrivacyPolicyEntity.kt | 19 ++++-------------- .../permission_installed_list.png | Bin 0 -> 949 bytes .../gamecenter/common/constant/Constants.java | 2 +- .../common/utils/PermissionHelper.kt | 2 +- 5 files changed, 6 insertions(+), 19 deletions(-) create mode 100644 app/src/main/res/drawable-xxxhdpi/permission_installed_list.png diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt index dbe987bf6d..06b77dfada 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt @@ -66,8 +66,6 @@ class SplashScreenActivity : BaseActivity() { private var mShouldPrefetchData = true private val mPermissions = arrayOf( - Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE, PermissionHelper.PERMISSION_GET_INSTALLED_LIST ) diff --git a/app/src/main/java/com/gh/gamecenter/entity/PrivacyPolicyEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/PrivacyPolicyEntity.kt index 0b284325f3..c7a6ef196a 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/PrivacyPolicyEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/PrivacyPolicyEntity.kt @@ -19,26 +19,15 @@ class PrivacyPolicyEntity( data.title = "欢迎来到光环助手" data.topContent = "为提供完整的功能与稳定的服务，光环助手将向你申请开启以下权限：" data.bottomContent = - "点击查看权限应用场景，你可以在系统设置中关闭授权，但可能会影响部分功能的正常使用" + "点击查看权限应用场景，你可以在系统设置中关闭授权，但可能会影响部分功能的正常使用" val permissions = arrayListOf() permissions.add( PermissionsEntity( - icon = "res:///" + R.drawable.permission_storage, - name = "存储权限", - intro = "用于下载游戏，以及实现内容缓存提升浏览体验" + icon = "res:///" + R.drawable.permission_installed_list, + name = "已安装应用列表", + intro = "提供检测您所安装游戏的版本更新功能" ) ) -// permissions.add( -// PermissionsEntity( -// icon = "res:///" + R.drawable.permission_phone_state, -// name = "设备信息", -// intro = "为保障您的账号安全及使用软件与服务可安全运行" -// ) -// ) -// permissions.add(PermissionsEntity( -// icon = "res:///" + R.drawable.permission_sdk, -// name = "第三方SDK使用信息提醒", -// intro = "向北京有竹居网络技术有限公司（北京字节跳动科技有限公司）提供您的以下信息：设备品牌、型号、软件系统相关信息、安卓（oaid、无线网SSID名称、WiFi路由器MAC地址、设备MAC地址、IMEI、地理位置），用于广告流量统计相关服务。")) data.permissions = permissions return data } diff --git a/app/src/main/res/drawable-xxxhdpi/permission_installed_list.png b/app/src/main/res/drawable-xxxhdpi/permission_installed_list.png new file mode 100644 index 0000000000000000000000000000000000000000..fec07575ac98e69ebdc4b875fb22e5ac4458e17d GIT binary patch literal 949 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9EO-XP4l)OOlRpde#$ zkh>GZx^prwfgF}}M_)$E)e-c?47?{00T^vIy7~kG9^av@GVgK;{ev97zK@`jcZjoay1Q39bM?SL)FA!k7Bl_m6pfj zbM^1n3oUy7_y7A3|M$h#*>|h|>%08_```Q3d)BjQ%F1s}PrQ&HW{}Wmb3{|J`I1~h z%DRkGnfEfB*gyB@rvKKz;~96a!Q|6|Ta6PxO<38&!_K;4-;exB(`zRPELCZ7^5Dqj z*iiQ*`{UuSYuC@5Ue5ld?`F-_B*sbe9256tER*W3D0kpZ^gI=I()UzD{xRu>tyW)6 zR-avT-<~x4$gt-f(0w!wC_FnM?}73@KaAZu4UhGbiM?OpZv=GKhCwj+bU_k`?kw{#_i{G_J5GxDY@Ny zo!^gi>*51br-KO{a=v_cO}z5hS&G& zJ&5`w$zI&?ZvHNg_BT_yk3Z7=&{vqp7!T8h66Vt}`hcFGuM$ zoVTASS#H>;Tg7mH`o_ic_MT4@-*LX6+-ajLf5NxyA8%3|zQ%jz@yee&Vr_NzkbX#m zyYbCCZEp6b?^f~J$bY&2aL3%Daw*3c4*z=(_Y2gr>!|gM>)Eo#s5<% zu=<`(tA`A)T7m=A@651DG_vJYMFg=Cs{_!)E1Z+T=ESsHJ!HGW>Au8o2kQ!`!4|5e zhk92E-*cH;z)*TfbA@o8&s>9<^V%k9GC(w=MH(K#J&Y0ycrwFInm^!8II8r({@YTy z Date: Wed, 20 Sep 2023 11:03:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=87=B3=205.30.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 8c000b1bbe..0e7690bfbc 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,8 +7,8 @@ ext { targetSdkVersion = 28 // application info (每个大版本之间的 versionCode 增加 20) - versionCode = 953 - versionName = "5.30.3" + versionCode = 956 + versionName = "5.30.6" applicationId = "com.gh.gamecenter" // AndroidX