打开增加检查网络情况

app/src/main/java/com/sw/dualscreen/activity/InitActivity.kt

@@ -1,16 +1,22 @@
 package com.sw.dualscreen.activity
 
 import android.content.Intent
+import android.os.CountDownTimer
 import androidx.activity.viewModels
 import androidx.lifecycle.lifecycleScope
 import com.sw.dualscreen.GlobalData
 import com.sw.dualscreen.databinding.ActivityInitBinding
+import com.sw.dualscreen.dialog.RemindDialog
+import com.sw.dualscreen.ext.clickWithDebounce
+import com.sw.dualscreen.ext.visible
 import com.sw.dualscreen.model.response.FoodVector
 import com.sw.dualscreen.objbox.Food
 import com.sw.dualscreen.objbox.FoodModule
 import com.sw.dualscreen.objbox.ObjectBox
+import com.sw.dualscreen.utils.L
 import com.sw.dualscreen.viewmodel.BaseViewModel
 import com.sw.dualscreen.viewmodel.UserViewModel
+import com.sw.plate.utils.AppUtil
 import kotlinx.coroutines.launch
 
 class InitActivity : BaseActivity<ActivityInitBinding>() {
@@ -37,7 +43,11 @@ class InitActivity : BaseActivity<ActivityInitBinding>() {
                 "version" to GlobalData.foodModelVersion
             )
         ) { items ->
-            val list = items ?: emptyList()
+            if (items == null) {
+                getVectorErrorDialog()
+                return@getCollectedFoodVector
+            }
+            val list = items
             if (pageNum == 1 && list.isEmpty()) {
                 block()
                 return@getCollectedFoodVector
@@ -75,20 +85,13 @@ class InitActivity : BaseActivity<ActivityInitBinding>() {
 
     override fun initialize() {
         super.initialize()
-        showWaitingDialog("加载中……")
-        lifecycleScope.launch {
-            FoodModule.init(this@InitActivity) {
-                getCollectedFoodVector {
-                    runOnUiThread {
-                        hideWaitingDialog()
-                        binding.root.postDelayed({
-                            goMainActivity()
-                        }, 1000)
-                    }
-                }
-            }
+        initNetworkTimer()
+        binding.okButton.clickWithDebounce(500) {
+            checkNetworkTimer?.cancel()
+            checkNetworkTimer?.start()
         }
-
+        showWaitingDialog("网络连接中...")
+        checkNetworkTimer?.start()
 
 //        val isSuccess = viewModel.checkEquipmentInfo()
 //        if (isSuccess) {
@@ -116,9 +119,69 @@ class InitActivity : BaseActivity<ActivityInitBinding>() {
 //        }
     }
 
+    private fun getCollectedFoodVector() {
+        showWaitingDialog2("加载中……")
+        lifecycleScope.launch {
+            FoodModule.init(this@InitActivity) {
+                getCollectedFoodVector {
+                    runOnUiThread {
+                        hideWaitingDialog()
+                        binding.root.postDelayed({
+                            goMainActivity()
+                        }, 1000)
+                    }
+                }
+            }
+        }
+    }
+
     private fun goMainActivity() {
         val intent = Intent(this, MainActivity::class.java)
         startActivity(intent)
         finish()
     }
+
+    private var checkNetworkTimer: CountDownTimer? = null
+
+    private fun initNetworkTimer() {
+        checkNetworkTimer = object : CountDownTimer(5 * 300, 300) {
+            override fun onTick(millisUntilFinished: Long) {
+
+            }
+
+            override fun onFinish() {
+                L.e("检测网络连接状态" + AppUtil.isNetworkConnected(this@InitActivity))
+                if (!AppUtil.isNetworkConnected(this@InitActivity)) {
+                    hideWaitingDialog()
+                    binding.okButton.visible()
+                    loadNetworkErrorDialog()
+                    return
+                }
+                getCollectedFoodVector()
+            }
+        }
+    }
+
+    private fun loadNetworkErrorDialog() {
+        RemindDialog(
+            context = context,
+            content = "网络连接异常，请检查WiFi连接状态后重试",
+            confirmBlock = {
+                startActivity(Intent("android.settings.WIFI_SETTINGS"))
+            }).show()
+    }
+
+    private fun getVectorErrorDialog() {
+        RemindDialog(
+            context = context,
+            content = "未查询到向量数据，请稍后重试？",
+            confirmBlock = {
+                getCollectedFoodVector()
+            }).show()
+    }
+
+    override fun onDestroy() {
+        checkNetworkTimer?.cancel()
+        super.onDestroy()
+    }
 }

app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt

@@ -916,8 +916,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
     //    private val initialDelay = 5 * 60 * 1000L
 //    private val dealyMillis = 10 * 60 * 1000L
     private val initialDelay = 30 * 1000L
-    private val dealyMillis = 60 * 1000L
-    private var taskPageNo = 1
+    private val dealyMillis = 3 * 60 * 1000L
+//    private var taskPageNo = 1
     fun startFaceTask() {
         faceTaskJob =
             intervalExecutor.startIntervalTaskWithInitialDelay(initialDelay, dealyMillis) {
@@ -926,10 +926,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                     return@startIntervalTaskWithInitialDelay
                 }
                 viewModel.getFaceIncrementList(
-                    pageNo = taskPageNo,
+//                    pageNo = taskPageNo,
                     timestamp = timestamp,
                     onAllQueryFinished = {
-                        taskPageNo = 1
+//                        taskPageNo = 1
                     },
                     onPageQueryFinished = { list ->
                         runOnUiThread {