From 360231e01fe25a38fa6846fddeb95a945120ea67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com> Date: Thu, 26 Nov 2020 16:08:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV4.5.0-XAPK?= =?UTF-8?q?=20=E6=B8=B8=E6=88=8F=E8=A7=A3=E5=8E=8B=E5=A2=9E=E5=8A=A0=20?= =?UTF-8?q?=E5=BC=95=E5=AF=BC=E8=AE=BE=E7=BD=AE=E2=80=9C=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E6=9D=83=E9=99=90=E2=80=9D=201126=E6=B5=8B=E8=AF=95=20https://?= =?UTF-8?q?gitlab.ghzs.com/pm/halo-app-issues/-/issues/1077?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/dialog/InstallPermissionDialogFragment.kt | 12 ++++++++++-- .../main/res/layout/dialog_install_permission.xml | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt index 0a8b89dc5d..993d33bc2b 100644 --- a/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt @@ -38,16 +38,24 @@ class InstallPermissionDialogFragment : BaseTrackableDialogFragment() { val activateTv = mView.findViewById(R.id.activateTv) val contentTv = mView.findViewById(R.id.contentTv) val switchLottie = mView.findViewById(R.id.switchLottie) - contentTv.text = if (isXapk) "以保证游戏的正常解压" else "以保证游戏的安装和更新" + contentTv.text = if (isXapk) "未授权下解压XAPK可能导致解压失败" else "以保证游戏的安装和更新" switchLottie.setAnimation("lottie/install_permission_switch.json") switchLottie.playAnimation() - val randomNumber = Random.nextInt(2) + val randomNumber = if (isXapk) 1 else Random.nextInt(2) closeTv.goneIf(randomNumber == 0) closeIv.goneIf(randomNumber != 0) + if (isXapk) { + closeTv.text = "暂不，尝试解压" + closeIv.visibility = View.VISIBLE + } + closeTv.setOnClickListener { MtaHelper.onEvent(getEvent(), getKey(), "文案样式_点击以后再说") + if (isXapk) { + mCallBack?.invoke() + } dismiss() } closeIv.setOnClickListener { diff --git a/app/src/main/res/layout/dialog_install_permission.xml b/app/src/main/res/layout/dialog_install_permission.xml index 5b29ec0562..4ff6b2fc2a 100644 --- a/app/src/main/res/layout/dialog_install_permission.xml +++ b/app/src/main/res/layout/dialog_install_permission.xml @@ -87,7 +87,8 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/activateTv" /> + app:layout_constraintTop_toBottomOf="@+id/activateTv" + tools:visibility="visible"/>