From: d15521469561 <d155214695615@qq.com>
Date: Tue, 16 May 2023 06:49:29 +0000 (+0800)
Subject: 提交补充报错
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=588a99a2ec5ddf3abd49bd6d63b1a87d327e9128;p=mirrors%2FASR1603_G5.git

提交补充报错
---

diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
index 91915a34..4ae047a6 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
@@ -758,15 +758,13 @@ class DeviceInfoManager(Abstract):
             self.sms_full_flag=0
             if msg_nums >= 50:
                 EventMesh.publish("load_screen", {"screen": "message_full"})
-        
 
-        if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1 and battery[1] != 1:
+        get_temp_time  = EventMesh.publish("get_temp_time")
+        get_temp_state  = EventMesh.publish("get_temp_state")
 
-            get_temp_time  = EventMesh.publish("get_temp_time")
-            get_temp_state  = EventMesh.publish("get_temp_state")
+        if EventMesh.publish(constants.EVENT.GET_CONNECT) == 1 and battery[1] != 1:
             # print("get_temp_time:{} self.temp_one_state:{}".format(get_temp_time,self.temp_one_state))
             if get_temp_time != None:#定时测量体温
-                
                 if get_temp_time > 0:
                     if get_temp_state != None:
                         if get_temp_state == 0 or get_temp_state == 2 or get_temp_state == 3 :
@@ -855,7 +853,6 @@ class DeviceInfoManager(Abstract):
                             EventMesh.publish("set_temp_state",0)
                             EventMesh.publish(constants.PROTOCOL.TEMP_SEND,[tmp_f_tmp,tmp_d_tmp])
 
-
             if hr_time != None:
                 # print("hr......01....{}\r\n".format(hr_time))
                 if hr_time > 0:
@@ -1116,18 +1113,20 @@ class DeviceInfoManager(Abstract):
                 elif self.get_spo2_state != 0:
                     EventMesh.publish("set_spo2_state",0)#2代表后台进入测试
                     EventMesh.publish(constants.EVENT.STOP_BLOOD_OXYGEN)
-            if get_temp_state != 0:
-                self.temp_one_state = 0
-                self.temp_state = 0
-                temp = EventMesh.publish(constants.EVENT.GET_TEMP)              
-                tmp_f = str(temp).split('.')[0] 
-                tmp_f_tmp = int(tmp_f)
-
-                tmp_d = str(temp).split('.')[1][:1]
-                tmp_d_tmp = int(tmp_d)
-                EventMesh.publish("set_temp_state",0)
-                EventMesh.publish(constants.PROTOCOL.TEMP_SEND,[tmp_f_tmp,tmp_d_tmp])
-                EventMesh.publish(constants.EVENT.STOP_TEMP)
+            
+            if get_temp_time != None:
+                if get_temp_state != 0:
+                    self.temp_one_state = 0
+                    self.temp_state = 0
+                    temp = EventMesh.publish(constants.EVENT.GET_TEMP)              
+                    tmp_f = str(temp).split('.')[0] 
+                    tmp_f_tmp = int(tmp_f)
+
+                    tmp_d = str(temp).split('.')[1][:1]
+                    tmp_d_tmp = int(tmp_d)
+                    EventMesh.publish("set_temp_state",0)
+                    EventMesh.publish(constants.PROTOCOL.TEMP_SEND,[tmp_f_tmp,tmp_d_tmp])
+                    EventMesh.publish(constants.EVENT.STOP_TEMP)
             self.SENSOR_time = time_tmp
             self.HR_Onestate = 0
             self.HR_OneTime = 0
diff --git a/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip b/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip
index 0101a61a..6ea890b9 100644
Binary files a/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip and b/2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip differ