修复菜单
authord15521469561 <d155214695615@qq.com>
Tue, 25 Apr 2023 10:05:22 +0000 (18:05 +0800)
committerd15521469561 <d155214695615@qq.com>
Tue, 25 Apr 2023 10:05:22 +0000 (18:05 +0800)
3.code/1.watch/2.code/appWechat.py
3.code/1.watch/2.code/main_1.py
3.code/1.watch/2.code/mgr.py
3.code/1.watch/2.code/ui.py
3.code/1.watch/2.code/ui_WatchFaceScreen.py
3.code/1.watch/2.code/ui_main_menu.py

index ea66b84..6a09acc 100644 (file)
@@ -175,121 +175,122 @@ class WechatScreen(Screen):
 
 
     def updata_list_show(self,index):
-        if self.wechat_num != 0:
-            if index == 0:
-                self.wechat_list.clear_flag(lv.obj.FLAG.HIDDEN)
-                wechat_label.add_flag(lv.obj.FLAG.HIDDEN)
-            elif index == 2 or index == 1:
-                #读取json文件中的键作为label文本;
-                #print("self.wechat_list.self.wechat_num:{}".format(self.wechat_num))
-                self.startWidth = 0
-                self.startY = 0
-                i = 0
-                print("self.wechat_recode_list:{}".format(self.wechat_recode_list))
-                self.wechat_list.delete()#先删除一次控件
-                self.wechat_list = lv.obj(wechat_screen)
-                self.wechat_list.set_pos(0, 0)
-                self.wechat_list.set_size(240, 250)
-                self.wechat_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-                self.wechat_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
-                self.play_img_cnt = None
-                if index == 2:
-                    self.wechat_list.add_flag(lv.obj.FLAG.HIDDEN)
-                j = 1
-                count = 0
-                if len(self.wechat_recode_list) == self.MXA_MSG:
-                    j = self.wechat_num+1
-                for i in range(self.MXA_MSG):
-                    if j > self.MXA_MSG:
-                        j = 1
-                    key = "%02d"%(j)
-                    
-                    # if j > len(self.wechat_recode_list) :
-                    #     break
-                    j+=1
-                    
-                    # print("self.wechat_recode_list.keys():{}".format(self.wechat_recode_list.keys()))
-                    # if self.wechat_recode_list.keys().find("%02d"%(j)) == -1:
-                    #     continue
-                    # num = "%02d"
-                    if key in self.wechat_recode_list:
+        if self.press_state != 1:
+            if self.wechat_num != 0:
+                if index == 0:
+                    self.wechat_list.clear_flag(lv.obj.FLAG.HIDDEN)
+                    wechat_label.add_flag(lv.obj.FLAG.HIDDEN)
+                elif index == 2 or index == 1:
+                    #读取json文件中的键作为label文本;
+                    #print("self.wechat_list.self.wechat_num:{}".format(self.wechat_num))
+                    self.startWidth = 0
+                    self.startY = 0
+                    i = 0
+                    print("self.wechat_recode_list:{}".format(self.wechat_recode_list))
+                    self.wechat_list.delete()#先删除一次控件
+                    self.wechat_list = lv.obj(wechat_screen)
+                    self.wechat_list.set_pos(0, 0)
+                    self.wechat_list.set_size(240, 250)
+                    self.wechat_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+                    self.wechat_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
+                    self.play_img_cnt = None
+                    if index == 2:
+                        self.wechat_list.add_flag(lv.obj.FLAG.HIDDEN)
+                    j = 1
+                    count = 0
+                    if len(self.wechat_recode_list) == self.MXA_MSG:
+                        j = self.wechat_num+1
+                    for i in range(self.MXA_MSG):
+                        if j > self.MXA_MSG:
+                            j = 1
+                        key = "%02d"%(j)
                         
-                        print('键存在于字典中')
-                    else:
-                        if count > 0:
-                            count-=1
-                        continue
-                        print('键不存在于字典中')
-                   
-                    value = self.wechat_recode_list[key]
-                    print("value:{}".format(value))
-                    self.startY = 52*count 
-                    if value.find("S:") != -1 or value.find("R:") != -1:
-                        msg_tmp = value[2:] 
-                        msg_tmp = int(msg_tmp)
-                        self.startWidth = 55+msg_tmp*10
+                        # if j > len(self.wechat_recode_list) :
+                        #     break
+                        j+=1
                         
-                    elif value.find("T:") != -1:#文字显示
-                        msg_tmp = value[2:] 
-                        size = len(msg_tmp)
-                        self.startWidth = size*20
-                        # print("self.startWidth :{} size:{}".format(self.startWidth,size))
-                        if self.startWidth > 200:
-                            self.startWidth = 200
+                        # print("self.wechat_recode_list.keys():{}".format(self.wechat_recode_list.keys()))
+                        # if self.wechat_recode_list.keys().find("%02d"%(j)) == -1:
+                        #     continue
+                        # num = "%02d"
+                        if key in self.wechat_recode_list:
+                            
+                            print('键存在于字典中')
+                        else:
+                            if count > 0:
+                                count-=1
+                            continue
+                            print('键不存在于字典中')
                     
-                    wechat_btn = lv.btn(self.wechat_list)
-                    # if value.find("R:") != -1:
-                    wechat_btn.set_size(self.startWidth,50)
-                    if value.find("R:") != -1 or value.find("T:") != -1 :#显示文字:
-                        wechat_btn.set_pos(10,self.startY )
-                        wechat_btn.add_style(style_wechat_s_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
-                    elif value.find("S:") != -1 :
-                        wechat_btn.set_pos(230-self.startWidth,self.startY )
-                        wechat_btn.add_style(style_wechat_r_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
-                    if value.find("R:") != -1 or value.find("S:") != -1:
-                        wechat_btn.add_event_cb(lambda e: self.play_label(e),
-                            lv.EVENT.CLICKED, None)
-
-                    _btn_label1 = lv.label(wechat_btn)
-                    if value.find("R:") != -1:
-                        _btn_label1.set_size(40, 40)
-                        _btn_label1.set_pos(35, 8)
-                        _btn_label1.set_text(str(msg_tmp)+'\"')
+                        value = self.wechat_recode_list[key]
+                        print("value:{}".format(value))
+                        self.startY = 52*count 
+                        if value.find("S:") != -1 or value.find("R:") != -1:
+                            msg_tmp = value[2:] 
+                            msg_tmp = int(msg_tmp)
+                            self.startWidth = 55+msg_tmp*10
+                            
+                        elif value.find("T:") != -1:#文字显示
+                            msg_tmp = value[2:] 
+                            size = len(msg_tmp)
+                            self.startWidth = size*20
+                            # print("self.startWidth :{} size:{}".format(self.startWidth,size))
+                            if self.startWidth > 200:
+                                self.startWidth = 200
                         
-                    elif value.find("S:") != -1:
-                        _btn_label1.set_size(40, 40)
-                        _btn_label1.set_pos(self.startWidth-72, 8)
-                        _btn_label1.set_text(str(msg_tmp)+'\"')
-                    elif value.find("T:") != -1:
-                        _btn_label1.set_size(200, 60)
-                        _btn_label1.set_pos(0, 0)
-                        _btn_label1.set_text(str(msg_tmp))
-                        _btn_label1.set_long_mode(lv.label.LONG.DOT)
-
-                    _btn_label1.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
-
-                    _btn_label2 = lv.label(wechat_btn)
-                    _btn_label2.set_size(0, 0)
-                    if value.find("R:") != -1:
-                        _btn_label2.set_text('R:'+key)
-                    elif value.find("S:") != -1:
-                        _btn_label2.set_text('S:'+key)
-                    elif value.find("T:") != -1:
-                        _btn_label2.set_text('T:'+key)
-
-                    if value.find("R:") != -1 or value.find("S:") != -1:
-                        _btn_img = lv.img(wechat_btn)
-                        _btn_img.set_size(30, 30)
+                        wechat_btn = lv.btn(self.wechat_list)
+                        # if value.find("R:") != -1:
+                        wechat_btn.set_size(self.startWidth,50)
+                        if value.find("R:") != -1 or value.find("T:") != -1 :#显示文字:
+                            wechat_btn.set_pos(10,self.startY )
+                            wechat_btn.add_style(style_wechat_s_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
+                        elif value.find("S:") != -1 :
+                            wechat_btn.set_pos(230-self.startWidth,self.startY )
+                            wechat_btn.add_style(style_wechat_r_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
+                        if value.find("R:") != -1 or value.find("S:") != -1:
+                            wechat_btn.add_event_cb(lambda e: self.play_label(e),
+                                lv.EVENT.CLICKED, None)
+
+                        _btn_label1 = lv.label(wechat_btn)
+                        if value.find("R:") != -1:
+                            _btn_label1.set_size(40, 40)
+                            _btn_label1.set_pos(35, 8)
+                            _btn_label1.set_text(str(msg_tmp)+'\"')
+                            
+                        elif value.find("S:") != -1:
+                            _btn_label1.set_size(40, 40)
+                            _btn_label1.set_pos(self.startWidth-72, 8)
+                            _btn_label1.set_text(str(msg_tmp)+'\"')
+                        elif value.find("T:") != -1:
+                            _btn_label1.set_size(200, 60)
+                            _btn_label1.set_pos(0, 0)
+                            _btn_label1.set_text(str(msg_tmp))
+                            _btn_label1.set_long_mode(lv.label.LONG.DOT)
+
+                        _btn_label1.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+                        _btn_label2 = lv.label(wechat_btn)
+                        _btn_label2.set_size(0, 0)
                         if value.find("R:") != -1:
-                            _btn_img.set_pos(5, 0)
-                            _btn_img.set_src("E:/static/APP/wechat/R_3.png")
+                            _btn_label2.set_text('R:'+key)
                         elif value.find("S:") != -1:
-                            _btn_img.set_pos(self.startWidth-50, 0)
-                            _btn_img.set_src("E:/static/APP/wechat/S_3.png")
-                        _btn_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-                    count+=1
-                bottom_btn1 = self.wechat_list.get_child(-1)
-                bottom_btn1.scroll_to_view(lv.ANIM.OFF)    
+                            _btn_label2.set_text('S:'+key)
+                        elif value.find("T:") != -1:
+                            _btn_label2.set_text('T:'+key)
+
+                        if value.find("R:") != -1 or value.find("S:") != -1:
+                            _btn_img = lv.img(wechat_btn)
+                            _btn_img.set_size(30, 30)
+                            if value.find("R:") != -1:
+                                _btn_img.set_pos(5, 0)
+                                _btn_img.set_src("E:/static/APP/wechat/R_3.png")
+                            elif value.find("S:") != -1:
+                                _btn_img.set_pos(self.startWidth-50, 0)
+                                _btn_img.set_src("E:/static/APP/wechat/S_3.png")
+                            _btn_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+                        count+=1
+                    bottom_btn1 = self.wechat_list.get_child(-1)
+                    bottom_btn1.scroll_to_view(lv.ANIM.OFF)    
 
     def initialization(self):
         wechat_label.add_flag(lv.obj.FLAG.HIDDEN)
@@ -364,9 +365,11 @@ class WechatScreen(Screen):
                 senddata = [self.countdown_old,buf]
                 EventMesh.publish(constants.PROTOCOL.TK_SEND,senddata)
             #隐藏显示文本 显示列表显示框
+            self.press_state = 0
+            self.ble_send = 0
             self.timer.start(2 * 1000, 0, self.hide_label)
             self.updata_list_show(2)
-            self.press_state = 0
+            
 
 
     def play_img_cb(self,*args):
@@ -432,10 +435,10 @@ class WechatScreen(Screen):
 
     #松手2秒后发送数据
     def hide_label(self,*args):
-        wechat_label.add_flag(lv.obj.FLAG.HIDDEN)
-        wechat_label.set_text(" ")
-        self.ble_send = 0
-        self.updata_list_show(0)
+        if self.ble_send != 1:
+            wechat_label.add_flag(lv.obj.FLAG.HIDDEN)
+            wechat_label.set_text(" ")
+            self.updata_list_show(0)
 
      #获取是否在录音
     def get_aduio_state(self, event, msg): 
@@ -680,5 +683,57 @@ class MESSAGE_ProtoCol(ProtoCol):
         EventMesh.publish("wechat_updata_list_show")
             
       
+#微聊弹窗
+
+wechat_popup_screen = lv.obj()
+wechat_popup = lv.obj(wechat_popup_screen)
+wechat_popup.center()
+wechat_popup.set_size(240, 320)
+wechat_popup.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+wechat_popup_title = lv.label(wechat_popup)
+wechat_popup_title.set_pos(0, 150)
+wechat_popup_title.set_size(240, 40)
+wechat_popup_title.set_text("你有新的微聊消息")
+wechat_popup_title.set_long_mode(lv.label.LONG.WRAP)
+wechat_popup_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+wechat_popup_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+#信息弹窗
+class NewWechatPopupScreen(Screen):
+    NAME = "wechat_popup"
+    def __init__(self):
+        super().__init__()
+        self.meta = wechat_popup_screen
+
+    def done_left_to_right(self):
+        EventMesh.publish("wechat_updata_list_show")
+        EventMesh.publish("load_screen", {"screen": "wechat"})
+
+    def done_right_to_left(self):
+        EventMesh.publish("wechat_updata_list_show")
+        EventMesh.publish("load_screen", {"screen": "wechat"})
+
+    def done_bottom_to_top(self):
+        EventMesh.publish("wechat_updata_list_show")
+        EventMesh.publish("load_screen", {"screen": "wechat"})
+
+    def done_top_to_bottom(self):
+        EventMesh.publish("wechat_updata_list_show")
+        EventMesh.publish("load_screen", {"screen": "wechat"})
+
+    def done_return(self):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+    def done_click(self):
+        EventMesh.publish("wechat_updata_list_show")
+        EventMesh.publish("load_screen", {"screen": "wechat"})
+
+    def btn1_release(self):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+
+    def btn8_press(self):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+
+
+
 
     
index af5ae66..8b38054 100644 (file)
@@ -65,7 +65,7 @@ if __name__ == '__main__':
     from ext.alarm import ClkListScreen,ClockManager,NewEditClk,CLKTimeScreen,ClkPeriod,PopupAlarmScreen
     from ext.ui_main_menu import MainMenuScreen
     #from ext.ui_WatchFaceScreen import WatchFaceScreen 
-    from ext.appWechat import WechatScreen,TK_ProtoCol,MESSAGE_ProtoCol
+    from ext.appWechat import WechatScreen,TK_ProtoCol,MESSAGE_ProtoCol,NewWechatPopupScreen
     import ext.ui_setting as _ui_setting
     from ext.appFactoryMode import  FactoryModeLocationScreen,FactoryModeScreen 
     # from usr.test_sms import HRSTART_ProtoCol,getHrTimeManager,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,getBrightnessManager,\
index b9aaec0..847d5eb 100644 (file)
@@ -618,7 +618,7 @@ class DeviceInfoManager(Abstract):
         if self.bat_time > 5*60:
             self.bat_time = 0
             if battery == 20:
-                EventMesh.publish("load_screen", {"screen": "low_power"})
+                EventMesh.publish("load_screen", {"screen": "LOW_POWER"})
     
         #消息已满
         msg_nums = sms.getMsgNums() #获取短信条数
@@ -1575,6 +1575,25 @@ class getOldHrDataManager(Abstract):
     def __init__(self):
         self.oldHr = 0
         self.oldspo2 = 0
+        self.read_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:#音频文件编号
+        #         self.read_data = ujson.load(fd)
+        #         if self.read_data != {}:
+        #             b = str("old_hr") in self.read_data.keys()
+        #             if b == True:
+        #                 self.oldHr = self.read_data["old_hr"]  
+        #             else:
+        #                 self.oldHr = 0
+        #             old_spo2 = str("old_spo2") in self.read_data.keys()
+        #             if old_spo2 == True:
+        #                 self.oldspo2 = self.read_data["old_spo2"]  
+        #             else:
+        #                 self.oldspo2 = 0
+        #         else:
+        #             self.oldHr = 0
+        #             self.oldspo2 = 0
 
     def post_processor_after_instantiation(self):
         EventMesh.subscribe("set_old_hr_data", self.save_hr_value)
@@ -1583,13 +1602,27 @@ class getOldHrDataManager(Abstract):
         EventMesh.subscribe("get_old_spo2_data", self.get_spo2_value)
 
     def save_hr_value(self, event, msg): 
-        self.oldHr = msg
+        if msg >= 50:
+            self.read_data = EventMesh.publish("get_storage_data")
+            self.read_data["old_hr"] = msg
+
+            EventMesh.publish("set_storage_data", self.read_data)
+            with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
+                ujson.dump(self.read_data,fd)
+            self.oldHr = msg
 
     def get_hr_value(self, event, msg): 
         return self.oldHr
 
     def save_spo2_value(self, event, msg): 
-        self.oldspo2 = msg
+        if msg >= 85:
+            self.read_data = EventMesh.publish("get_storage_data")
+            self.read_data["old_spo2"] = msg
+
+            EventMesh.publish("set_storage_data", self.read_data)
+            with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
+                ujson.dump(self.read_data,fd)
+            self.oldspo2 = msg
 
     def get_spo2_value(self, event, msg): 
         return self.oldspo2
index 05050bd..3dcd6a4 100644 (file)
@@ -203,15 +203,7 @@ toolbox_cont.add_style(
     toolbox_cont_style.style_cont(0, lv.color_make(0x00, 0x00, 0x00), lv.color_make(0x00, 0x00, 0x00), 255),
     lv.PART.MAIN | lv.STATE.DEFAULT)
 
-toolbox_step = lv.btn(toolbox_cont)
-toolbox_step.set_pos(0, 0)
-toolbox_step.set_size(0, 54)
-toolbox_step_label = lv.label(toolbox_step)
-toolbox_step_label.set_text("计步")
-toolbox_step.set_style_pad_all(0, lv.STATE.DEFAULT)
-toolbox_step_label.align(lv.ALIGN.LEFT_MID, 70, 0)
-toolbox_step_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-toolbox_step.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
+
 toolbox_step_img = lv.img(toolbox_cont)
 toolbox_step_img.set_pos(4, 0)
 toolbox_step_img.set_size(232, 80)
@@ -219,15 +211,7 @@ toolbox_step_img.add_flag(lv.obj.FLAG.CLICKABLE)
 toolbox_step_img.set_src("E:/static/tool/IMAGE_SECMENU_STEP.png")
 toolbox_step_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-toolbox_weather = lv.btn(toolbox_cont)
-toolbox_weather.set_pos(0, 60)
-toolbox_weather.set_size(0, 0)
-toolbox_weather_label = lv.label(toolbox_weather)
-toolbox_weather_label.set_text("天气")
-toolbox_weather.set_style_pad_all(0, lv.STATE.DEFAULT)
-toolbox_weather_label.align(lv.ALIGN.LEFT_MID, 70, 0)
-toolbox_weather_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-toolbox_weather.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
+
 toolbox_weather_img = lv.img(toolbox_cont)
 toolbox_weather_img.set_pos(4, 90)
 toolbox_weather_img.set_size(232, 80)
@@ -235,15 +219,7 @@ toolbox_weather_img.add_flag(lv.obj.FLAG.CLICKABLE)
 toolbox_weather_img.set_src("E:/static/tool/IMAGE_SECMENU_WEATHER.png")
 toolbox_weather_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-toolbox_alarm = lv.btn(toolbox_cont)
-toolbox_alarm.set_pos(0, 120)
-toolbox_alarm.set_size(0, 0)
-toolbox_alarm_label = lv.label(toolbox_alarm)
-toolbox_alarm_label.set_text("闹钟")
-toolbox_alarm.set_style_pad_all(0, lv.STATE.DEFAULT)
-toolbox_alarm_label.align(lv.ALIGN.LEFT_MID, 70, 0)
-toolbox_alarm_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-toolbox_alarm.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
+
 toolbox_alarm_img = lv.img(toolbox_cont)
 toolbox_alarm_img.set_pos(4, 180)
 toolbox_alarm_img.set_size(232, 80)
@@ -251,33 +227,26 @@ toolbox_alarm_img.add_flag(lv.obj.FLAG.CLICKABLE)
 toolbox_alarm_img.set_src("E:/static/tool/IMAGE_SECMENU_ALARM.png")
 toolbox_alarm_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-toolbox_countdown = lv.btn(toolbox_cont)
-toolbox_countdown.set_pos(0, 180)
-toolbox_countdown.set_size(0, 0)
-toolbox_countdown_label = lv.label(toolbox_countdown)
-toolbox_countdown_label.set_text("倒计时")
-toolbox_countdown.set_style_pad_all(0, lv.STATE.DEFAULT)
-toolbox_countdown_label.align(lv.ALIGN.LEFT_MID, 70, 0)
-toolbox_countdown_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-toolbox_countdown.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+
+toolbox_sms_img = lv.img(toolbox_cont)
+toolbox_sms_img.set_pos(4, 270)
+toolbox_sms_img.set_size(232, 80)
+toolbox_sms_img.add_flag(lv.obj.FLAG.CLICKABLE)
+toolbox_sms_img.set_src("E:/static/tool/sms_setting.png")
+toolbox_sms_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+
 toolbox_countdown_img = lv.img(toolbox_cont)
-toolbox_countdown_img.set_pos(4, 270)
+toolbox_countdown_img.set_pos(4, 360)
 toolbox_countdown_img.set_size(232, 80)
 toolbox_countdown_img.add_flag(lv.obj.FLAG.CLICKABLE)
 toolbox_countdown_img.set_src("E:/static/tool/IMAGE_SECMENU_COUNTDOWN.png")
 toolbox_countdown_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-toolbox_stopwatch = lv.btn(toolbox_cont)
-toolbox_stopwatch.set_pos(0, 240)
-toolbox_stopwatch.set_size(0, 0)
-toolbox_stopwatch_label = lv.label(toolbox_stopwatch)
-toolbox_stopwatch_label.set_text("秒表")
-toolbox_stopwatch.set_style_pad_all(0, lv.STATE.DEFAULT)
-toolbox_stopwatch_label.align(lv.ALIGN.LEFT_MID, 70, 0)
-toolbox_stopwatch_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
-toolbox_stopwatch.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
+
 toolbox_stopwatch_img = lv.img(toolbox_cont)
-toolbox_stopwatch_img.set_pos(4, 360)
+toolbox_stopwatch_img.set_pos(4, 450)
 toolbox_stopwatch_img.set_size(232, 80)
 toolbox_stopwatch_img.add_flag(lv.obj.FLAG.CLICKABLE)
 toolbox_stopwatch_img.set_src("E:/static/tool/IMAGE_SECMENU_STOPWATCH.png")
@@ -1331,10 +1300,11 @@ msg_list_t.set_size(240, 270)
 msg_list_t.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
 msg_list_t.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-heartrate_done_img = lv.img(msg_list_t)
-heartrate_done_img.set_pos(53, 0)
-heartrate_done_img.set_size(134, 117)
-heartrate_done_img.set_src("E:/static/IMAGE_NOTICE_NONE.jpg")
+msg_list_t_done_img = lv.img(msg_list_t)
+msg_list_t_done_img.set_pos(53, 20)
+msg_list_t_done_img.set_size(134, 117)
+msg_list_t_done_img.set_src("E:/static/IMAGE_NOTICE_NONE.jpg")
+msg_list_t_done_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 no_msg_text = lv.label(msg_list_t)
 no_msg_text.set_pos(0, 200)
@@ -3325,7 +3295,44 @@ class UIFINDScreen(Screen):
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
  
+Lowpower_screen = lv.obj()
+Lowpower_screen.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+# add style for watchface
+Lowpower_screen.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT)
+#进入图片
+Lowpower_screen_img = lv.img(Lowpower_screen)
+Lowpower_screen_img.set_pos(int(40),int(45))
+Lowpower_screen_img.set_size(160,230)
+Lowpower_screen_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+Lowpower_screen_img.add_flag(lv.obj.FLAG.CLICKABLE)
+Lowpower_screen_img.set_src("E:/static/low_power.png")
+Lowpower_screen_img.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT)
+class LowPowerScreen(Screen):
+    NAME = "LOW_POWER"
+    def __init__(self):
+        super().__init__()
+        self.meta = Lowpower_screen
+
+    def done_left_to_right(self):
+        
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+    def done_right_to_left(self):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+    def done_bottom_to_top(self):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+    def done_top_to_bottom(self):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+    def done_return(self):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+    def done_click(self):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+
+    def btn1_release(self):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
+    def btn8_press(self):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+ 
 #from usr.ui_WatchFaceScreen import WatchFaceScreen
 class UI(object):
     def __init__(self):
index 289cbcc..7ea8f49 100644 (file)
@@ -315,40 +315,36 @@ watchface2_time2_min2_text.set_text("0")
 watchface2_time2_min2_text.add_style(style_font_youyuan_70_red, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 # create style watchface2_style_default
+# watchface2_style_default = lv.style_t()
+# watchface2_style_default.init()
+# watchface2_style_default.set_radius(0)
+# watchface2_style_default.set_bg_color(lv.color_make(0x21,0x95,0xf6))
+# watchface2_style_default.set_bg_grad_color(lv.color_make(0x21,0x95,0xf6))
+# watchface2_style_default.set_bg_grad_dir(lv.GRAD_DIR.NONE)
+# watchface2_style_default.set_bg_opa(0)
+# watchface2_style_default.set_border_color(lv.color_make(0x00,0x00,0x00))
+# watchface2_style_default.set_border_width(0)
+# watchface2_style_default.set_border_opa(255)
+# watchface2_style_default.set_pad_left(0)
+# watchface2_style_default.set_pad_right(0)
+# watchface2_style_default.set_pad_top(0)
+# watchface2_style_default.set_pad_bottom(0)
+# watchface2_style_default.set_text_font_v2("font_22.bin",22,0) #将外部字体库与该style对象绑定
+
 watchface2_style_default = lv.style_t()
 watchface2_style_default.init()
-watchface2_style_default.set_radius(0)
-watchface2_style_default.set_bg_color(lv.color_make(0x21,0x95,0xf6))
-watchface2_style_default.set_bg_grad_color(lv.color_make(0x21,0x95,0xf6))
-watchface2_style_default.set_bg_grad_dir(lv.GRAD_DIR.NONE)
-watchface2_style_default.set_bg_opa(0)
-watchface2_style_default.set_border_color(lv.color_make(0x00,0x00,0x00))
-watchface2_style_default.set_border_width(0)
-watchface2_style_default.set_border_opa(255)
-watchface2_style_default.set_pad_left(0)
-watchface2_style_default.set_pad_right(0)
-watchface2_style_default.set_pad_top(0)
-watchface2_style_default.set_pad_bottom(0)
-watchface2_style_default.set_text_font_v2("font_22.bin",22,0) #将外部字体库与该style对象绑定
+watchface2_style_default.set_text_color(lv.color_make(0xff, 0xff, 0xff))
+watchface2_style_default.set_text_font_v2("font_22.bin",22,0)
 
 
 #日期
-watchface2_date = lv.spangroup(Watchface2)
-watchface2_date.set_pos(int(30+56+20+56),int(100))
-watchface2_date.set_size(84,25)
-watchface2_date.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-watchface2_date.set_align(lv.TEXT_ALIGN.LEFT)
-watchface2_date.set_overflow(lv.SPAN_OVERFLOW.CLIP)
-watchface2_date.set_mode(lv.SPAN_MODE.BREAK)
-watchface2_date_span = watchface2_date.new_span()
-watchface2_date_span.set_text("12月9")
-watchface2_date_span.style.set_text_color(lv.color_make(0xe0,0xd7,0xd7))
-watchface2_date_span.style.set_text_decor(lv.TEXT_DECOR.NONE)
-watchface2_date_span.style.set_size(100)
-watchface2_date.refr_mode()
-
-# add style for main_style_1_spangroup_date
-watchface2_date.add_style(watchface2_style_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+watchface2_date_span = lv.label(Watchface2)
+watchface2_date_span.set_pos(30+56+20+56, 100)
+watchface2_date_span.set_size(84, 35)
+watchface2_date_span.set_align(lv.TEXT_ALIGN.LEFT)
+watchface2_date_span.set_text("12月9日")
+watchface2_date_span.add_style(style_font_youyuan_20, lv.PART.MAIN|lv.STATE.DEFAULT)
+
 #星期
 
 
@@ -383,23 +379,12 @@ watchface2_temp_txt.set_align(lv.TEXT_ALIGN.LEFT)
 watchface2_temp_txt.set_text("00")
 watchface2_temp_txt.add_style(style_font_youyuan_20, lv.PART.MAIN|lv.STATE.DEFAULT)
 
-
-watchface2_no_temp_txt = lv.spangroup(Watchface2)
-watchface2_no_temp_txt.set_pos(int(30+56+56+20),int(176))
-watchface2_no_temp_txt.set_size(80,30)
-watchface2_no_temp_txt.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+watchface2_no_temp_txt = lv.label(Watchface2)
+watchface2_no_temp_txt.set_pos(30+56+56+20, 176)
+watchface2_no_temp_txt.set_size(80, 35)
 watchface2_no_temp_txt.set_align(lv.TEXT_ALIGN.LEFT)
-watchface2_no_temp_txt.set_overflow(lv.SPAN_OVERFLOW.CLIP)
-watchface2_no_temp_txt.set_mode(lv.SPAN_MODE.BREAK)
-watchface2_no_temp_span = watchface2_no_temp_txt.new_span()
-watchface2_no_temp_span.set_text("无数据")
-watchface2_no_temp_span.style.set_text_color(lv.color_make(0xee,0xe7,0xe7))
-watchface2_no_temp_span.style.set_text_decor(lv.TEXT_DECOR.NONE)
-#watchface2_week_step_span.style.set_text_font(lv.font_harmony_19)
-watchface2_no_temp_txt.refr_mode()
-watchface2_no_temp_txt.add_flag(lv.obj.FLAG.HIDDEN)
-# add style for main_style_1_spangroup_week
-watchface2_no_temp_txt.add_style(watchface2_style_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+watchface2_no_temp_txt.set_text("无数据")
+watchface2_no_temp_txt.add_style(style_font_youyuan_20, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 class WatchFace2():
     NAME = "Watchface2"
@@ -441,6 +426,9 @@ class WatchFace2():
                     self.__weather_value(None,None)
                 else:
                    self.__weather_value(None,temp)
+            else:
+                self.__weather_type(None,None)
+                self.__weather_value(None,None)
         else:
             self.__weather_type(None,None)
             self.__weather_value(None,None)
@@ -477,6 +465,9 @@ class WatchFace2():
                     self.__weather_value(None,None)
                 else:
                    self.__weather_value(None,temp)
+            else:
+                self.__weather_type(None,None)
+                self.__weather_value(None,None)
         else:
             self.__weather_type(None,None)
             self.__weather_value(None,None)
index 145b9d9..23a48fd 100644 (file)
@@ -84,6 +84,10 @@ style_btn.set_border_width(0)
 
     
 
+style_font_youyuan_font_60 = lv.style_t()
+style_font_youyuan_font_60.init()
+style_font_youyuan_font_60.set_text_color(lv.color_make(0xFF, 0xFF, 0xFF))
+style_font_youyuan_font_60.set_text_font(lv.font_60_main_menu)
 
 MainMenu2 = lv.obj()
 MainMenu2_til = lv.tileview(MainMenu2)
@@ -101,6 +105,14 @@ label_text = lv.label(MainMenu2_alipay)
 label_text.set_pos(0, 240)
 label_text.set_size(0, 0)
 label_text.set_text("1")
+MainMenu2_img_alipay_text = lv.label(MainMenu2_alipay)
+MainMenu2_img_alipay_text.set_pos(int(0),int(220))
+MainMenu2_img_alipay_text.set_size(240,100)
+MainMenu2_img_alipay_text.add_flag(lv.obj.FLAG.CLICKABLE)
+MainMenu2_img_alipay_text.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+MainMenu2_img_alipay_text.set_text("支付宝")
+MainMenu2_img_alipay_text.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
+
 MainMenu2_img_alipay = lv.img(MainMenu2_alipay)
 MainMenu2_img_alipay.set_size(160,160)
 MainMenu2_img_alipay.set_pos(40,20)
@@ -108,12 +120,7 @@ MainMenu2_img_alipay.set_src("E:/static/main_menu/main_menu2/alipay_.png")
 MainMenu2_img_alipay.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_alipay.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-MainMenu2_img_alipay_text = lv.img(MainMenu2_alipay)
-MainMenu2_img_alipay_text.set_size(160,39)
-MainMenu2_img_alipay_text.set_pos(40,210)
-MainMenu2_img_alipay_text.set_src("E:/static/main_menu/main_menu2/alipay_TEXT.png")
-MainMenu2_img_alipay_text.add_flag(lv.obj.FLAG.CLICKABLE)
-MainMenu2_img_alipay_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+
 # label_alipay.set_long_mode(lv.label.LONG.WRAP)
 # label_alipay.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 # label_alipay.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -130,12 +137,13 @@ MainMenu2_img_phone.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CALL.
 MainMenu2_img_phone.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_phone.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-MainMenu2_img_phone_text = lv.img(MainMenu2_phone)
-MainMenu2_img_phone_text.set_size(160,39)
-MainMenu2_img_phone_text.set_pos(40,210)
-MainMenu2_img_phone_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CALL_TEXT.png")
+MainMenu2_img_phone_text = lv.label(MainMenu2_phone)
+MainMenu2_img_phone_text.set_pos(int(0),int(220))
+MainMenu2_img_phone_text.set_size(240,100)
 MainMenu2_img_phone_text.add_flag(lv.obj.FLAG.CLICKABLE)
-MainMenu2_img_phone_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+MainMenu2_img_phone_text.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+MainMenu2_img_phone_text.set_text("拨号盘")
+MainMenu2_img_phone_text.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 
 #通讯录
@@ -151,12 +159,13 @@ MainMenu2_img_contacts.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CO
 MainMenu2_img_contacts.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_contacts.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-MainMenu2_img_contacts_text = lv.img(MainMenu2_contacts)
-MainMenu2_img_contacts_text.set_size(160,39)
-MainMenu2_img_contacts_text.set_pos(40,210)
-MainMenu2_img_contacts_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CONTACTS_TEXT.png")
-MainMenu2_img_contacts_text.add_flag(lv.obj.FLAG.CLICKABLE)
-MainMenu2_img_contacts_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+MainMenu2_img_contacts_txt = lv.label(MainMenu2_contacts)
+MainMenu2_img_contacts_txt.set_pos(int(0),int(220))
+MainMenu2_img_contacts_txt.set_size(240,100)
+MainMenu2_img_contacts_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+MainMenu2_img_contacts_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+MainMenu2_img_contacts_txt.set_text("联系人")
+MainMenu2_img_contacts_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 
 #心律检测
@@ -172,12 +181,13 @@ MainMenu2_img_heartrate.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_H
 MainMenu2_img_heartrate.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_heartrate.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-MainMenu2_img_heartrate_text = lv.img(MainMenu2_heartrate)
-MainMenu2_img_heartrate_text.set_size(160,39)
-MainMenu2_img_heartrate_text.set_pos(40,210)
-MainMenu2_img_heartrate_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_HEART_RATE_HEALTH_DETECT_TEXT.png")
-MainMenu2_img_heartrate_text.add_flag(lv.obj.FLAG.CLICKABLE)
-MainMenu2_img_heartrate_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+MainMenu2_img_heartrate_txt = lv.label(MainMenu2_heartrate)
+MainMenu2_img_heartrate_txt.set_pos(int(0),int(220))
+MainMenu2_img_heartrate_txt.set_size(240,100)
+MainMenu2_img_heartrate_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+MainMenu2_img_heartrate_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+MainMenu2_img_heartrate_txt.set_text("心率检测")
+MainMenu2_img_heartrate_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 
 #血样检测
@@ -193,12 +203,13 @@ MainMenu2_img_spo2.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SPO2_D
 MainMenu2_img_spo2.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_spo2.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-MainMenu2_img_spo2_text = lv.img(MainMenu2_spo2)
-MainMenu2_img_spo2_text.set_size(160,39)
-MainMenu2_img_spo2_text.set_pos(40,210)
-MainMenu2_img_spo2_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SPO2_DETECT_TEXT.png")
-MainMenu2_img_spo2_text.add_flag(lv.obj.FLAG.CLICKABLE)
-MainMenu2_img_spo2_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+MainMenu2_img_spo2_txt = lv.label(MainMenu2_spo2)
+MainMenu2_img_spo2_txt.set_pos(int(0),int(220))
+MainMenu2_img_spo2_txt.set_size(240,100)
+MainMenu2_img_spo2_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+MainMenu2_img_spo2_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+MainMenu2_img_spo2_txt.set_text("血氧检测")
+MainMenu2_img_spo2_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 
 #工具箱
@@ -214,12 +225,13 @@ MainMenu2_img_toolbox.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TOO
 MainMenu2_img_toolbox.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_toolbox.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-MainMenu2_img_toolbox_text = lv.img(MainMenu2_toolbox)
-MainMenu2_img_toolbox_text.set_size(160,39)
-MainMenu2_img_toolbox_text.set_pos(40,210)
-MainMenu2_img_toolbox_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TOOLS_TEXT.png")
-MainMenu2_img_toolbox_text.add_flag(lv.obj.FLAG.CLICKABLE)
-MainMenu2_img_toolbox_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+MainMenu2_img_toolbox_txt = lv.label(MainMenu2_toolbox)
+MainMenu2_img_toolbox_txt.set_pos(int(0),int(220))
+MainMenu2_img_toolbox_txt.set_size(240,100)
+MainMenu2_img_toolbox_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+MainMenu2_img_toolbox_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+MainMenu2_img_toolbox_txt.set_text("工具箱")
+MainMenu2_img_toolbox_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 
 #设置
@@ -235,12 +247,13 @@ MainMenu2_img_setting.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SET
 MainMenu2_img_setting.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_setting.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-MainMenu2_img_setting_text = lv.img(MainMenu2_setting)
-MainMenu2_img_setting_text.set_size(160,39)
-MainMenu2_img_setting_text.set_pos(40,210)
-MainMenu2_img_setting_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SETTINGS_TEXT.png")
-MainMenu2_img_setting_text.add_flag(lv.obj.FLAG.CLICKABLE)
-MainMenu2_img_setting_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+MainMenu2_img_setting_txt = lv.label(MainMenu2_setting)
+MainMenu2_img_setting_txt.set_pos(int(0),int(220))
+MainMenu2_img_setting_txt.set_size(240,100)
+MainMenu2_img_setting_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+MainMenu2_img_setting_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+MainMenu2_img_setting_txt.set_text("设置")
+MainMenu2_img_setting_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 
 #体温测量
@@ -256,12 +269,13 @@ MainMenu2_img_temperature.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE
 MainMenu2_img_temperature.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_temperature.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-MainMenu2_img_temperature_text = lv.img(MainMenu2_temperature)
-MainMenu2_img_temperature_text.set_size(160,39)
-MainMenu2_img_temperature_text.set_pos(40,210)
-MainMenu2_img_temperature_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TEMPERATURE_TEXT.png")
-MainMenu2_img_temperature_text.add_flag(lv.obj.FLAG.CLICKABLE)
-MainMenu2_img_temperature_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+MainMenu2_img_temperature_txt = lv.label(MainMenu2_temperature)
+MainMenu2_img_temperature_txt.set_pos(int(0),int(220))
+MainMenu2_img_temperature_txt.set_size(240,100)
+MainMenu2_img_temperature_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+MainMenu2_img_temperature_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+MainMenu2_img_temperature_txt.set_text("体温测量")
+MainMenu2_img_temperature_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 
 #微聊
@@ -277,12 +291,13 @@ MainMenu2_img_wechat.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_WECH
 MainMenu2_img_wechat.add_flag(lv.obj.FLAG.CLICKABLE)
 MainMenu2_img_wechat.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-MainMenu2_img_wechat_text = lv.img(MainMenu2_wechat)
-MainMenu2_img_wechat_text.set_size(160,39)
-MainMenu2_img_wechat_text.set_pos(40,210)
-MainMenu2_img_wechat_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_WECHAT_TEXT.png")
-MainMenu2_img_wechat_text.add_flag(lv.obj.FLAG.CLICKABLE)
-MainMenu2_img_wechat_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+MainMenu2_img_wechat_txt = lv.label(MainMenu2_wechat)
+MainMenu2_img_wechat_txt.set_pos(int(0),int(220))
+MainMenu2_img_wechat_txt.set_size(240,100)
+MainMenu2_img_wechat_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+MainMenu2_img_wechat_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+MainMenu2_img_wechat_txt.set_text("微聊")
+MainMenu2_img_wechat_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
 
 from ext.ui_WatchFaceScreen import WatchFace
 #主菜单风格2,单页