完善体温界面测量

微聊界面声音调节到最大声音

diff --git a/2.sdk/images/customer_fs.bin b/2.sdk/images/customer_fs.bin
index baf94f0..23b470b 100644 (file)
Binary files a/2.sdk/images/customer_fs.bin and b/2.sdk/images/customer_fs.bin differ

diff --git a/2.sdk/images/ext_fs.bin b/2.sdk/images/ext_fs.bin
index b794f4d..1cc8553 100644 (file)
Binary files a/2.sdk/images/ext_fs.bin and b/2.sdk/images/ext_fs.bin differ

diff --git a/2.sdk/project/K5/ext/static/temp_bg.png b/2.sdk/project/K5/ext/static/temp_bg.png
deleted file mode 100644 (file)
index 52a5ae8..0000000
Binary files a/2.sdk/project/K5/ext/static/temp_bg.png and /dev/null differ

diff --git a/2.sdk/project/K5/ext/static/temp_current.png b/2.sdk/project/K5/ext/static/temp_current.png
new file mode 100644 (file)
index 0000000..a179774
Binary files /dev/null and b/2.sdk/project/K5/ext/static/temp_current.png differ

diff --git a/2.sdk/project/K5/ext/static/temp_hand.png b/2.sdk/project/K5/ext/static/temp_hand.png
new file mode 100644 (file)
index 0000000..4fe7f92
Binary files /dev/null and b/2.sdk/project/K5/ext/static/temp_hand.png differ

diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appWechat.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appWechat.py
index bba7d93..afc5f44 100644 (file)
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appWechat.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appWechat.py
@@ -274,6 +274,7 @@ class WechatScreen(Screen):
                     bottom_btn1.scroll_to_view(lv.ANIM.OFF)    
 
     def initialization(self):
+        self.aud.setVolume(11)#设置最大声录音
         wechat_label.set_text(" ")
         wechat_label.add_flag(lv.obj.FLAG.HIDDEN)
         wechat_press_label_countdown.add_flag(lv.obj.FLAG.HIDDEN)
@@ -357,6 +358,7 @@ class WechatScreen(Screen):
 
 
     def play_img_cb(self,*args):
+        EventMesh.publish("system_sleep_rest")#防止黑屏
         # print("self.count_img :{} self.play_text:{}".format(self.count_img,self.play_text))
         self.count_img+=1
         if self.count_img > 3:
@@ -436,6 +438,10 @@ class WechatScreen(Screen):
         self.record_test.stop() #停止錄音
         self.second_timer.stop() #停止计时器
         self.aud.stop()
+        num = EventMesh.publish("get_volum_size")
+        if num == None:
+            num = 8
+        self.aud.setVolume(num)#恢复原始音量
 
     def reduce_second(self,*args):
         if self.countdown < 15:

diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
index dab1af4..7773fe6 100644 (file)
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
@@ -2267,6 +2267,7 @@ temperature_wrist_label = None
 temperature_wrist_degree_img = None
 temperature_wrist_value_label = None
 temperature_measure_end_label = None
+temperature_measure_countdown_label = None
 class TemperatureScreen(Screen):
     NAME = "temperature"
 
@@ -2277,72 +2278,87 @@ class TemperatureScreen(Screen):
         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_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()
             temperature_screen.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 
             temperature_bg_img = lv.img(temperature_screen)
-            temperature_bg_img.set_pos(0, 0)
-            temperature_bg_img.set_size(71, 170)
-            temperature_bg_img.set_src("E:/static/temp_bg.png")
+            temperature_bg_img.set_pos(0, 5)
+            temperature_bg_img.set_size(71, 85)
+            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(100, 20)
-            temperature_body_label.set_text("当前体温")
+            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.CENTER, 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(150, 70)
+            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(100,70)
-            temperature_value_label.set_size(50, 20)
-            temperature_value_label.set_text("36.1")
+            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(100,150)
-            temperature_wrist_value_label.set_size(50, 20)
-            temperature_wrist_value_label.set_text("24.9")
-            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_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,210)
+            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):
         self.count += 1
@@ -2355,16 +2371,22 @@ class TemperatureScreen(Screen):
 
         tmp_d = str(temp).split('.')[1][:1]
         tmp_d_tmp = int(tmp_d)
-
-        print("temp:{} tmp_f:{} tmp_f_tmp:{} tmp_d:{} tmp_d_tmp:{}".format(temp,tmp_f,tmp_f_tmp,tmp_d,tmp_d_tmp)) 
-        if self.count > 3*60:
+        
+        if self.countdown > 0:
+            self.countdown-=1
+        min = self.countdown / 60
+        sec = self.countdown % 60
+        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)
             temperature_measure_end_label.set_text("测量完成")
-            EventMesh.publish(constants.PROTOCOL.TEMP_SEND,[tmp_f_tmp,tmp_d_tmp])
             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
         EventMesh.publish("set_temp_state",0)
         EventMesh.publish(constants.EVENT.STOP_TEMP)
         self.temp_timer.stop()

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 8db8114..0d11ce3 100644 (file)
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

diff --git a/2.sdk/project/K5/usr/static/degree.png b/2.sdk/project/K5/usr/static/degree.png
index 080a3fb..62b467f 100644 (file)
Binary files a/2.sdk/project/K5/usr/static/degree.png and b/2.sdk/project/K5/usr/static/degree.png differ