From 428852a07e4c9de3c62caea96bb53d5cd0b8ab82 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Mon, 13 Apr 2026 18:17:17 +0800
Subject: [PATCH] =?UTF-8?q?refactor(activity):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=A1=B5=E7=BD=91=E7=BB=9C=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E6=9C=89=E7=BD=91=E7=BB=9C=E6=97=B6?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=B7=B3=E8=BD=AC=E5=B9=B6=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/shuwei/dish/match/ui/InitActivity.kt  | 28 +++++++++----------
 app/src/main/res/layout/activity_init.xml     |  3 +-
 2 files changed, 16 insertions(+), 15 deletions(-)

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 28a1b8e..364adae 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
@@ -2,7 +2,6 @@ package com.shuwei.dish.match.ui
 
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.util.Log
 import android.graphics.Color
 import android.os.Bundle
 import android.os.SystemClock
@@ -24,7 +23,9 @@ import com.shuwei.dish.match.utils.NetworkUtils
 import com.shuwei.dish.match.utils.SpTool
 import com.shuwei.dish.match.utils.Weigher2
 import com.shuwei.dish.match.utils.WeightUtil
+import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.startActivity
+import com.shuwei.dish.match.utils.ext.visible
 import com.shuwei.dish.match.viewmodel.AppViewModel
 import com.shuwei.dish.match.viewmodel.factory.AppFactory
 import kotlinx.coroutines.delay
@@ -64,9 +65,6 @@ class InitActivity : BaseActivity() {
         WeightUtil.startContinuousRead()
 
         initViews()
-        val dpi = resources.displayMetrics.density
-        val metrics = resources.displayMetrics.toString()
-        Log.d(TAG, "dpi=$dpi, $metrics")
     }
 
     private fun initViewModel() {
@@ -75,9 +73,9 @@ class InitActivity : BaseActivity() {
         appViewModel = ViewModelProvider(this, factory)[AppViewModel::class.java]
     }
 
-    private fun startNextPage() {
+    private fun startNextPage(withDelay: Boolean = false) {
         lifecycleScope.launch {
-            delay(2000)
+            if (withDelay) delay(2000)
             // 子设备：直接进入小屏专属页面，不走原有大屏业务流程
             if (GlobalData.deviceRole == DeviceRole.SLAVE) {
                 startActivity<SlaveActivity>()
@@ -136,9 +134,6 @@ class InitActivity : BaseActivity() {
         binding.btnConnectNetwork.setOnClickListener {
             openNetworkSettings()
         }
-
-        // 启动加载动画 - 持续旋转
-        startLoadingAnimation()
     }
 
     /**
@@ -160,9 +155,12 @@ class InitActivity : BaseActivity() {
     override fun onResume() {
         super.onResume()
         if (NetworkUtils.isNetworkConnected(this)) {
-            startNextPage()
+            // 有网络时隐藏网络检测区域，直接跳转
+            binding.llNetwork.gone()
+            startNextPage(withDelay = false)
             return
         }
+        binding.llNetwork.visible()
         startCountdown()
     }
 
@@ -179,9 +177,11 @@ class InitActivity : BaseActivity() {
         startTime = SystemClock.elapsedRealtime()
         lastNetworkCheckTime = 0
 //        binding.llNetwork.setBackgroundColor(Color.TRANSPARENT)
-        binding.llLoading.visibility = android.view.View.VISIBLE
-        binding.llNetworkButton.visibility = android.view.View.GONE
+        binding.llLoading.visible()
+        binding.llNetworkButton.gone()
         binding.tvCountdown.text = "60秒"
+        // 无网络时才启动加载动画
+        startLoadingAnimation()
         scheduleCountdown()
     }
 
@@ -234,8 +234,8 @@ class InitActivity : BaseActivity() {
      */
     private fun showNetworkButton() {
 //        binding.llNetwork.setBackgroundColor("#5C77F7".toColorInt())
-        binding.llLoading.visibility = android.view.View.GONE
-        binding.llNetworkButton.visibility = android.view.View.VISIBLE
+        binding.llLoading.gone()
+        binding.llNetworkButton.visible()
     }
 
     /**
diff --git a/app/src/main/res/layout/activity_init.xml b/app/src/main/res/layout/activity_init.xml
index 3d5cff3..cbd06cd 100644
--- a/app/src/main/res/layout/activity_init.xml
+++ b/app/src/main/res/layout/activity_init.xml
@@ -59,7 +59,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:gravity="center">
+        android:gravity="center"
+        android:visibility="gone">
 
         <!-- Loading 动画容器 -->
         <LinearLayout