From d7dc3b3d17f5ae86b315c48b0a33554c54a3294b Mon Sep 17 00:00:00 2001 From: lvmeng <848755140@qq.com> Date: Wed, 17 Sep 2025 15:33:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=A1=B5=E9=9D=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shuwei/dish/match/base/BaseActivity.kt | 17 ++++++ .../com/shuwei/dish/match/ui/InitActivity.kt | 59 ++++++++++--------- app/src/main/res/drawable/bg_splash.xml | 8 ++- app/src/main/res/layout/activity_base.xml | 2 +- app/src/main/res/layout/activity_init.xml | 7 ++- 5 files changed, 59 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/com/shuwei/dish/match/base/BaseActivity.kt b/app/src/main/java/com/shuwei/dish/match/base/BaseActivity.kt index 4ed47a0..f309081 100644 --- a/app/src/main/java/com/shuwei/dish/match/base/BaseActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/base/BaseActivity.kt @@ -20,10 +20,13 @@ import com.shuwei.dish.match.dialog.Loading import com.shuwei.dish.match.http.HttpUtil import com.shuwei.dish.match.http.UrlConfig import com.shuwei.dish.match.ui.HomeActivity.Companion.TAG +import com.shuwei.dish.match.ui.InitActivity import com.shuwei.dish.match.utils.ActivityManager import com.shuwei.dish.match.utils.ext.gone +import com.shuwei.dish.match.utils.ext.invisible import com.shuwei.dish.match.utils.ext.put import com.shuwei.dish.match.utils.ext.toast +import com.shuwei.dish.match.utils.ext.visible import java.time.LocalDateTime import java.time.ZoneId import java.time.format.DateTimeFormatter @@ -50,6 +53,9 @@ open class BaseActivity : AppCompatActivity() { super.onCreate(savedInstanceState) ActivityManager.addActivity(this) binding = ActivityBaseBinding.inflate(layoutInflater) + if (this !is InitActivity) { + binding.root.setBackgroundColor(ContextCompat.getColor(this, R.color.bg_color)) + } setContentView(binding.root) statusBarDarkFont(enable = false) launcher = @@ -69,6 +75,11 @@ open class BaseActivity : AppCompatActivity() { binding.ivBack.setOnClickListener { finish() } } + private var bgState = true + fun useBackground(enable: Boolean) { + bgState = enable + } + override fun onDestroy() { dismissLoading() super.onDestroy() @@ -103,6 +114,12 @@ open class BaseActivity : AppCompatActivity() { rightIconActon?.invoke(binding.ivRightIcon) } + fun setHeaderBgVisible(show: Boolean) { + binding.ivHeaderBg.let { + if (show) it.visible() else it.invisible() + } + } + public fun setHeaderBackground(isHomePage: Boolean = false) { binding.ivHeaderBg.setImageResource( if (isHomePage) R.drawable.bg_home_page else R.drawable.bg_other_page diff --git a/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt index d0b70fb..f7f7a03 100644 --- a/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/ui/InitActivity.kt @@ -41,38 +41,41 @@ class InitActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) statusBarDarkFont(enable = true) +// useBackground(false) binding = ActivityInitBinding.inflate(layoutInflater) setContentView(binding.root) - setHeaderBackground(isHomePage = true) - // 获取 ANDROID_ID - var androidId = - Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID) - androidId = "39a7abdd06b3c7ab" - BaseApp.deviceId = androidId - SpTool.put(SpTool.DEVICE_ID, androidId) - BaseApp.configUrl = UrlConfig.BASE_URL - BaseApp.canteenId = "0" - // TODO: 以上保存deviceId用于临时使用，后续改为下面注释方式 +// setHeaderBackground(isHomePage = true) + setHeaderBgVisible(false) -// var deviceId = AppUtil.getUDID(this) -// Log.d(TAG, "onCreate: deviceId=$deviceId") -//// deviceId = "39a7abdd06b3c7ab" -//// deviceId = "3ea47dc0-3cf0-3c2f-909c-265a9a65572e" -//// deviceId = "6ce7cd59-b875-38b2-b73d-88a570be3212" -// -// BaseApp.deviceId = deviceId -// -// SpTool.put(SpTool.DEVICE_ID, deviceId) -// val deviceConfigCache = SpTool.getString(SpTool.DEVICE_CONFIG_CACHE) -// val checkResult = checkConfigData(deviceConfigCache) -// if (checkResult.not()) { -// binding.ivQrCode.visible() -// binding.btnInit.visible() -// //进行初始化操作 -// initConfig() -// return -// } +// // 获取 ANDROID_ID +// var androidId = +// Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID) +// androidId = "39a7abdd06b3c7ab" +// BaseApp.deviceId = androidId +// SpTool.put(SpTool.DEVICE_ID, androidId) +// BaseApp.configUrl = UrlConfig.BASE_URL +// BaseApp.canteenId = "0" +// // TODO: 以上保存deviceId用于临时使用，后续改为下面注释方式 + + var deviceId = AppUtil.getUDID(this) + Log.d(TAG, "onCreate: deviceId=$deviceId") +// deviceId = "39a7abdd06b3c7ab" + deviceId = "3ea47dc0-3cf0-3c2f-909c-265a9a65572e" +// deviceId = "6ce7cd59-b875-38b2-b73d-88a570be3212" + + BaseApp.deviceId = deviceId + + SpTool.put(SpTool.DEVICE_ID, deviceId) + val deviceConfigCache = SpTool.getString(SpTool.DEVICE_CONFIG_CACHE) + val checkResult = checkConfigData(deviceConfigCache) + if (checkResult.not()) { + binding.ivQrCode.visible() + binding.btnInit.visible() + //进行初始化操作 + initConfig() + return + } binding.ivQrCode.invisible() binding.btnInit.invisible() diff --git a/app/src/main/res/drawable/bg_splash.xml b/app/src/main/res/drawable/bg_splash.xml index 79907f2..d084a61 100644 --- a/app/src/main/res/drawable/bg_splash.xml +++ b/app/src/main/res/drawable/bg_splash.xml @@ -6,8 +6,12 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml index 9da7115..71ed615 100644 --- a/app/src/main/res/layout/activity_base.xml +++ b/app/src/main/res/layout/activity_base.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/bg_color"> + tools:background="@color/bg_color"> + tools:ignore="ContentDescription" + android:visibility="invisible"/>