优化

diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
index 6571d11..6632c43 100644 (file)
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
@@ -763,11 +763,12 @@ class intervManager(Abstract):
             if msg != None:
                 EventMesh.publish("close_timer_all")#
                 if msg > 0:
-                    str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_HSENSOR_RESULT_OK"))
-                    EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
+                    # str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_HSENSOR_RESULT_OK"))
+                    # EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
                     EventMesh.publish("set_hr_blood_led",2)#测量成功
                     self.temp_value = msg
-                    self.timer.start(2*1000,1,self.play_temp_fun)
+                    # self.timer.start(2*1000,1,self.play_temp_fun)
+                    self.play_temp_fun(0)
                 else:
                     str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_HSENSOR_RESULT_FAILE"))
                     EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
@@ -822,12 +823,12 @@ class intervManager(Abstract):
             if msg != None:
                 EventMesh.publish("close_timer_all")#
                 if msg >= 50:
-                    str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_HSENSOR_RESULT_OK"))
-                    EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
+                    # str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_HSENSOR_RESULT_OK"))
+                    # EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
                     self.hr_value = msg
                     EventMesh.publish("set_hr_blood_led",2)#测量成功
-                    self.timer.start(2*1000,1,self.play_hr_fun)
-                    
+                    # self.timer.start(2*1000,1,self.play_hr_fun)
+                    self.play_hr_fun(0)
                     
                 else:
                     str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_HSENSOR_RESULT_FAILE"))
@@ -840,11 +841,12 @@ class intervManager(Abstract):
             if msg != None:
                 EventMesh.publish("close_timer_all")#
                 if msg >= 85:
-                    str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_HSENSOR_RESULT_OK"))
-                    EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
+                    # str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_HSENSOR_RESULT_OK"))
+                    # EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
                     EventMesh.publish("set_hr_blood_led",2)#测量成功
                     self.spo2_value = msg
-                    self.timer.start(2*1000,1,self.play_spo2_fun)
+                    # self.timer.start(2*1000,1,self.play_spo2_fun)
+                    self.play_spo2_fun(0)
                 else:
                     str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_HSENSOR_RESULT_FAILE"))
                     EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件('U:/static/audio.bin',1,1,str_data)

diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/led.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/led.py
index 829658b..87ea70c 100644 (file)
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/led.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/led.py
@@ -180,7 +180,7 @@ class ledEventManager(Abstract):#灯事件
         print("set_hr_blood_led :{}".format(msg))
         if msg != None:
             if msg == 1:
-                EventMesh.publish("set_led_time_arg",[1,2,10*70,led_mode.FLASH_LIGHT_RED_GREEN,10,5,led_mode.HEALTH_LED_MODE])#測量成功
+                EventMesh.publish("set_led_time_arg",[1,2,10*70*2,led_mode.FLASH_LIGHT_RED_GREEN,10,5,led_mode.HEALTH_LED_MODE])#測量成功
                 # EventMesh.publish("set_led_time_arg",[1000,200,300,led_mode.FLASH_LIGHT_RED_GREEN,led_mode.DEFAULT_LONG_LIGHT_MODE,led_mode.HEALTH_LED_MODE])#開始測量
             elif msg == 2:
                 EventMesh.publish("set_led_time_arg",[1,1,300,led_mode.FLASH_LIGHT_GREEN,31,10*3,led_mode.OTHER_MEASURE_MODE])#測量成功
@@ -263,7 +263,8 @@ class ledEventManager(Abstract):#灯事件
                 get_spo2_state = EventMesh.publish("get_spo2_state")
                 
                 wechat_state = EventMesh.publish("get_wechat_state")
-                print("get_hr_state",get_hr_state,get_spo2_state,wechat_state,self.working_led_mode)
+                temp_state = EventMesh.publish("get_spo2_state")
+                print("get_hr_state",get_hr_state,get_spo2_state,temp_state,wechat_state,self.working_led_mode)
                 if wechat_state != None: #获取微聊状态
                     if wechat_state == 1:
                         if self.working_led_mode != led_mode.WECHAT_LED_MODE:#如果不在亮微聊模式需要亮微聊模式
@@ -278,10 +279,10 @@ class ledEventManager(Abstract):#灯事件
                             
                     else:
                         self.wechat_btn = 0
-                        if get_hr_state != 0 or get_spo2_state != 0 :#心率血氧优先级高
+                        if get_hr_state != 0 or get_spo2_state != 0 or temp_state != 0 :#心率血氧优先级高
                             if self.working_led_mode != led_mode.HEALTH_LED_MODE:#如果不在亮微聊模式需要亮微聊模式
                                 print("set_hr_blood_led!!!!!!!!!!")
-                                str_buf = [1,2,10*70,led_mode.FLASH_LIGHT_RED_GREEN,10,5,led_mode.HEALTH_LED_MODE]#測量成功
+                                str_buf = [1,2,10*70*2,led_mode.FLASH_LIGHT_RED_GREEN,10,5,led_mode.HEALTH_LED_MODE]#測量成功
                                 self.timer_state = 0
                                 self.timer.stop()
                                 self.open_timer(str_buf)
@@ -290,7 +291,7 @@ class ledEventManager(Abstract):#灯事件
                             else:
                                 print("set_hr_blood_led stop!!!!!!!!!!")
                                 return
-                        if  get_hr_state == 0 and get_spo2_state == 0:
+                        if  get_hr_state == 0 and get_spo2_state == 0 and temp_state == 0:
                             self.working_led_mode = led_mode.OTHER_MEASURE_MODE
                 
         self.open_timer(msg)
@@ -473,9 +474,10 @@ class ledEventManager(Abstract):#灯事件
                 get_spo2_state = EventMesh.publish("get_spo2_state")
                 
                 wechat_state = EventMesh.publish("get_wechat_state")
+                temp_state = EventMesh.publish("get_spo2_state")
                 print("get_hr_state",get_hr_state,get_spo2_state,wechat_state,self.working_led_mode)
                 if wechat_state != None: #获取微聊状态
-                    if wechat_state == 1 or get_spo2_state != 0 or get_hr_state != 0:
+                    if wechat_state == 1 or get_spo2_state != 0 or get_hr_state != 0 or temp_state != 0:
                         return
         self.timer_state = 0
         self.timer.stop()

diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py
index f22eb33..60a8de5 100644 (file)
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py
@@ -954,17 +954,11 @@ class DeviceInfoManager(Abstract):
         ble=EventMesh.publish(constants.EVENT.GET_CONNECT)
         # print("ble",ble)
         if ble == 0:#未联网提示关机
-            usb_state = EventMesh.publish("get_usb_state")#
-            # print("usb_state",usb_state)
-            if usb_state != None:
-                if usb_state == 0 or usb_state == 2:
-                    self.no_smi_count+=10
-                    print("self.no_smi_count",self.no_smi_count)
-                    if self.no_smi_count > (15*60):
-                        self.no_smi_count = 0
-                        EventMesh.publish("open_power_on", 2)#  #未检测到sim卡15分钟后关机
-                else:
-                    self.no_smi_count = 0
+            self.no_smi_count+=10
+            print("self.no_smi_count",self.no_smi_count)
+            if self.no_smi_count >= (15*60):
+                self.no_smi_count = 0
+                EventMesh.publish("open_power_on", 2)#  #未检测到sim卡15分钟后关机
             
             if self.no_smi_state < 6:
                 self.no_smi_state+=1
@@ -973,14 +967,6 @@ class DeviceInfoManager(Abstract):
                   
         else:
             self.no_smi_count = 0
-        # if battery[0] == "1":
-        #     if battery[1] >= 100:
-        #         if self.charge_full_count > 60 and self.charge_full_count % (60*10) == 0:#每十分钟提醒一次
-        #             pass
-        #             # EventMesh.publish("load_screen", {"screen": "charge_full"})  
-        #         self.charge_full_count+=10
-        # else:
-        #     self.charge_full_count = 0
 
         """检测短信已满，提示是否清掉"""
         msg_nums = sms.getMsgNums() #获取短信条数
@@ -1594,21 +1580,20 @@ class DeviceInfoManager(Abstract):
         EventMesh.publish("play_unread_wechat_infor")#每10s检测是否有未读语音数据
 
         usb_state = EventMesh.publish("get_usb_state")#
-        if usb_state != None:
-            if usb_state == 1 or usb_state == 3:
-                if battery[1] >= 100:#充电已满
-                    if self.charge_full_count == 0:
-                        EventMesh.publish("set_usb_state",3)#
-                        print("charge R_CHARGE_full")
-                        self.charge_full_count = 1
-                else:
-                    self.charge_full_count = 0
+        if battery[0] == '1':
+            if battery[1] >= 100:#充电已满
+                if self.charge_full_count == 0:
+                    EventMesh.publish("set_usb_state",3)#
+                    print("charge R_CHARGE_full")
+                    self.charge_full_count = 1
             else:
                 self.charge_full_count = 0
-                low_power = battery[1]
-                if low_power <= 5:#小于5%红色灯慢闪
-                    EventMesh.publish("set_led_time_arg",[1,2,10*11,led_mode.FLASH_LIGHT_RED,10,5,led_mode.OTHER_MEASURE_MODE])#測量成功
-                    # EventMesh.publish("set_led_time_arg",[1000,400,52,led_mode.FLASH_LIGHT_RED,led_mode.DEFAULT_LONG_LIGHT_MODE,led_mode.OTHER_MEASURE_MODE])#開始測量
+        else:
+            self.charge_full_count = 0
+            low_power = battery[1]
+            if low_power <= 5:#小于5%红色灯慢闪
+                EventMesh.publish("set_led_time_arg",[1,2,10*11,led_mode.FLASH_LIGHT_RED,10,5,led_mode.OTHER_MEASURE_MODE])#測量成功
+                # EventMesh.publish("set_led_time_arg",[1000,400,52,led_mode.FLASH_LIGHT_RED,led_mode.DEFAULT_LONG_LIGHT_MODE,led_mode.OTHER_MEASURE_MODE])#開始測量
 
         # self.charge_full_count+=1
         # print("self.charge_full_count",self.charge_full_count)
@@ -2800,6 +2785,8 @@ class getTempTimeManager(Abstract):
     
     def set_temp_state(self, event, msg): 
         self.get_temp = msg
+        if msg != 0:
+            EventMesh.publish("set_hr_blood_led",1)#红绿灯交替闪烁
 
     def get_temp_state(self, event, msg): 
         return self.get_temp

diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/protocol.py
index 6d1b339..5ebd0fa 100644 (file)
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/protocol.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/protocol.py
@@ -632,7 +632,7 @@ class POWEROFF_ProtoCol(ProtoCol):
         """
         EventMesh.publish(constants.PROTOCOL.POWEROFF_SEND)
         #print("POWEROFF_ProtoCol:recv:%s"%(msg))
-        EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"})
+        EventMesh.publish("open_power_on", 2)#  #远程关机
          
 class PHL_ProtoCol(ProtoCol):
     """电话本同步"""