From 9d10add8eb61ce250af517308b094cbcd782801c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E7=A5=A5=E4=BF=8A?= Date: Mon, 26 Aug 2024 14:07:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8B=E3=80=91=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=20https://jira.shanqu.cc/browse/GHZSCY-6578?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 4 +++- .../gamecenter/setting/view/AboutFragment.kt | 18 ++++++++---------- .../compose/activity/ComposeAboutActivity.kt | 1 + 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 84193153a7..040203ff68 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,6 +72,7 @@ android_build: only: - dev - release + - feat/GHZSCY-6578 # 代码检查 sonarqube_analysis: @@ -156,4 +157,5 @@ oss-upload&send-email: - /usr/local/bin/python /ci-android-mail-jira-comment.py only: - dev - - release \ No newline at end of file + - release + - feat/GHZSCY-6578 \ No newline at end of file diff --git a/module_setting/src/main/java/com/gh/gamecenter/setting/view/AboutFragment.kt b/module_setting/src/main/java/com/gh/gamecenter/setting/view/AboutFragment.kt index 83e6491fac..b9cf892fdd 100644 --- a/module_setting/src/main/java/com/gh/gamecenter/setting/view/AboutFragment.kt +++ b/module_setting/src/main/java/com/gh/gamecenter/setting/view/AboutFragment.kt @@ -62,16 +62,14 @@ class AboutFragment : ToolbarFragment() { ARouter.getInstance().build(RouteConsts.provider.updateManager).navigation() as? IUpdateManagerProvider updateManager?.checkUpdate(requireActivity(), true) // 检查更新 - if (PackageFlavorHelper.IS_TEST_FLAVOR) { - var clickCount = 0 - mBinding.aboutGhIcon.setOnClickListener { - if (clickCount == 5) { - mBinding.aboutGhIcon.setOnClickListener(null) - mBinding.deviceContent.visibility = View.VISIBLE - mBinding.deviceContent.text.toString().copyTextAndToast("复制成功！") - } else { - clickCount++ - } + var clickCount = 0 + mBinding.aboutGhIcon.setOnClickListener { + if (clickCount == 5) { + mBinding.aboutGhIcon.setOnClickListener(null) + mBinding.deviceContent.visibility = View.VISIBLE + mBinding.deviceContent.text.toString().copyTextAndToast("复制成功！") + } else { + clickCount++ } } diff --git a/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeAboutActivity.kt b/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeAboutActivity.kt index 8ace13d79b..efe166a0a5 100644 --- a/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeAboutActivity.kt +++ b/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeAboutActivity.kt @@ -131,6 +131,7 @@ class ComposeAboutActivity : ComposeBaseActivity() { } }, onPress = { + if (deviceContent.isNotEmpty()) return@detectTapGestures if (clickCount == 5) { val sb = StringBuilder() val meta = MetaUtil.getMeta()