From 2ba2ff0b35c7c0cc13ab12f4e962db82f068e5d2 Mon Sep 17 00:00:00 2001 From: Fankesyooni Date: Tue, 22 Mar 2022 02:58:32 +0800 Subject: [PATCH] Merge code --- .../tsbattery/ui/activity/MainActivity.kt | 5 +- app/src/main/res/layout/activity_main.xml | 162 +++++++++--------- 2 files changed, 85 insertions(+), 82 deletions(-) diff --git a/app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt b/app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt index 86b008b..5d475a8 100644 --- a/app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt +++ b/app/src/main/java/com/fankes/tsbattery/ui/activity/MainActivity.kt @@ -60,6 +60,9 @@ class MainActivity : BaseActivity() { "8.2.11(Play)、8.8.17、8.8.23、8.8.35、8.8.38、8.8.50、8.8.55、8.8.68、8.8.80、8.8.83 (8.2.11、8.5.5~8.8.83)" private const val timSupportVersion = "2+、3+ (并未完全测试每个版本)" private const val wechatSupportVersion = "全版本仅支持基础省电，更多功能依然画饼" + + /** 预发布的版本标识 */ + private const val pendingFlag = "[pending]" } override fun onCreate() { @@ -112,7 +115,7 @@ class MainActivity : BaseActivity() { binding.mainTextTimNoinstall.isGone = TIM_PACKAGE_NAME.isInstall binding.mainTextWechatNoinstall.isGone = WECHAT_PACKAGE_NAME.isInstall /** 设置文本 */ - binding.mainTextVersion.text = "模块版本：$moduleVersion" + binding.mainTextVersion.text = "模块版本：$moduleVersion $pendingFlag" binding.mainTextSupportQq.apply { text = qqSupportVersion setOnClickListener { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 77d7443..075bd07 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -306,6 +306,87 @@ tools:ignore="SmallSp" /> + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - -