From ab4b244d1165620c725d6a1c005a4a9c91c7c758 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Tue, 4 Jul 2023 14:11:57 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yinuo/safetywatcher/watcher/App.kt   | 10 +++++++---
 .../yinuo/safetywatcher/watcher/constant/IpConfig.kt   | 10 ++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/com/yinuo/safetywatcher/watcher/constant/IpConfig.kt

diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt
index 1a52f64..05fa2fe 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt
@@ -6,6 +6,10 @@ import com.yinuo.safetywatcher.TestUtils
 import com.common.commonlib.db.DBUtils
 import com.common.commonlib.db.dao.WarningDao
 import com.common.commonlib.db.entity.Warning
+import com.yinuo.safetywatcher.watcher.constant.CAMERA_DNS
+import com.yinuo.safetywatcher.watcher.constant.CAMERA_GATEWAY
+import com.yinuo.safetywatcher.watcher.constant.CAMERA_IP
+import com.yinuo.safetywatcher.watcher.constant.CAMERA_NETMASK
 import com.yinuo.safetywatcher.watcher.utils.LztekUtil
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
@@ -25,7 +29,7 @@ class App : CommonApplication() {
 
     private fun ipConfig() {
         LztekUtil.getLztek()
-            ?.setEthIpAddress("192.168.5.21", "255.255.255.0", "192.168.5.1", "8.8.8.8")
+            ?.setEthIpAddress(CAMERA_IP, CAMERA_NETMASK, CAMERA_GATEWAY, CAMERA_DNS)
     }
 
     private fun tryFixDbData() {
@@ -36,7 +40,7 @@ class App : CommonApplication() {
                 val warningList = warningDao.queryWarningsNoEndTime()
                 warningList?.apply {
                     forEach { warning ->
-                        warning.endTime = tryAssignment(warningDao, warning)
+                        warning.endTime = trySetEndTime(warningDao, warning)
                     }
                     warningDao.updateAll(warningList)
                 }
@@ -65,7 +69,7 @@ class App : CommonApplication() {
         }
     }
 
-    private suspend fun tryAssignment(warningDao: WarningDao, warning: Warning): Long {
+    private suspend fun trySetEndTime(warningDao: WarningDao, warning: Warning): Long {
         val latest = warningDao.findLatestByName(warning.gasName)
         return if (latest?.endTime!! > 0L) latest.endTime else System.currentTimeMillis()
     }
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/constant/IpConfig.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/constant/IpConfig.kt
new file mode 100644
index 0000000..a84f144
--- /dev/null
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/constant/IpConfig.kt
@@ -0,0 +1,10 @@
+package com.yinuo.safetywatcher.watcher.constant
+
+// 摄像头Ip
+const val CAMERA_IP = "192.168.5.21"
+// 摄像头子网掩码
+const val CAMERA_NETMASK = "255.255.255.0"
+// 摄像头网关
+const val CAMERA_GATEWAY = "192.168.5.1"
+// 摄像头DNS服务器
+const val CAMERA_DNS = "8.8.8.8"
\ No newline at end of file