修改自动测量体温
authordxy15521469561 <1731678236@qq.com>
Tue, 23 Jan 2024 02:56:14 +0000 (10:56 +0800)
committerdxy15521469561 <1731678236@qq.com>
Tue, 23 Jan 2024 02:56:14 +0000 (10:56 +0800)
2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui.py
2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_setting.py
2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m_d15.py
2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py
2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr_d15.py
2.sdk/project/K5_DDY/sdk/services/microPython/ports/quectel/core/mgr.py

index 6ec4aaa..63d9bb8 100644 (file)
@@ -6319,7 +6319,7 @@ class UI(object):
         EventMesh.publish("publish_message_event_ui",{"func":self.ui_press_do,"data":event}) 
     def ui_press_do(self, event):    
         screen_NAME = EventMesh.publish("get_screen_NAME")
-        if screen_NAME == "system_init":
+        if screen_NAME == "poweron" or screen_NAME == "system_init":
             return
         self.system_sleep_timeout_rest()
         # print("ui press {} self.screen_old:{}".format(self.screen_prev,self.screen_old))
@@ -6349,7 +6349,7 @@ class UI(object):
         EventMesh.publish("publish_message_event_ui",{"func":self.btn_press_do,"data":event}) 
     def btn_press_do(self, event):
         screen_NAME = EventMesh.publish("get_screen_NAME")
-        if screen_NAME == "system_init":
+        if screen_NAME == "poweron" or screen_NAME == "system_init":
             return
         print("btn_press: {}".format(event))
         #主表盘按电源键,息屏
@@ -6397,7 +6397,7 @@ class UI(object):
 
     def btn_release(self, event, msg):
         screen_NAME = EventMesh.publish("get_screen_NAME")
-        if screen_NAME == "system_init":
+        if screen_NAME == "poweron" or screen_NAME == "system_init":
             return
         print("btn_release: {}".format(event))
         # if self.main_flag != 1 and self.sleep_flag == 0:
@@ -6515,6 +6515,7 @@ class UI(object):
         EventMesh.publish("publish_message_event_ui",{"func":self.load_screen,"data":msg})  
 
     def load_screen(self, msg):
+        
         print("msg1={} self.UI_high_priority_flag:{}".format(msg,self.UI_high_priority_flag))
         if self.UI_high_priority_flag == 1:#电话界面屏蔽其他界面
             return
@@ -6559,6 +6560,7 @@ class UI(object):
                         self.aud.stop()
 
                 if self.screen_old != None :
+                    EventMesh.publish("close_motor_infor")#设置参数切换界面时关闭马达振动
                     self.screen_old.Close() #先关闭上一次界面
                     self.lv.img.cache_invalidate_src(None) #清img cache
                     self.lv.img.cache_set_size(16) #开img cache
@@ -6585,10 +6587,9 @@ class UI(object):
                 self.__lcd_on()
                 mem = gc.mem_free()
                 print('2剩余内存RAM:{} KB'.format(mem / 1024))
-                # if self.screen_prev == None:
-                #     self.screen_prev = self.screen
-                # if self.screen_prev_new == None:
-                #     self.screen_prev_new = self.screen
+                if self.screen_prev == None:
+                    if self.screen.meta_type != "popup":
+                        self.screen_prev = self.screen
                 self.screen_old = self.screen
                 # print('self.screen:{} self.screen_old:{}'.format(self.screen,self.screen_old))
                 self.system_ui_state = 1
index 3ee7ba8..342dcfe 100644 (file)
@@ -1189,6 +1189,7 @@ class PowerOnScreen(Screen):
         self.count = 0
 
     def initialization(self):
+        EventMesh.publish("set_UI_high_priority",1)
         self.count = 0
         self.aud.setVolume(11)
         # EventMesh.publish("set_motor_time",[1,2,8,8,4])#设置马达参数
@@ -1207,6 +1208,7 @@ class PowerOnScreen(Screen):
             if self.count >= 9:#在上一个界面在播放音频时切换界面则关闭 以免一直播放
                 self.count = 0
                 self.timer.stop()
+                EventMesh.publish("set_UI_high_priority",0)
                 EventMesh.publish("load_screen", {"screen": "main_menu"})
                 return
         self.count+=1
index 32193d3..3b588db 100644 (file)
@@ -205,7 +205,7 @@ if EventMesh.model == "D15" :
             EventMesh.subscribe("video_answer_timer_cb", self.video_answer_timer_cb)#对方已接听
             EventMesh.subscribe("video_answer_mode_timer_cb", self.video_answer_mode_timer_cb)#对方已接听
 
-            EventMesh.subscribe("video_reject_timer_cb", self.video_reject_timer_cb)#对方未接通挂断了
+            EventMesh.subscribe("dev_video_end_timer_cb", self.dev_video_end_timer_cb)#对方未接通挂断了
 
             
 
@@ -923,16 +923,15 @@ if EventMesh.model == "D15" :
                 EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件
                 pass
             elif msg == 5:#对方已挂断或网络不好
-                print("video_reject_timer_cb",msg)
                 str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_VIDEO_CALL_CONNECT"))#播放音频
                 EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件
 
-        def video_reject_timer_cb(self,event,msg):#网络不好或者对方未接通挂断了
-            open_power = EventMesh.publish("get_power_on_state")#获取开机标识
-            power_off = EventMesh.publish("get_power_off_state")#获取关机标识
-            if open_power != None and power_off != None:
-                if open_power == 0 or power_off == 1:
-                    return
+        def dev_video_end_timer_cb(self,event,msg):#网络不好或者对方未接通挂断了
+            self.video_call_state = 0
+            self.video_count = 0
+            print("dev_video_end_timer_cb")
+            EventMesh.publish("stop_led_timer")#设置参数
+            EventMesh.publish("close_timer_all")#
            
         
         def get_video_in_out_state(self,event,msg):
@@ -2816,6 +2815,7 @@ if EventMesh.model == "D15" :
             if open_power != None and power_off != None and dev_app_mode != None:
                 if open_power == 0 or power_off == 1 or (dev_app_mode == 1 and get_video_state != 0): 
                     return
+                
             fall_down = EventMesh.publish("get_fall_down_state")#跌倒报警标识
             flag = EventMesh.publish("get_call_state")#在通话或者电话拨进 或者拨出不允许寻找设备
             if fall_down != None:
@@ -3264,6 +3264,7 @@ if EventMesh.model == "D15" :
                         video_state = EventMesh.publish("get_video_state")
                         if video_state != 0:#视频通话打入或者接听后允许挂断视频通话
                             if video_state == 6 or get_video == 0:
+
                                 EventMesh.publish("video_reject_cb",2)#挂断视频通话
                                 self.sosKey_press_count=0
                                 self.wechatKey_timer.stop()
index 551ad0e..0a10468 100644 (file)
@@ -1542,11 +1542,6 @@ if EventMesh.model == "D10":
                                         self.temp_state = 0
                                         self.temp_time = time_tmp
 
-                                    if self.old_temp_time != get_temp_time:#重复修改测量间隔时间
-                                        self.temp_time = time_tmp#防止改变时间的时候正在开启测量突然10s就停止测量 
-                                        self.temp_state = 0
-                                    self.old_temp_time = get_temp_time
-
                                     if (time_tmp-self.temp_time) == 0 and self.temp_state == 0:#一开始就测量 测量一分钟停止测量体温
                                         self.temp_state = 1
                                         EventMesh.publish("set_temp_state",2)
index fdfcff6..5db15fb 100644 (file)
@@ -1608,11 +1608,6 @@ if EventMesh.model == "D15":
                                         self.temp_state = 0
                                         self.temp_time = time_tmp
 
-                                    if self.old_temp_time != get_temp_time:#重复修改测量间隔时间
-                                        self.temp_time = time_tmp#防止改变时间的时候正在开启测量突然10s就停止测量 
-                                        self.temp_state = 0
-                                    self.old_temp_time = get_temp_time
-
                                     if (time_tmp-self.temp_time) == 0 and self.temp_state == 0:#一开始就测量 测量一分钟停止测量体温
                                         self.temp_state = 1
                                         EventMesh.publish("set_temp_state",2)
@@ -5385,16 +5380,19 @@ if EventMesh.model == "D15":
                 call_type = int(EventMesh.publish("get_vedio_call_type"))#
                 
                 # print("video_reject_cb1111",self.video_led_state,self.video_answer)
-
-                # EventMesh.publish("close_jrtc_event")
-                jrtc.close(0)
-                # print("close_jrtc_event ens")
+                print("close_jrtc_event ens")
                 if msg == 2:
                     self.video_led_state = 1
+                    EventMesh.publish("dev_video_end_timer_cb")#手表设备已挂断
                 else:
                     self.video_led_state = 0
                     EventMesh.publish("video_answer_mode_timer_cb",4)##提示对方已挂断
                 EventMesh.publish(constants.PROTOCOL.RCALLING_SEND,[call_id,meet_id,call_type])
+
+                print("close_jrtc_event ens1")
+                jrtc.close(0)
+                print("close_jrtc_event ens2")
+               
             
         def set_app_dev_end_state(self,event,msg):#app拒绝视频通话
             self.video_led_state = 0 #手表挂断不在进入
index 3d282bb..7c1f18e 100644 (file)
@@ -999,7 +999,6 @@ class DeviceInfoManager(Abstract):
         print("clear_temp_state")
         self.temp_state = 0
         self.temp_one_state = 0
-        self.old_temp_time = 0
         pass
 
     
@@ -1410,11 +1409,6 @@ class DeviceInfoManager(Abstract):
                                     self.temp_state = 0
                                     self.temp_time = time_tmp
 
-                                if self.old_temp_time != get_temp_time:#重复修改测量间隔时间
-                                    self.temp_time = time_tmp#防止改变时间的时候正在开启测量突然10s就停止测量 
-                                    self.temp_state = 0
-                                self.old_temp_time = get_temp_time
-
                                 if (time_tmp-self.temp_time) == 0 and self.temp_state == 0:#一开始就测量 测量一分钟停止测量体温
                                     self.temp_state = 1
                                     EventMesh.publish("set_temp_state",2)