From 00980847b937bac042929a8f8eeb44a741b45b29 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Fri, 1 Mar 2024 17:58:34 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E7=BD=91=E7=BB=9C=E6=80=BB=E6=98=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=AD=E5=BC=80=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safetywatcher/watcher/net/DevicesApi.kt   | 20 ++++++++++++-------
 .../watcher/services/HeartbeatService.kt      |  2 +-
 .../safetywatcher/watcher/utils/SimHelper.kt  |  8 ++++++++
 .../safetywatcher/watcher/utils/WifiHelper.kt |  2 ++
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/net/DevicesApi.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/net/DevicesApi.kt
index d1409ae..a591dd9 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/net/DevicesApi.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/net/DevicesApi.kt
@@ -24,15 +24,21 @@ import retrofit2.http.Query
 class DevicesApi : BaseObserve<DevicesApi.Api>(Api::class.java) {
 
     fun heartBeat(sn: String) {
-        if (SimHelper.isNetOk()) {
-            observe(api.heartBeat(sn), object : RequestNoResultCallBack<BaseResponse>() {
-                override fun onError(error: String?) {
-                }
+        observe(api.heartBeat(sn), object : RequestNoResultCallBack<BaseResponse>() {
+            override fun onResult(result: BaseResponse) {
+                super.onResult(result)
+                SimHelper.setNetStatus(true)
+            }
 
-                override fun onComplete() {
+            override fun onError(error: String?) {
+                if (error?.contains("网络") == true) {
+                    SimHelper.setNetStatus(false)
                 }
-            })
-        }
+            }
+
+            override fun onComplete() {
+            }
+        })
     }
 
     fun getPushUrl(sn: String, callBack: RequestResultCallBack<GetRtspUrlResponse>) {
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/services/HeartbeatService.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/services/HeartbeatService.kt
index 1e8f420..b4cbe5e 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/services/HeartbeatService.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/services/HeartbeatService.kt
@@ -45,7 +45,7 @@ class HeartbeatService : IntentService("HeartbeatService") {
     private fun handleActionStart(intent: Intent) {
         while (true) {
             heartConter++
-            SimHelper.setNetStatus(isOnline())
+//            SimHelper.setNetStatus(isOnline())
             // 心跳
             devicesApi.heartBeat(LztekUtil.getSn())
             // 获取推流地址
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SimHelper.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SimHelper.kt
index f561506..eb33aa1 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SimHelper.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SimHelper.kt
@@ -181,4 +181,12 @@ object SimHelper {
         lastTxBytes = totalTxBytes
         return ret
     }
+
+    fun onWifiSwitch(open: Boolean) {
+        if (!open){
+            setNetStatus(false)
+        }else{
+            // TODO
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/WifiHelper.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/WifiHelper.kt
index b4bcd5d..aa3b9a0 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/WifiHelper.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/WifiHelper.kt
@@ -25,6 +25,7 @@ object WifiHelper {
                 callbacks.forEach {
                     it.onEnable(mWifiState == WifiManager.WIFI_STATE_ENABLED)
                 }
+                SimHelper.onWifiSwitch(mWifiState == WifiManager.WIFI_STATE_ENABLED)
             } else if (intent?.action.equals(WifiManager.RSSI_CHANGED_ACTION)) {
                 val rssi = intent?.getIntExtra(WifiManager.EXTRA_NEW_RSSI, -1)
                 mRssi = WifiManager.calculateSignalLevel(rssi!!, 5)
@@ -45,6 +46,7 @@ object WifiHelper {
                         callbacks.forEach {
                             it.onEnable(mWifiState == WifiManager.WIFI_STATE_ENABLED)
                         }
+                        SimHelper.onWifiSwitch(mWifiState == WifiManager.WIFI_STATE_ENABLED)
                     }
                 }
             }