1.更换电池20%图标
authordxy15521469561 <1731678236@qq.com>
Fri, 14 Jul 2023 03:32:04 +0000 (11:32 +0800)
committerdxy15521469561 <1731678236@qq.com>
Fri, 14 Jul 2023 03:32:04 +0000 (11:32 +0800)
2.体温界面更新

2.sdk/project/K5/ext/static/temp_current.png [deleted file]
2.sdk/project/K5/ext/static/temp_gif01.png [new file with mode: 0644]
2.sdk/project/K5/ext/static/temp_gif02.png [new file with mode: 0644]
2.sdk/project/K5/ext/static/temp_gif03.png [new file with mode: 0644]
2.sdk/project/K5/ext/static/temp_hand.png [deleted file]
2.sdk/project/K5/ext/static/temp_high.png [new file with mode: 0644]
2.sdk/project/K5/ext/static/temp_line_bg.png [new file with mode: 0644]
2.sdk/project/K5/ext/static/vbat_20.png
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_main_menu.py

diff --git a/2.sdk/project/K5/ext/static/temp_current.png b/2.sdk/project/K5/ext/static/temp_current.png
deleted file mode 100644 (file)
index 25861c5..0000000
Binary files a/2.sdk/project/K5/ext/static/temp_current.png and /dev/null differ
diff --git a/2.sdk/project/K5/ext/static/temp_gif01.png b/2.sdk/project/K5/ext/static/temp_gif01.png
new file mode 100644 (file)
index 0000000..b1585cd
Binary files /dev/null and b/2.sdk/project/K5/ext/static/temp_gif01.png differ
diff --git a/2.sdk/project/K5/ext/static/temp_gif02.png b/2.sdk/project/K5/ext/static/temp_gif02.png
new file mode 100644 (file)
index 0000000..6065cbb
Binary files /dev/null and b/2.sdk/project/K5/ext/static/temp_gif02.png differ
diff --git a/2.sdk/project/K5/ext/static/temp_gif03.png b/2.sdk/project/K5/ext/static/temp_gif03.png
new file mode 100644 (file)
index 0000000..4833bc5
Binary files /dev/null and b/2.sdk/project/K5/ext/static/temp_gif03.png differ
diff --git a/2.sdk/project/K5/ext/static/temp_hand.png b/2.sdk/project/K5/ext/static/temp_hand.png
deleted file mode 100644 (file)
index 4fef5be..0000000
Binary files a/2.sdk/project/K5/ext/static/temp_hand.png and /dev/null differ
diff --git a/2.sdk/project/K5/ext/static/temp_high.png b/2.sdk/project/K5/ext/static/temp_high.png
new file mode 100644 (file)
index 0000000..d18ab2f
Binary files /dev/null and b/2.sdk/project/K5/ext/static/temp_high.png differ
diff --git a/2.sdk/project/K5/ext/static/temp_line_bg.png b/2.sdk/project/K5/ext/static/temp_line_bg.png
new file mode 100644 (file)
index 0000000..1fc3f49
Binary files /dev/null and b/2.sdk/project/K5/ext/static/temp_line_bg.png differ
index 20fe243..e76eb8a 100644 (file)
Binary files a/2.sdk/project/K5/ext/static/vbat_20.png and b/2.sdk/project/K5/ext/static/vbat_20.png differ
index 7eab200..c9c1fdf 100644 (file)
@@ -1905,7 +1905,8 @@ class gethistoryDataManager(Abstract):
         self.oldstep = 0
         self.old_step = 0
         self.read_data = {}
-        self.read_histroy_data = {}
+        self.read_histroy_hr_data = {}
+        self.read_histroy_temp_data = {}
         check_json= ql_fs.path_exists("/ext/static/storage_file/config.json")
         if check_json == True :
             with open("/ext/static/storage_file/config.json","r") as fd:#音频文件编号
@@ -1930,10 +1931,15 @@ class gethistoryDataManager(Abstract):
                     self.oldHr = 0
                     self.oldspo2 = 0
                     self.oldstep = 0
-        check_= ql_fs.path_exists("/ext/static/storage_file/history_hr.json")
-        if check_json == True :
+        check_hr= ql_fs.path_exists("/ext/static/storage_file/history_hr.json")
+        if check_hr == True :
             with open("/ext/static/storage_file/history_hr.json","r") as fd:#音频文件编号
-                self.read_histroy_data = ujson.load(fd)
+                self.read_histroy_hr_data = ujson.load(fd)
+        
+        check_temp= ql_fs.path_exists("/ext/static/storage_file/history_hr.json")
+        if check_temp == True :
+            with open("/ext/static/storage_file/history_temp.json","r") as fd:#音频文件编号
+                self.read_histroy_temp_data = ujson.load(fd)
 
     def post_processor_after_instantiation(self):
         EventMesh.subscribe("set_old_hr_data", self.save_hr_value)
@@ -1948,21 +1954,41 @@ class gethistoryDataManager(Abstract):
         EventMesh.subscribe("get_history_hr_value", self.get_history_hr_value)
         EventMesh.subscribe("set_history_hr_value", self.set_history_hr_value)
 
-    def get_history_hr_value(self, event, msg): #近7次历史数据统计显示
-        return self.read_histroy_data
+        EventMesh.subscribe("get_history_temp_value", self.get_history_temp_value)
+        EventMesh.subscribe("set_history_temp_value", self.set_history_temp_value)
+
+    def get_history_temp_value(self, event, msg): #近7次体温历史数据统计显示
+        return self.read_histroy_temp_data
+
+    def set_history_temp_value(self, event, msg): 
+        if msg > 0:
+            self.read_histroy_temp_data = EventMesh.publish("get_history_temp_value")
+            count = len(self.read_histroy_temp_data)
+            if count >= 7:
+                for i in range(6):
+                    self.read_histroy_temp_data["0{}".format(i+1)] = self.read_histroy_temp_data["0{}".format(i+2)]
+                self.read_histroy_temp_data["07"] = msg
+            else:
+                self.read_histroy_temp_data["0{}".format(count+1)] = msg
+            with open("/ext/static/storage_file/history_temp.json","w",encoding="utf-8") as fd:
+                ujson.dump(self.read_histroy_temp_data,fd)
+
+
+    def get_history_hr_value(self, event, msg): #近7次心率历史数据统计显示
+        return self.read_histroy_hr_data
 
     def set_history_hr_value(self, event, msg): 
         if msg >= 50:
-            self.read_histroy_data = EventMesh.publish("get_history_hr_value")
-            count = len(self.read_histroy_data)
+            self.read_histroy_hr_data = EventMesh.publish("get_history_hr_value")
+            count = len(self.read_histroy_hr_data)
             if count >= 7:
                 for i in range(6):
-                    self.read_histroy_data["0{}".format(i+1)] = self.read_histroy_data["0{}".format(i+2)]
-                self.read_histroy_data["07"] = msg
+                    self.read_histroy_hr_data["0{}".format(i+1)] = self.read_histroy_hr_data["0{}".format(i+2)]
+                self.read_histroy_hr_data["07"] = msg
             else:
-                self.read_histroy_data["0{}".format(count+1)] = msg
+                self.read_histroy_hr_data["0{}".format(count+1)] = msg
             with open("/ext/static/storage_file/history_hr.json","w",encoding="utf-8") as fd:
-                ujson.dump(self.read_histroy_data,fd)
+                ujson.dump(self.read_histroy_hr_data,fd)
 
     def save_hr_value(self, event, msg): 
         if msg >= 50:
index 743a77e..3aa1c6d 100644 (file)
@@ -3562,136 +3562,414 @@ temperature_wrist_degree_img = None
 temperature_wrist_value_label = None
 temperature_measure_end_label = None
 temperature_measure_countdown_label = None
+temp_reset_btn_img = None
+temp_line1 = None
+temp_line2 = None
+temp_line3 = None
+temp_line4 = None
+temp_line5 = None
+temp_line6 = None
+temp_line7 = None
+temperature_label = None
+temperature_line_bg_img = None
+temperature_done_img = None
+temperature_start_label=None
+temperature_bpm_label = None
+temperature_done_label = None
+temperature_keep_label = None
+
+style_line_blue = lv.style_t()
+style_line_blue.init()
+style_line_blue.set_line_width(10)
+style_line_blue.set_line_color(lv.color_make(35, 141, 255))
+
 class TemperatureScreen(Screen):
     NAME = "temperature"
 
+
     def __init__(self):
         super().__init__()
         self.meta = None
-        self.temp_timer = osTimer()
-        self.count = 0
+        self.timer = osTimer()
+        self.point = 0
+        self.temp_value = 0
+
     def initialization(self):
-        global temperature_screen,temperature_bg_img ,temperature_body_label ,temperature_degree_img ,temperature_value_label,\
-            temperature_wrist_label,temperature_wrist_degree_img ,temperature_wrist_value_label,temperature_measure_end_label,temperature_measure_countdown_label
+        global temperature_screen,temperature_keep_label,temperature_label,temp_reset_btn_img,temp_line1,temp_line2,temp_line3,temp_line4,temp_line5,\
+            temp_line6,temp_line7,temperature_line_bg_img,temperature_done_img ,temperature_start_label,temperature_bpm_label ,temperature_done_label 
         if temperature_screen == None:
             temperature_screen = lv.obj()
-            print("temperature_screen")
+            print("temp_screen")
             temperature_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-            temperature_bg_img = lv.img(temperature_screen)
-            temperature_bg_img.set_pos(30, 50)
-            temperature_bg_img.set_size(31, 32)
-            temperature_bg_img.set_src("E:/static/temp_hand.png")
-            temperature_bg_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+            temperature_label = lv.label(temperature_screen)
+            temperature_label.set_pos(0, 10)
+            temperature_label.set_size(240, 40)
+            temperature_label.set_text("体温")
+            temperature_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0)
+            temperature_label.set_long_mode(lv.label.LONG.WRAP)
+            temperature_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+            temperature_line_bg_img = lv.img(temperature_screen)
+            temperature_line_bg_img.set_pos(5, 50)
+            temperature_line_bg_img.set_size(230, 120)
+            temperature_line_bg_img.set_src("E:/static/temp_line_bg.png")
+
+            
+            temperature_done_img = lv.img(temperature_screen)
+            temperature_done_img.set_pos(20, 226)
+            temperature_done_img.set_src("E:/static/temp_gif03.png")
+
+            temp_reset_btn_img = lv.img(temperature_screen)
+            temp_reset_btn_img.set_pos(0, 182)
+            temp_reset_btn_img.set_src("E:/static/reset_hr_btn.png")
+            temp_reset_btn_img.add_flag(lv.obj.FLAG.HIDDEN)
+            temp_reset_btn_img.add_flag(lv.obj.FLAG.CLICKABLE)
+
+            temperature_start_label = lv.label(temperature_screen)
+            temperature_start_label.set_size(240,40)
+            temperature_start_label.set_pos(0,190)
+            temperature_start_label.set_text(" ")
+            temperature_start_label.set_style_text_align(lv.TEXT_ALIGN.CENTER,0)
+            temperature_start_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+            temperature_start_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT)
+
+            # hr_line_points1 = [{"x":0,"y":0},{"x":0,"y":30}]
+            # hr_line_points2 = [{"x":0,"y":0},{"x":0,"y":47}]
+            # hr_line_points3 = [{"x":0,"y":0},{"x":0,"y":67}]
+            # hr_line_points4 = [{"x":0,"y":0},{"x":0,"y":85}]
+            # hr_line_points5 = [{"x":0,"y":0},{"x":0,"y":100}]
+            # hr_line_points6 = [{"x":0,"y":0},{"x":0,"y":100}]
+            # hr_line_points7 = [{"x":0,"y":0},{"x":0,"y":100}]
+
+            temp_line1 = lv.line(temperature_screen)
+            temp_line1.set_points(hr_line_points,2)
+            temp_line1.set_pos(29,120)
+            temp_line1.set_size(10,0)
+            temp_line1.add_style(style_line_blue,0)
+
+            temp_line2 = lv.line(temperature_screen)
+            temp_line2.set_points(hr_line_points,2)
+            temp_line2.set_pos(57,103)
+            temp_line2.set_size(10,0)
+            temp_line2.add_style(style_line_blue,0)
+
+            temp_line3 = lv.line(temperature_screen)
+            temp_line3.set_points(hr_line_points,2)
+            temp_line3.set_pos(84,82)
+            temp_line3.set_size(10,0)
+            temp_line3.add_style(style_line_blue,0)
+
+            temp_line4 = lv.line(temperature_screen)
+            temp_line4.set_points(hr_line_points,2)
+            temp_line4.set_pos(110,66)
+            temp_line4.set_size(10,0)
+            temp_line4.add_style(style_line_blue,0)
+
+            temp_line5 = lv.line(temperature_screen)
+            temp_line5.set_points(hr_line_points,2)
+            temp_line5.set_pos(140,50)
+            temp_line5.set_size(10,0)
+            temp_line5.add_style(style_line_blue,0)
+
+            temp_line6 = lv.line(temperature_screen)
+            temp_line6.set_points(hr_line_points,2)
+            temp_line6.set_pos(167,50)
+            temp_line6.set_size(10,0)
+            temp_line6.add_style(style_line_blue,0)
+
+            temp_line7 = lv.line(temperature_screen)
+            temp_line7.set_points(hr_line_points,2)
+            temp_line7.set_pos(195,50)
+            temp_line7.set_size(10,0)
+            temp_line7.add_style(style_line_blue,0)
+
+            temperature_bpm_label = lv.label(temperature_screen)
+            temperature_bpm_label.set_size(120, 40)
+            temperature_bpm_label.set_pos(100, 244)
+            temperature_bpm_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+            temperature_bpm_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT)
+
+            temperature_keep_label = lv.label(temperature_screen)
+            temperature_keep_label.set_size(140, 40)
+            temperature_keep_label.set_pos(100, 280)
+            temperature_keep_label.set_text(" ")
+            temperature_keep_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+            temperature_keep_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT)
 
-            temperature_body_label = lv.label(temperature_screen)
-            temperature_body_label.set_pos(80, 40)
-            temperature_body_label.set_size(160, 20)
-            temperature_body_label.set_text("当前腕温")
-            temperature_body_label.set_long_mode(lv.label.LONG.WRAP)
-            temperature_body_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
-            temperature_body_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
             temperature_degree_img = lv.img(temperature_screen)
-            temperature_degree_img.set_pos(146, 70)
+            temperature_degree_img.set_pos(156, 242)
             temperature_degree_img.set_size(22, 22)
             temperature_degree_img.set_src("U:/static/degree.png")
             temperature_degree_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-            temperature_value_label = lv.label(temperature_screen)
-            temperature_value_label.set_pos(90,73)
-            temperature_value_label.set_size(50, 30)
-            temperature_value_label.set_text("--")
-            temperature_value_label.set_long_mode(lv.label.LONG.WRAP)
-            temperature_value_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-            temperature_value_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-
-            # temperature_wrist_label = lv.label(temperature_screen)
-            # temperature_wrist_label.set_pos(80,120)
-            # temperature_wrist_label.set_size(100, 20)
-            # temperature_wrist_label.set_text("当前腕温")
-            # temperature_wrist_label.set_long_mode(lv.label.LONG.WRAP)
-            # temperature_wrist_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-            # temperature_wrist_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-
-            # temperature_wrist_degree_img = lv.img(temperature_screen)
-            # temperature_wrist_degree_img.set_pos(150, 150)
-            # temperature_wrist_degree_img.set_size(22, 22)
-            # temperature_wrist_degree_img.set_src("U:/static/degree.png")
-            # temperature_wrist_degree_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-
-            # temperature_wrist_value_label = lv.label(temperature_screen)
-            # temperature_wrist_value_label.set_pos(96,155)
-            # temperature_wrist_value_label.set_size(50, 30)
-            # temperature_wrist_value_label.set_text("--")
-            # temperature_wrist_value_label.set_long_mode(lv.label.LONG.WRAP)
-            # temperature_wrist_value_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-            # temperature_wrist_value_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-
-            temperature_measure_countdown_label = lv.label(temperature_screen)
-            temperature_measure_countdown_label.set_pos(0,160)
-            temperature_measure_countdown_label.set_size(240, 30)
-            temperature_measure_countdown_label.set_text("03:00")
-            temperature_measure_countdown_label.set_long_mode(lv.label.LONG.WRAP)
-            temperature_measure_countdown_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-            temperature_measure_countdown_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-
-            temperature_measure_end_label = lv.label(temperature_screen)
-            temperature_measure_end_label.set_pos(0,220)
-            temperature_measure_end_label.set_size(240, 30)
-            temperature_measure_end_label.set_text(" ")
-            temperature_measure_end_label.set_long_mode(lv.label.LONG.WRAP)
-            temperature_measure_end_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-            temperature_measure_end_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
             self.meta = temperature_screen
-        if temperature_value_label != None:
-            temperature_value_label.set_text("--")
-        if temperature_measure_end_label != None:
-            temperature_measure_end_label.set_text(" ")
-        if temperature_measure_countdown_label != None:
-            temperature_measure_countdown_label.set_text("03:00")
+            temp_reset_btn_img.add_event_cb(lambda e: EventMesh.callback_wrapper(self.restart_up(e)),
+                lv.EVENT.CLICKED, None)
+            
+        temperature_bpm_label.set_text("- -")
+        temperature_start_label.set_text("正在测量中.")
+        
+
+    def post_processor_after_initialization(self):
+        self.restart_up(0)
+
+    def restart_up(self,e):
+        global temperature_done_label,temperature_keep_label,temperature_bpm_label,temperature_start_label,temp_reset_btn_img
+        temperature_bpm_label.set_text("- -")
+        temperature_keep_label.set_text(" ")
+        temp_reset_btn_img.add_flag(lv.obj.FLAG.HIDDEN)
+        self.point = 0
+        temperature_bpm_label.set_text("- -")
+        temperature_start_label.set_text("正在测量中.")
         EventMesh.publish("set_temp_state",1)
         EventMesh.publish(constants.EVENT.START_TEMP)
-        self.count = 0
-        self.countdown = 3*60
-        self.temp_timer.start(1*1000, 1, self.temp_timerout)
-    def temp_timerout(self,*args):
-        global temperature_value_label,temperature_measure_countdown_label,temperature_measure_end_label
-        self.count += 1
+        self.show_history_data()
+        self.timer.start(1*500, 1, self.start_measure)
+
+    def show_history_data(self):
+        global temp_line1,temp_line2,temp_line3,temp_line4,temp_line5,temp_line6,temp_line7
+        read_data = {}
+        read_data = EventMesh.publish("get_history_temp_value")
+        print("hr history read_data",read_data)
+        if read_data != None:
+            count = len(read_data)
+            if count != 0:
+                if count >= 7:
+                    for i in  range(count):
+                        value = read_data["0{}".format(i+1)]
+                        value_temp = int(value)
+                        if value <= 30:
+                            line_value = int(value_temp)
+                        elif value <= 34:
+                            line_value = int((value_temp-30)*4.25)+30
+                        elif value <= 38:
+                            line_value = int((value_temp-34)*5)+47
+                        elif value <= 42:
+                            line_value = int((value_temp-38)*4)+67
+                        elif value < 46:
+                            line_value = int((value_temp-42)*3.75)+85
+                        else:
+                            value = 46
+                            line_value = 100
+                        
+
+                        if line_value >= 100:
+                            line_value = 100
+                        #print("hr hist",line_value)
+                        hr_line_points = [{"x":0,"y":0},{"x":0,"y":line_value}]
+                        if i == 0:
+                            temp_line1.set_points(hr_line_points,2)
+                            temp_line1.set_pos(29,150-line_value)
+                            temp_line1.set_size(10,line_value)
+                            if value >= 37.3:
+                                temp_line1.set_style_line_color(lv.color_make(0xff,0x00,0x00),0)
+                            else:
+                                temp_line1.set_style_line_color(lv.color_make(35,141,255),0)
+                        if i == 1:
+                            temp_line2.set_points(hr_line_points,2)
+                            temp_line2.set_pos(57,150-line_value)
+                            temp_line2.set_size(10,line_value)
+                            if value >= 37.3:
+                                temp_line2.set_style_line_color(lv.color_make(0xff,0x00,0x00),0)
+                            else:
+                                temp_line2.set_style_line_color(lv.color_make(35,141,255),0)
+
+                        if i == 2:
+                            temp_line3.set_points(hr_line_points,2)
+                            temp_line3.set_pos(84,150-line_value)
+                            temp_line3.set_size(10,line_value)
+                            if value >= 37.3:
+                                temp_line3.set_style_line_color(lv.color_make(0xff,0x00,0x00),0)
+                            else:
+                                temp_line3.set_style_line_color(lv.color_make(35,141,255),0)
+                        if i == 3:
+                            temp_line4.set_points(hr_line_points,2)
+                            temp_line4.set_pos(112,150-line_value)
+                            temp_line4.set_size(10,line_value)
+                            if value >= 37.3:
+                                temp_line4.set_style_line_color(lv.color_make(0xff,0x00,0x00),0)
+                            else:
+                                temp_line4.set_style_line_color(lv.color_make(35,141,255),0)
+                        if i == 4:
+                            temp_line5.set_points(hr_line_points,2)
+                            temp_line5.set_pos(140,150-line_value)
+                            temp_line5.set_size(10,line_value)
+                            if value >= 37.3:
+                                temp_line5.set_style_line_color(lv.color_make(0xff,0x00,0x00),0)
+                            else:
+                                temp_line5.set_style_line_color(lv.color_make(35,141,255),0)
+
+                        if i == 5:
+                            temp_line6.set_points(hr_line_points,2)
+                            temp_line6.set_pos(167,150-line_value)
+                            temp_line6.set_size(10,line_value)
+                            if value >= 37.3:
+                                temp_line6.set_style_line_color(lv.color_make(0xff,0x00,0x00),0)
+                            else:
+                                temp_line6.set_style_line_color(lv.color_make(35,141,255),0)
+
+                        if i == 6:
+                            temp_line7.set_points(hr_line_points,2)
+                            temp_line7.set_pos(195,150-line_value)
+                            temp_line7.set_size(10,line_value)
+                            if value >= 37.3:
+                                temp_line7.set_style_line_color(lv.color_make(0xff,0x00,0x00),0)
+                            else:
+                                temp_line7.set_style_line_color(lv.color_make(35,141,255),0)
+                else:
+                    value = read_data["0{}".format(count)]
+                    value_temp = int(value)
+                    if value <= 30:
+                        line_value = int(value_temp)
+                    elif value <= 34:
+                        line_value = int((value_temp-30)*4.25)+30
+                    elif value <= 38:
+                        line_value = int((value_temp-34)*5)+47
+                    elif value <= 42:
+                        line_value = int((value_temp-38)*4)+67
+                    elif value < 46:
+                        line_value = int((value_temp-42)*3.75)+85
+                    else:
+                        value = 46
+                        line_value = 100
+                    
+
+                    if line_value >= 100:
+                        line_value = 100
+                   #
+                    hr_line_points = [{"x":0,"y":0},{"x":0,"y":line_value}]
+                    if count == 1:
+                        temp_line1.set_points(hr_line_points,2)
+                        temp_line1.set_pos(29,150-line_value)
+                        temp_line1.set_size(10,line_value)
+                        if value >= 37.3:
+                            temp_line1.set_style_line_color(lv.color_make(0xff,0x00,0x00),0)
+                        else:
+                            temp_line1.set_style_line_color(lv.color_make(35,141,255),0)
+                    
+                    if count == 2:
+                        temp_line2.set_points(hr_line_points,2)
+                        temp_line2.set_pos(57,150-line_value)
+                        temp_line2.set_size(10,line_value)
+                        if value >= 37.3:
+                            temp_line2.set_style_line_color(lv.color_make(0xff,0x00,0x00),0)
+                        else:
+                            temp_line2.set_style_line_color(lv.color_make(35,141,255),0)
+
+                    if count == 3:
+                        temp_line3.set_points(hr_line_points,2)
+                        temp_line3.set_pos(84,150-line_value)
+                        temp_line3.set_size(10,line_value)
+                        if value >= 37.3:
+                            temp_line3.set_style_line_color(lv.color_make(0xff,0x00,0x00),0)
+                        else:
+                            temp_line3.set_style_line_color(lv.color_make(35,141,255),0)
+
+
+                    if count == 4:
+                        temp_line4.set_points(hr_line_points,2)
+                        temp_line4.set_pos(112,150-line_value)
+                        temp_line4.set_size(10,line_value)
+                        if value >= 37.3:
+                            temp_line4.set_style_line_color(lv.color_make(0xff,0x00,0x00),0)
+                        else:
+                            temp_line4.set_style_line_color(lv.color_make(35,141,255),0)
+
+                    if count == 5:
+                        temp_line5.set_points(hr_line_points,2)
+                        temp_line5.set_pos(140,150-line_value)
+                        temp_line5.set_size(10,line_value)
+                        if value >= 37.3:
+                            temp_line5.set_style_line_color(lv.color_make(0xff,0x00,0x00),0)
+                        else:
+                            temp_line5.set_style_line_color(lv.color_make(35,141,255),0)
+
+                    if count == 6:
+                        temp_line6.set_points(hr_line_points,2)
+                        temp_line6.set_pos(167,150-line_value)
+                        temp_line6.set_size(10,line_value)
+                        if value >= 37.3:
+                            temp_line6.set_style_line_color(lv.color_make(0xff,0x00,0x00),0)
+                        else:
+                            temp_line6.set_style_line_color(lv.color_make(35,141,255),0)
+
+                    if count == 7:
+                        temp_line7.set_points(hr_line_points,2)
+                        temp_line7.set_pos(195,150-line_value)
+                        temp_line7.set_size(10,line_value)      
+                        if value >= 37.3:
+                            temp_line7.set_style_line_color(lv.color_make(0xff,0x00,0x00),0)
+                        else:
+                            temp_line7.set_style_line_color(lv.color_make(35,141,255),0)
+
+    def start_measure(self,*args):
+        global temperature_label,temperature_keep_label,temperature_done_img ,temp_reset_btn_img,temperature_start_label,temperature_bpm_label ,temperature_done_label
+        self.point = self.point + 1
         EventMesh.publish("system_sleep_rest")#防止黑屏
+        
         temp = EventMesh.publish(constants.EVENT.GET_TEMP) 
         tmp = str(temp).split('.')[0] + '.' + str(temp).split('.')[1][:1]#获取小数点后一位 舍去小数点最后一位
-        if temperature_measure_end_label != None:
-            temperature_value_label.set_text("{}".format(tmp))
+        print("self.temp:{}".format(temp))
+        if self.point >= 2:
+            if temp != 0:
+                temperature_bpm_label.set_text("{}".format(tmp))
+            else:
+                temperature_bpm_label.set_text("- -")
+        
+        if self.point%4 == 0 :
+            temperature_start_label.set_text("正在测量中..")
+            temperature_done_img.set_src("E:/static/temp_gif02.png")
+        if self.point%4 == 1 :
+            temperature_start_label.set_text("正在测量中...")
+            temperature_done_img.set_src("E:/static/temp_gif01.png")
+        if self.point%4 == 2 :
+            temperature_start_label.set_text("正在测量中.")
+            temperature_done_img.set_src("E:/static/temp_gif02.png")
+        
+        if self.point%4 == 3 :
+            temperature_start_label.set_text("正在测量中.")
+            temperature_done_img.set_src("E:/static/temp_gif03.png")
 
         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)
-        
-        if self.countdown > 0:
-            self.countdown-=1
-        min = self.countdown / 60
-        sec = self.countdown % 60
-        if temperature_measure_countdown_label != None:
-            temperature_measure_countdown_label.set_text("{}:{}".format("%02d"%(min),"%02d"%(sec)))
-
-        # print("temp:{} tmp_f:{} tmp_f_tmp:{} tmp_d:{} tmp_d_tmp:{} self.count:{}".format(temp,tmp_f,tmp_f_tmp,tmp_d,tmp_d_tmp,self.count)) 
-        if self.count >= 3*60:
-            self.count = 0
+        if self.point >= 2:
+            if temp >= 37.3:
+                temperature_keep_label.set_text("体温偏高")
+                temperature_keep_label.set_style_text_color(lv.color_make(0xff, 0x00, 0x00), lv.STATE.DEFAULT)
+            else:
+                temperature_keep_label.set_text("体温正常")
+                temperature_keep_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE.DEFAULT)
+        if self.point > 120 * 2: #测2min
+
+            if temp >= 37.3:
+                temperature_done_img.set_src("E:/static/temp_high.png")
+            else:
+                temperature_done_img.set_src("E:/static/temp_gif03.png")
+            temp_reset_btn_img.clear_flag(lv.obj.FLAG.HIDDEN)
+            temperature_start_label.set_text("测量结束,点击重测")
+            
+            EventMesh.publish("set_history_temp_value",temp)
+            self.show_history_data()
+            self.timer.stop()
+            self.point = 0
             EventMesh.publish("set_temp_state",0)
-            if temperature_measure_end_label != None:
-                temperature_measure_end_label.set_text("测量完成")
-            self.temp_timer.stop()
             EventMesh.publish(constants.PROTOCOL.TEMP_SEND,[tmp_f_tmp,tmp_d_tmp])
             EventMesh.publish(constants.EVENT.STOP_TEMP)
+            
+
+            print("stop debug9")
+
     def Close(self):
-        self.count = 0
-        self.temp_timer.stop()
+        self.timer.stop()
         EventMesh.publish("set_temp_state",0)
         EventMesh.publish(constants.EVENT.STOP_TEMP)
-        
+
     def done_return(self):
         EventMesh.publish("load_screen", {"screen": "health"})
 
@@ -3702,6 +3980,149 @@ class TemperatureScreen(Screen):
         EventMesh.publish("watch_top_show")
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
+  
+# class TemperatureScreen(Screen):
+#     NAME = "temperature"
+
+#     def __init__(self):
+#         super().__init__()
+#         self.meta = None
+#         self.temp_timer = osTimer()
+#         self.count = 0
+#     def initialization(self):
+#         global temperature_screen,temperature_bg_img ,temperature_body_label ,temperature_degree_img ,temperature_value_label,\
+#             temperature_wrist_label,temperature_wrist_degree_img ,temperature_wrist_value_label,temperature_measure_end_label,temperature_measure_countdown_label
+#         if temperature_screen == None:
+#             temperature_screen = lv.obj()
+#             print("temperature_screen")
+#             temperature_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+#             temperature_bg_img = lv.img(temperature_screen)
+#             temperature_bg_img.set_pos(30, 50)
+#             temperature_bg_img.set_size(31, 32)
+#             temperature_bg_img.set_src("E:/static/temp_hand.png")
+#             temperature_bg_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+#             temperature_body_label = lv.label(temperature_screen)
+#             temperature_body_label.set_pos(80, 40)
+#             temperature_body_label.set_size(160, 20)
+#             temperature_body_label.set_text("当前腕温")
+#             temperature_body_label.set_long_mode(lv.label.LONG.WRAP)
+#             temperature_body_label.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
+#             temperature_body_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+#             temperature_degree_img = lv.img(temperature_screen)
+#             temperature_degree_img.set_pos(146, 70)
+#             temperature_degree_img.set_size(22, 22)
+#             temperature_degree_img.set_src("U:/static/degree.png")
+#             temperature_degree_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+#             temperature_value_label = lv.label(temperature_screen)
+#             temperature_value_label.set_pos(90,73)
+#             temperature_value_label.set_size(50, 30)
+#             temperature_value_label.set_text("--")
+#             temperature_value_label.set_long_mode(lv.label.LONG.WRAP)
+#             temperature_value_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+#             temperature_value_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+#             # temperature_wrist_label = lv.label(temperature_screen)
+#             # temperature_wrist_label.set_pos(80,120)
+#             # temperature_wrist_label.set_size(100, 20)
+#             # temperature_wrist_label.set_text("当前腕温")
+#             # temperature_wrist_label.set_long_mode(lv.label.LONG.WRAP)
+#             # temperature_wrist_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+#             # temperature_wrist_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+#             # temperature_wrist_degree_img = lv.img(temperature_screen)
+#             # temperature_wrist_degree_img.set_pos(150, 150)
+#             # temperature_wrist_degree_img.set_size(22, 22)
+#             # temperature_wrist_degree_img.set_src("U:/static/degree.png")
+#             # temperature_wrist_degree_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+#             # temperature_wrist_value_label = lv.label(temperature_screen)
+#             # temperature_wrist_value_label.set_pos(96,155)
+#             # temperature_wrist_value_label.set_size(50, 30)
+#             # temperature_wrist_value_label.set_text("--")
+#             # temperature_wrist_value_label.set_long_mode(lv.label.LONG.WRAP)
+#             # temperature_wrist_value_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+#             # temperature_wrist_value_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+#             temperature_measure_countdown_label = lv.label(temperature_screen)
+#             temperature_measure_countdown_label.set_pos(0,160)
+#             temperature_measure_countdown_label.set_size(240, 30)
+#             temperature_measure_countdown_label.set_text("03:00")
+#             temperature_measure_countdown_label.set_long_mode(lv.label.LONG.WRAP)
+#             temperature_measure_countdown_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+#             temperature_measure_countdown_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+#             temperature_measure_end_label = lv.label(temperature_screen)
+#             temperature_measure_end_label.set_pos(0,220)
+#             temperature_measure_end_label.set_size(240, 30)
+#             temperature_measure_end_label.set_text(" ")
+#             temperature_measure_end_label.set_long_mode(lv.label.LONG.WRAP)
+#             temperature_measure_end_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+#             temperature_measure_end_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+#             self.meta = temperature_screen
+#         if temperature_value_label != None:
+#             temperature_value_label.set_text("--")
+#         if temperature_measure_end_label != None:
+#             temperature_measure_end_label.set_text(" ")
+#         if temperature_measure_countdown_label != None:
+#             temperature_measure_countdown_label.set_text("03:00")
+#         EventMesh.publish("set_temp_state",1)
+#         EventMesh.publish(constants.EVENT.START_TEMP)
+#         self.count = 0
+#         self.countdown = 3*60
+#         self.temp_timer.start(1*1000, 1, self.temp_timerout)
+#     def temp_timerout(self,*args):
+#         global temperature_value_label,temperature_measure_countdown_label,temperature_measure_end_label
+#         self.count += 1
+#         EventMesh.publish("system_sleep_rest")#防止黑屏
+#         temp = EventMesh.publish(constants.EVENT.GET_TEMP) 
+#         tmp = str(temp).split('.')[0] + '.' + str(temp).split('.')[1][:1]#获取小数点后一位 舍去小数点最后一位
+#         if temperature_measure_end_label != None:
+#             temperature_value_label.set_text("{}".format(tmp))
+
+#         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)
+        
+#         if self.countdown > 0:
+#             self.countdown-=1
+#         min = self.countdown / 60
+#         sec = self.countdown % 60
+#         if temperature_measure_countdown_label != None:
+#             temperature_measure_countdown_label.set_text("{}:{}".format("%02d"%(min),"%02d"%(sec)))
+
+#         # print("temp:{} tmp_f:{} tmp_f_tmp:{} tmp_d:{} tmp_d_tmp:{} self.count:{}".format(temp,tmp_f,tmp_f_tmp,tmp_d,tmp_d_tmp,self.count)) 
+#         if self.count >= 3*60:
+#             self.count = 0
+#             EventMesh.publish("set_temp_state",0)
+#             if temperature_measure_end_label != None:
+#                 temperature_measure_end_label.set_text("测量完成")
+#             self.temp_timer.stop()
+#             EventMesh.publish(constants.PROTOCOL.TEMP_SEND,[tmp_f_tmp,tmp_d_tmp])
+#             EventMesh.publish(constants.EVENT.STOP_TEMP)
+#     def Close(self):
+#         self.count = 0
+#         self.temp_timer.stop()
+#         EventMesh.publish("set_temp_state",0)
+#         EventMesh.publish(constants.EVENT.STOP_TEMP)
+        
+#     def done_return(self):
+#         EventMesh.publish("load_screen", {"screen": "health"})
+
+#     def btn1_release(self):
+#         EventMesh.publish("load_screen", {"screen": "health"})
+        
+#     def btn8_press(self):
+#         EventMesh.publish("watch_top_show")
+#         EventMesh.publish("load_screen", {"screen": "main_menu"})
+
+
+
 line_points = [{"x":0,"y":0},{"x":240,"y":0}]
 spo2_screen = None
 spo2_label_0 = None
index e4f4ea7..3ddafc4 100644 (file)
@@ -372,6 +372,8 @@ class MainMenuScreen(Screen):
                 id = MainMenu2_til.get_tile_act().get_child(0).get_text()
                 if id != "0":
                     MainMenu2_til.set_tile_id(0,1,lv.ANIM.OFF)
+                else:
+                    MainMenu2_til.set_tile_id(0,0,lv.ANIM.OFF)
                 
         
     def btn8_press(self):