消息弹窗界面
authord15521469561 <d155214695615@qq.com>
Sun, 23 Apr 2023 01:31:47 +0000 (09:31 +0800)
committerd15521469561 <d155214695615@qq.com>
Sun, 23 Apr 2023 01:31:47 +0000 (09:31 +0800)
36 files changed:
3.code/1.watch/2.code/alarm.py
3.code/1.watch/2.code/appWechat.py
3.code/1.watch/2.code/main.py
3.code/1.watch/2.code/main_1.py
3.code/1.watch/2.code/mgr.py
3.code/1.watch/2.code/protocol.py
3.code/1.watch/2.code/static/IMAGE_HEART_ONLY_REDETECT.jpg [deleted file]
3.code/1.watch/2.code/static/IMAGE_SPO2_ONLY_REDETECT.jpg [deleted file]
3.code/1.watch/2.code/static/alarm_play.mp3 [new file with mode: 0644]
3.code/1.watch/2.code/static/low_power.png [new file with mode: 0644]
3.code/1.watch/2.code/static/tool/sms_setting.png [new file with mode: 0644]
3.code/1.watch/2.code/static/watch_plate/style_1/time/0.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_1/time/1.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_1/time/2.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_1/time/3.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_1/time/4.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_1/time/5.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_1/time/6.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_1/time/7.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_1/time/8.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_1/time/9.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_1/time/colon.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_2/time/0.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_2/time/1.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_2/time/2.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_2/time/3.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_2/time/4.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_2/time/5.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_2/time/6.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_2/time/7.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_2/time/8.png [deleted file]
3.code/1.watch/2.code/static/watch_plate/style_2/time/9.png [deleted file]
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
3.code/1.watch/2.code/ui_setting.py

index 02dc74b..cdf909a 100644 (file)
@@ -639,18 +639,31 @@ class PopupAlarmScreen(Screen):
         self.meta = popup_alarm_screen
         self.timer = osTimer()
         self.aud = audio.Audio(0)
+        self.alarm_count = 0
 
     def initialization(self):
-        self.timer.start(10*1000,0,self.exit_alarm_page)
+        self.alarm_count = 0
+        self.timer.start(3*1000,1,self.exit_alarm_page)
         time = EventMesh.publish("screen_get_time")#获取系统时间
         popup_alarm_time.set_text("{}:{}".format(time[0][0],time[0][1]))
-        self.aud.play(1, 0, 'E:/static/audio_audio_haixiu.mp3')  #播放声音
+
 
     def Close(self):
+        self.alarm_count=0
+        self.timer.stop()
         self.aud.stop()
 
     def exit_alarm_page(self,*arges):
-        EventMesh.publish("load_screen", {"screen": "main_menu"})
+        self.alarm_count+=1
+        if self.alarm_count > 10:
+            self.alarm_count = 0
+            self.aud.stop()
+            self.timer.stop()
+            EventMesh.publish("load_screen", {"screen": "main_menu"})
+            return
+        self.aud.play(1, 1, 'E:/static/audio_audio_haixiu.mp3')  #播放声音
+    
+    
 
     def done_left_to_right(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
index 631161c..dbf4b6f 100644 (file)
@@ -135,6 +135,9 @@ class WechatScreen(Screen):
         EventMesh.subscribe("wechat_updata_list_show", self.wechat_updata_list_show)
         EventMesh.subscribe("get_wechat_data", self.get_wechat_data)
         EventMesh.subscribe("set_wechat_data", self.set_wechat_data)
+
+        EventMesh.subscribe("get_aduio_state", self.get_aduio_state)
+
         self.countdown = 1
         self.count_img = 0
         self.play_img_cnt = None
@@ -165,6 +168,7 @@ class WechatScreen(Screen):
             wechat_label.set_text("接收中")
             self.updata_list_show(2)
             self.timer.start(1 * 1000, 0, self.reciving)
+    
            
 
 
@@ -179,7 +183,7 @@ class WechatScreen(Screen):
                 self.startWidth = 0
                 self.startY = 0
                 i = 0
-                # print("self.wechat_recode_list:{}".format(self.wechat_recode_list))
+                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)
@@ -190,18 +194,34 @@ class WechatScreen(Screen):
                 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
+                    
+                    # 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:
+                        
+                        print('键存在于字典中')
+                    else:
+                        if count > 0:
+                            count-=1
+                        continue
+                        print('键不存在于字典中')
+                   
                     value = self.wechat_recode_list[key]
-                    self.startY = 52*i 
+                    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)
@@ -265,7 +285,7 @@ class WechatScreen(Screen):
                             _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)    
 
@@ -296,7 +316,7 @@ class WechatScreen(Screen):
         if self.wechat_num >= self.MXA_MSG:
             self.wechat_num = 0 
         self.wechat_num += 1 
-        # print("talking self.wechat_num ...:{}".format(self.wechat_num))
+        print("talking self.wechat_num ...:{}".format(self.wechat_num))
         self.record_test.start("/ext/static/storage_file/{}.amr".format(self.wechat_num),16) 
         self.second_timer.start(1000, 1, self.reduce_second)
         self.press_state = 1
@@ -328,8 +348,7 @@ class WechatScreen(Screen):
             with open("/ext/static/storage_file/wechat_num.txt","w") as fd:
                 fd.write(str(self.wechat_num))
             #读音频amr二进制数据
-            self.timer.start(2 * 1000, 0, self.hide_label)
-            #print("self.countdown :{}".format(self.countdown))
+            
             #修改或添加词典键值
         
             with open("/ext/static/storage_file/wechat_record.json","w",encoding="utf-8") as fd:
@@ -342,10 +361,11 @@ class WechatScreen(Screen):
                 senddata = [self.countdown_old,buf]
                 EventMesh.publish(constants.PROTOCOL.TK_SEND,senddata)
             #隐藏显示文本 显示列表显示框
-    
+            self.timer.start(2 * 1000, 0, self.hide_label)
             self.updata_list_show(2)
             self.press_state = 0
 
+
     def play_img_cb(self,*args):
         # print("self.count_img :{} self.play_text:{}".format(self.count_img,self.play_text))
         self.count_img+=1
@@ -405,7 +425,7 @@ class WechatScreen(Screen):
         if self.play_text == "R:" or self.play_text == "S:":#过滤掉文字显示 不需要播放音频文件
             self.aud = audio.Audio(0)
             self.aud.stop()#
-            self.aud.play(1, 0, '/ext/static/storage_file/{}.amr'.format(i))  #文件名前面要加上路径
+            self.aud.play(1, 1, '/ext/static/storage_file/{}.amr'.format(i))  #文件名前面要加上路径
 
     #松手2秒后发送数据
     def hide_label(self,*args):
@@ -413,6 +433,10 @@ class WechatScreen(Screen):
         wechat_label.set_text(" ")
         self.updata_list_show(0)
 
+     #获取是否在录音
+    def get_aduio_state(self, event, msg): 
+        return self.press_state
+
 
     def Close(self):
         self.play_timer.stop()
@@ -439,6 +463,58 @@ class WechatScreen(Screen):
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
+#微聊弹窗
+
+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"})
+
+
+
 
 
 class TK_ProtoCol(ProtoCol):
@@ -497,14 +573,23 @@ class TK_ProtoCol(ProtoCol):
             get_wechat_data = EventMesh.publish("get_wechat_data")
             wechat_num = get_wechat_data[1]
             MXA_MSG = get_wechat_data[0]
+            print("wechat_num ...:{}".format(wechat_num))
             wechat_recode_list = get_wechat_data[2]
+            if wechat_num > 0:
+                wechat_num += 1 
             if wechat_num >= MXA_MSG:
                 wechat_num = 0 
-            wechat_num += 1 
+            if wechat_num == 0:
+                wechat_num += 1 
+           
             #写记录列表
             wechat_recode_list["%02d"%(wechat_num)] = "R:{}".format(3)
             EventMesh.publish("set_wechat_data",[MXA_MSG,wechat_num,wechat_recode_list])
             #写语音文件数据
+            get_aduio_state=EventMesh.publish("get_aduio_state")
+            if get_aduio_state != 1:
+                pass
+                # EventMesh.publish("load_screen", {"screen": "wechat_popup"})
             EventMesh.publish("wechat_updata_list_show")
             # path = "/ext/static/storage_file/audio_amr/amr/{}.amr".format(wechat_num)
             path = "/ext/static/storage_file/{}.amr".format(wechat_num)
@@ -570,9 +655,12 @@ class MESSAGE_ProtoCol(ProtoCol):
         wechat_num = get_wechat_data[1]
         MXA_MSG = get_wechat_data[0]
         wechat_recode_list = get_wechat_data[2]
+        if wechat_num > 0:
+            wechat_num += 1 
         if wechat_num >= MXA_MSG:
             wechat_num = 0 
-        wechat_num += 1 
+        if wechat_num == 0:
+            wechat_num += 1 
         msg_txt = {}
         # 0 1 2 3
         # print("msg_tmp:init {}".format(msg_s))
@@ -582,6 +670,10 @@ class MESSAGE_ProtoCol(ProtoCol):
         EventMesh.publish("set_wechat_data",[MXA_MSG,wechat_num,wechat_recode_list])
         # print("wechat_recode_list:len data:{}".format(wechat_recode_list))
         EventMesh.publish(constants.PROTOCOL.MESSAGE_SEND)
+        get_aduio_state=EventMesh.publish("get_aduio_state")
+        if get_aduio_state != 1:
+            pass
+            # EventMesh.publish("load_screen", {"screen": "wechat_popup"})
         EventMesh.publish("wechat_updata_list_show")
             
       
index 2f635a7..64acbb0 100644 (file)
@@ -50,14 +50,14 @@ if __name__ == '__main__':
     from ext.protocol import LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,WT_ProtoCol,UD_ProtoCol,REMIND_ProtoCol, CR_ProtoCol,KA_ProtoCol,FIND_ProtoCol,POWEROFF_ProtoCol,ProtoColResolver,PHL_ProtoCol
     import ext.mgr as mgr
     import ext.ui as _ui
-    from ext.mgr import ConfigStoreManager, LocationManager, SockManager, \
+    from ext.mgr import ConfigStoreManager, LocationManager, SockManager,getVolumSizeManager, \
     NetManager,AddrBookManager,MsgdetailManager,PhoneCallingManager,getOldHrDataManager,getStorageDataManager,getBrightnessManager,getHrTimeManager
     from ext.appAlipay import Alipay ,AlipayOpenScreen,Alipay_1_1,Alipay_invite,Alipay_inviting,\
     Alipay_success,Alipay_paycode,Alipay_pay_success,Alipay_collect,Alipay_parent
     # from ext.ui_WatchFaceScreen import WatchFaceScreen
     from ext.alarm import ClkListScreen,ClockManager,NewEditClk,CLKTimeScreen,ClkPeriod,PopupAlarmScreen
     from ext.ui_main_menu import MainMenuScreen
-    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,\
@@ -124,6 +124,9 @@ if __name__ == '__main__':
     ui.add_screen(FactoryModeLocationScreen())
     ui.add_screen(FactoryModeScreen())
     ui.add_screen(PopupAlarmScreen())
+    ui.add_screen(_ui.LowPowerScreen())
+    ui.add_screen(_ui.NewMessageScreen())
+    ui.add_screen(NewWechatPopupScreen())
     # ui.add_screen(_ui.Setting3Screen())  
 
 
@@ -153,6 +156,7 @@ if __name__ == '__main__':
     app.append_manager(getHrTimeManager())
     app.append_manager(getBrightnessManager())
     app.append_manager(getStorageDataManager())
+    app.append_manager(getVolumSizeManager())
         
     pcr = ProtoColResolver()
     pcr.add_support(LK_ProtoCol())
index 2f635a7..8b02cee 100644 (file)
@@ -50,14 +50,14 @@ if __name__ == '__main__':
     from ext.protocol import LK_ProtoCol,PING_ProtoCol,HEART_ProtoCol,OXYGEN_ProtoCol,OXYGEN_One_ProtoCol,HRSTART_ProtoCol,WT_ProtoCol,UD_ProtoCol,REMIND_ProtoCol, CR_ProtoCol,KA_ProtoCol,FIND_ProtoCol,POWEROFF_ProtoCol,ProtoColResolver,PHL_ProtoCol
     import ext.mgr as mgr
     import ext.ui as _ui
-    from ext.mgr import ConfigStoreManager, LocationManager, SockManager, \
+    from ext.mgr import ConfigStoreManager, LocationManager, SockManager,getVolumSizeManager, \
     NetManager,AddrBookManager,MsgdetailManager,PhoneCallingManager,getOldHrDataManager,getStorageDataManager,getBrightnessManager,getHrTimeManager
     from ext.appAlipay import Alipay ,AlipayOpenScreen,Alipay_1_1,Alipay_invite,Alipay_inviting,\
     Alipay_success,Alipay_paycode,Alipay_pay_success,Alipay_collect,Alipay_parent
     # from ext.ui_WatchFaceScreen import WatchFaceScreen
     from ext.alarm import ClkListScreen,ClockManager,NewEditClk,CLKTimeScreen,ClkPeriod,PopupAlarmScreen
     from ext.ui_main_menu import MainMenuScreen
-    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,\
@@ -105,6 +105,7 @@ if __name__ == '__main__':
     ui.add_screen(_ui_setting.MsgvolumeScreen()) 
     ui.add_screen(_ui_setting.PhoneringScreen()) 
     ui.add_screen(_ui_setting.totalvolumeScreen()) 
+    ui.add_screen(_ui_setting.PoweroffConfirmScreen()) 
     ui.add_screen(_ui.DialingScreen()) 
     ui.add_screen(_ui.CallLogScreen()) 
     ui.add_screen(AlipayOpenScreen()) 
@@ -124,6 +125,9 @@ if __name__ == '__main__':
     ui.add_screen(FactoryModeLocationScreen())
     ui.add_screen(FactoryModeScreen())
     ui.add_screen(PopupAlarmScreen())
+    ui.add_screen(_ui.LowPowerScreen())
+    ui.add_screen(_ui.NewMessageScreen())
+    ui.add_screen(NewWechatPopupScreen())
     # ui.add_screen(_ui.Setting3Screen())  
 
 
@@ -153,6 +157,7 @@ if __name__ == '__main__':
     app.append_manager(getHrTimeManager())
     app.append_manager(getBrightnessManager())
     app.append_manager(getStorageDataManager())
+    app.append_manager(getVolumSizeManager())
         
     pcr = ProtoColResolver()
     pcr.add_support(LK_ProtoCol())
index e904384..d62fa1a 100644 (file)
@@ -510,6 +510,8 @@ class DeviceInfoManager(Abstract):
         self.HR_OneTime = 0
         self.Hr_Need_Open = 0
         self.Spo2_Need_Open = 0
+        self.bat_time = 0
+
         self.old_time = 0
         self.UD_time = 0
         self.UD_timeout = 7*60
@@ -609,7 +611,13 @@ class DeviceInfoManager(Abstract):
         self.get_spo2_state = EventMesh.publish("get_spo2_state")
         # print("hr_time:{} get_hr_state:{} get_spo2_state:{}".format(hr_time,self.get_hr_state,self.get_spo2_state))
         
-          
+        battery = EventMesh.publish("screen_get_battery")
+        self.bat_time+=10
+        if self.bat_time > 5*60:
+            self.bat_time = 0
+            if battery == 20:
+                EventMesh.publish("load_screen", {"screen": "low_power"})
+            
            
         if hr_time != None:
             # print("hr......01....{}\r\n".format(hr_time))
@@ -1567,6 +1575,7 @@ class getWeatherDataManager(Abstract):
         EventMesh.subscribe("set_weather_data", self.set)
 
     def get(self, event, msg):
+        # print("self.type:{} self.temp:{} ".format(self.type,self.temp))
         return [self.date,self.time,self.content,self.type,self.temp,self.min_temp,self.max_temp,self.city,self.no_data]
 
     def set(self, event, msg):
@@ -1579,6 +1588,8 @@ class getWeatherDataManager(Abstract):
         self.max_temp = msg[6]
         self.city = msg[7]
         self.no_data = msg[8]
+        # print("self.date:{} self.time:{} self.content:{} self.type:{} self.temp:{} self.min_temp:{}  self.max_temp:{} self.city:{}".format(self.date,self.time,self.content,self.type,self.temp,self.min_temp,self.max_temp,\
+        #     self.city))
 
 
 class getHrTimeManager(Abstract):
index c7abafc..bc77019 100644 (file)
@@ -87,7 +87,7 @@ class ProtoCol(Abstract):
 
     def handler(self, event, msg):
         self.password = EventMesh.publish(constants.EVENT.GET_PASSWORD)
-        self.imei = "867387060319166"#"867387060319188"#"867387060319177"#"867387060319166"#"860132060004322"#"867387060319166"#EventMesh.publish(constants.EVENT.GET_IMEI)#"860132060004322"#EventMesh.publish(constants.EVENT.GET_IMEI)
+        self.imei = EventMesh.publish(constants.EVENT.GET_IMEI)#"867387060319166"#EventMesh.publish(constants.EVENT.GET_IMEI) #"867387060319166"#EventMesh.publish(constants.EVENT.GET_IMEI) #"867387060319166"#"867387060319188"#"867387060319177"#"867387060319166"#"860132060004322"#"867387060319166"#"860132060004322"#EventMesh.publish(constants.EVENT.GET_IMEI)
         self.cid = EventMesh.publish(constants.EVENT.GET_CID)
         self.imsi = EventMesh.publish(constants.EVENT.GET_IMSI)
         self.key = EventMesh.publish(constants.EVENT.GET_KEY)
@@ -382,7 +382,7 @@ class FIND_ProtoCol(ProtoCol):
         # a = audio.Audio(0)
         # a.set_pa(Pin.GPIO29)
         # a.setVolume(10)
-        # a.play(1, 0, 'E:/audio_audio_haixiu.mp3')  #文件名前面要加上路径
+        # a.play(1, 1, 'E:/audio_audio_haixiu.mp3')  #文件名前面要加上路径
         EventMesh.publish("load_screen", {"screen": "FIND"})
         #print("FIND_ProtoCol:recv:%s"%(msg)) 
 
@@ -492,7 +492,6 @@ class WT_ProtoCol(ProtoCol):
         msg_tmp = msg_tmp[1]
 
         # print("msg_tmp :%s"%(msg_tmp))
-
         msg_date = msg_tmp.split(',')[0]
 
         msg_time = msg_tmp.split(',')[1]
diff --git a/3.code/1.watch/2.code/static/IMAGE_HEART_ONLY_REDETECT.jpg b/3.code/1.watch/2.code/static/IMAGE_HEART_ONLY_REDETECT.jpg
deleted file mode 100644 (file)
index ec55e37..0000000
Binary files a/3.code/1.watch/2.code/static/IMAGE_HEART_ONLY_REDETECT.jpg and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/IMAGE_SPO2_ONLY_REDETECT.jpg b/3.code/1.watch/2.code/static/IMAGE_SPO2_ONLY_REDETECT.jpg
deleted file mode 100644 (file)
index 8c5cc3a..0000000
Binary files a/3.code/1.watch/2.code/static/IMAGE_SPO2_ONLY_REDETECT.jpg and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/alarm_play.mp3 b/3.code/1.watch/2.code/static/alarm_play.mp3
new file mode 100644 (file)
index 0000000..59ede9f
Binary files /dev/null and b/3.code/1.watch/2.code/static/alarm_play.mp3 differ
diff --git a/3.code/1.watch/2.code/static/low_power.png b/3.code/1.watch/2.code/static/low_power.png
new file mode 100644 (file)
index 0000000..d5ffd70
Binary files /dev/null and b/3.code/1.watch/2.code/static/low_power.png differ
diff --git a/3.code/1.watch/2.code/static/tool/sms_setting.png b/3.code/1.watch/2.code/static/tool/sms_setting.png
new file mode 100644 (file)
index 0000000..8af1b34
Binary files /dev/null and b/3.code/1.watch/2.code/static/tool/sms_setting.png differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_1/time/0.png b/3.code/1.watch/2.code/static/watch_plate/style_1/time/0.png
deleted file mode 100644 (file)
index def8e2c..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_1/time/0.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_1/time/1.png b/3.code/1.watch/2.code/static/watch_plate/style_1/time/1.png
deleted file mode 100644 (file)
index 5f40517..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_1/time/1.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_1/time/2.png b/3.code/1.watch/2.code/static/watch_plate/style_1/time/2.png
deleted file mode 100644 (file)
index 149e760..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_1/time/2.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_1/time/3.png b/3.code/1.watch/2.code/static/watch_plate/style_1/time/3.png
deleted file mode 100644 (file)
index 1b66e2b..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_1/time/3.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_1/time/4.png b/3.code/1.watch/2.code/static/watch_plate/style_1/time/4.png
deleted file mode 100644 (file)
index 143e3c0..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_1/time/4.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_1/time/5.png b/3.code/1.watch/2.code/static/watch_plate/style_1/time/5.png
deleted file mode 100644 (file)
index 7cee636..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_1/time/5.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_1/time/6.png b/3.code/1.watch/2.code/static/watch_plate/style_1/time/6.png
deleted file mode 100644 (file)
index d18b208..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_1/time/6.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_1/time/7.png b/3.code/1.watch/2.code/static/watch_plate/style_1/time/7.png
deleted file mode 100644 (file)
index 3b62028..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_1/time/7.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_1/time/8.png b/3.code/1.watch/2.code/static/watch_plate/style_1/time/8.png
deleted file mode 100644 (file)
index 6dbd9f3..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_1/time/8.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_1/time/9.png b/3.code/1.watch/2.code/static/watch_plate/style_1/time/9.png
deleted file mode 100644 (file)
index e88f1b5..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_1/time/9.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_1/time/colon.png b/3.code/1.watch/2.code/static/watch_plate/style_1/time/colon.png
deleted file mode 100644 (file)
index 21eca50..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_1/time/colon.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_2/time/0.png b/3.code/1.watch/2.code/static/watch_plate/style_2/time/0.png
deleted file mode 100644 (file)
index b63f4d3..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_2/time/0.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_2/time/1.png b/3.code/1.watch/2.code/static/watch_plate/style_2/time/1.png
deleted file mode 100644 (file)
index 23ce1cb..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_2/time/1.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_2/time/2.png b/3.code/1.watch/2.code/static/watch_plate/style_2/time/2.png
deleted file mode 100644 (file)
index 7560613..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_2/time/2.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_2/time/3.png b/3.code/1.watch/2.code/static/watch_plate/style_2/time/3.png
deleted file mode 100644 (file)
index 8aa9664..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_2/time/3.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_2/time/4.png b/3.code/1.watch/2.code/static/watch_plate/style_2/time/4.png
deleted file mode 100644 (file)
index 86c53aa..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_2/time/4.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_2/time/5.png b/3.code/1.watch/2.code/static/watch_plate/style_2/time/5.png
deleted file mode 100644 (file)
index 67ee008..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_2/time/5.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_2/time/6.png b/3.code/1.watch/2.code/static/watch_plate/style_2/time/6.png
deleted file mode 100644 (file)
index c028667..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_2/time/6.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_2/time/7.png b/3.code/1.watch/2.code/static/watch_plate/style_2/time/7.png
deleted file mode 100644 (file)
index bc794b9..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_2/time/7.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_2/time/8.png b/3.code/1.watch/2.code/static/watch_plate/style_2/time/8.png
deleted file mode 100644 (file)
index f2580de..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_2/time/8.png and /dev/null differ
diff --git a/3.code/1.watch/2.code/static/watch_plate/style_2/time/9.png b/3.code/1.watch/2.code/static/watch_plate/style_2/time/9.png
deleted file mode 100644 (file)
index b073782..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_2/time/9.png and /dev/null differ
index 84e9afb..7b639de 100644 (file)
@@ -250,6 +250,23 @@ 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_sms = lv.btn(toolbox_cont)
+toolbox_sms.set_pos(0, 120)
+toolbox_sms.set_size(0, 0)
+toolbox_sms_label = lv.label(toolbox_sms)
+toolbox_sms_label.set_text("闹钟")
+toolbox_sms.set_style_pad_all(0, lv.STATE.DEFAULT)
+toolbox_sms_label.align(lv.ALIGN.LEFT_MID, 70, 0)
+toolbox_sms_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+toolbox_sms.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 = lv.btn(toolbox_cont)
 toolbox_countdown.set_pos(0, 180)
 toolbox_countdown.set_size(0, 0)
@@ -260,7 +277,7 @@ 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_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")
@@ -276,7 +293,7 @@ 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")
@@ -541,7 +558,7 @@ msg_detail_cont = lv.label(sms_detail)
 msg_detail_cont.set_pos(0, 50)
 msg_detail_cont.set_size(240, 200)
 msg_detail_cont.set_long_mode(lv.label.LONG.WRAP)
-msg_detail_cont.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+msg_detail_cont.set_style_text_align(lv.TEXT_ALIGN.LEFT, 0)
 msg_detail_cont.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 
@@ -1300,7 +1317,7 @@ class DialingScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 ############短信###############################
 MSG_FLAG = 0
-MSG_MAX = 10 #最大显示短信内容条数
+MSG_MAX = 5 #最大显示短信内容条数
 
 style_sms_bg_btn =  lv.style_t()
 style_sms_bg_btn.init()
@@ -1360,11 +1377,55 @@ no_msg_text.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 def msg_cb(args):
     index = args[1]
     storage = args[2]
-    EventMesh.publish("sms_updata_list_show")
-    #print('New message! storage:{},index:{}'.format(storage, index))
     
+    EventMesh.publish("load_screen", {"screen": "message_popup"})
+
 sms.setCallback(msg_cb)
 
+message_popup_screen = lv.obj()
+message_popup = lv.obj(message_popup_screen)
+message_popup.center()
+message_popup.set_size(240, 320)
+message_popup.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+message_popup_title = lv.label(message_popup)
+message_popup_title.set_pos(0, 150)
+message_popup_title.set_size(240, 40)
+message_popup_title.set_text("你有新的消息")
+message_popup_title.set_long_mode(lv.label.LONG.WRAP)
+message_popup_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+message_popup_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+#信息弹窗
+class NewMessageScreen(Screen):
+    NAME = "message_popup"
+    def __init__(self):
+        super().__init__()
+        self.meta = message_popup_screen
+
+
+    def done_left_to_right(self):
+        EventMesh.publish("load_screen", {"screen": "popup"})
+
+    def done_right_to_left(self):
+        EventMesh.publish("load_screen", {"screen": "popup"})
+
+    def done_bottom_to_top(self):
+        EventMesh.publish("load_screen", {"screen": "popup"})
+
+    def done_top_to_bottom(self):
+        EventMesh.publish("load_screen", {"screen": "popup"})
+
+    def done_return(self):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+    def done_click(self):
+        EventMesh.publish("load_screen", {"screen": "popup"})
+
+    def btn1_release(self):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+
+    def btn8_press(self):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+
 
 
 class PopupScreen(Screen):
@@ -1404,8 +1465,8 @@ class PopupScreen(Screen):
             self.sms_detail_list.set_size(230, 270)
             self.sms_detail_list.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
             self.sms_detail_list.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
-            if self.msg_nums > 10:
-                j = self.msg_nums-10
+            if self.msg_nums > MSG_MAX:
+                j = self.msg_nums-MSG_MAX
             for i in range(MSG_MAX):
                 if count > (MSG_MAX-1):#j = 16 -10 6 7 8 9 10 11 12 13 14 15
                     break
@@ -1505,6 +1566,9 @@ class MsgDetailScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "popup"})
+
+
+
 # -------------------------------------------heartrate screen----------------------------------------------------------
 heartrate_screen = lv.obj()
 heartrate = lv.obj(heartrate_screen)
@@ -1635,15 +1699,17 @@ class ToolboxScreen(Screen):
     def __init__(self):
         super().__init__()
         self.meta = toolbox_screen
-        toolbox_step.add_event_cb(lambda e: self.load_screen(e, {"screen": "step"}), lv.EVENT.CLICKED, None)
-        toolbox_weather.add_event_cb(lambda e: self.load_screen(e, {"screen": "weather"}), lv.EVENT.CLICKED, None)
-        toolbox_alarm.add_event_cb(lambda e: self.load_screen(e, {"screen": "clk_list"}), lv.EVENT.CLICKED, None)
-        toolbox_countdown.add_event_cb(lambda e: self.load_screen(e, {"screen": "countdown"}), lv.EVENT.CLICKED, None)
-        toolbox_stopwatch.add_event_cb(lambda e: self.load_screen(e, {"screen": "stopwatch"}), lv.EVENT.CLICKED, None)
-
+        # toolbox_step.add_event_cb(lambda e: self.load_screen(e, {"screen": "step"}), lv.EVENT.CLICKED, None)
+        # toolbox_weather.add_event_cb(lambda e: self.load_screen(e, {"screen": "weather"}), lv.EVENT.CLICKED, None)
+        # toolbox_alarm.add_event_cb(lambda e: self.load_screen(e, {"screen": "clk_list"}), lv.EVENT.CLICKED, None)
+        # toolbox_sms_img.add_event_cb(lambda e: self.load_screen(e, {"screen": "popup"}), lv.EVENT.CLICKED, None)
+        # toolbox_countdown.add_event_cb(lambda e: self.load_screen(e, {"screen": "countdown"}), lv.EVENT.CLICKED, None)
+        # toolbox_stopwatch.add_event_cb(lambda e: self.load_screen(e, {"screen": "stopwatch"}), lv.EVENT.CLICKED, None)
+        
         toolbox_step_img.add_event_cb(lambda e: self.load_screen(e, {"screen": "step"}), lv.EVENT.CLICKED, None)
         toolbox_weather_img.add_event_cb(lambda e: self.load_screen(e, {"screen": "weather"}), lv.EVENT.CLICKED, None)
         toolbox_alarm_img.add_event_cb(lambda e: self.load_screen(e, {"screen": "clk_list"}), lv.EVENT.CLICKED, None)
+        toolbox_sms_img.add_event_cb(lambda e: self.load_screen(e, {"screen": "popup"}), lv.EVENT.CLICKED, None)
         toolbox_countdown_img.add_event_cb(lambda e: self.load_screen(e, {"screen": "countdown"}), lv.EVENT.CLICKED, None)
         toolbox_stopwatch_img.add_event_cb(lambda e: self.load_screen(e, {"screen": "stopwatch"}), lv.EVENT.CLICKED, None)
 
@@ -1657,10 +1723,6 @@ class ToolboxScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 
-
-
-
-CALL_LOG_MAX = 50
 class IncomingCallScreen(Screen):
     NAME = "incoming_call"
 
@@ -3078,6 +3140,53 @@ class StopwatchScreen(Screen):
        
 
 
+#电量低
+class LowPowerScreen(Screen):
+    NAME = "low_power"
+    def __init__(self):
+        super().__init__()
+        self.FIND_timer = osTimer()
+        self.meta = lv.obj()
+        self.meta.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        # add style for watchface
+        self.meta.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT)
+        #进入图片
+        self.watchface_mpsignal_img = lv.img(self.meta)
+        self.watchface_mpsignal_img.set_pos(int(40),int(45))
+        self.watchface_mpsignal_img.set_size(160,230)
+        self.watchface_mpsignal_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        self.watchface_mpsignal_img.add_flag(lv.obj.FLAG.CLICKABLE)
+        self.watchface_mpsignal_img.set_src("E:/static/low_power.png")
+        self.watchface_mpsignal_img.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT)
+
+    def initialization(self):
+        self.FIND_timer.start(10000, 0, self.FIND_timer_cb)
+        
+    def FIND_timer_cb(self, *args):
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
+
+    def Close(self):
+       self.FIND_timer.stop()
+
+    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"})
 
 
 
@@ -3123,14 +3232,14 @@ class UIFINDScreen(Screen):
 
     def initialization(self):
         self.FIND_timer.start(3000, 1, self.FIND_timer_cb)
-        self.aud.play(1, 0, 'E:/static/audio_audio_haixiu.mp3')  #播放声音
+        self.aud.play(1, 1, 'E:/static/audio_audio_haixiu.mp3')  #播放声音
         
     def post_processor_after_instantiation(self):
         pass
     def post_processor_after_initialization(self):
         pass
     def FIND_timer_cb(self, *args):
-        self.aud.play(1, 0, 'E:/static/audio_audio_haixiu.mp3') 
+        self.aud.play(1, 1, 'E:/static/audio_audio_haixiu.mp3') 
         self.FIND_timer_count += 1
         if self.FIND_timer_count > 40: #120秒
             self.stop_FIND()
@@ -3269,21 +3378,21 @@ class UI(object):
         if event == "done_click":
             self.screen.done_click()
     def btn_press(self, event, key):
-        print("btn_press: {}".format(event))
+        print("btn_press: {} self.main_flag:{} self.sleep_flag:{}".format(event,self.main_flag,self.sleep_flag))
         #主表盘按电源键,息屏
         
         #息屏状态按按钮都亮屏
         
         
-        if self.main_flag != 1 and self.sleep_flag == 0:
+        if  self.sleep_flag == 0:
             self.__lcd_on()
             return
         # if event == "btn1_press":
-        #     self.screen.btn1_press()
+        #      self.screen.btn1_press()
         if event == "btn8_press":
             self.screen.btn8_press()
         if event == "btn8_long_press":
-            Power.powerDown()
+            EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"})
 
     def btn_release(self, event, msg):
         print("btn_release: {}".format(event))
index e6c39bb..57faf56 100644 (file)
@@ -13,6 +13,20 @@ style_font_youyuan_20.init()
 style_font_youyuan_20.set_text_color(lv.color_make(0xff, 0xff, 0xff))
 style_font_youyuan_20.set_text_font_v2("font_22.bin",22,0)
 
+style_font_youyuan_70_black = lv.style_t()
+style_font_youyuan_70_black.init()
+style_font_youyuan_70_black.set_text_color(lv.color_make(0x32, 0xc8, 0xdb))
+style_font_youyuan_70_black.set_text_font(lv.font_70_bold)
+
+style_font_youyuan_70_red = lv.style_t()
+style_font_youyuan_70_red.init()
+style_font_youyuan_70_red.set_text_color(lv.color_make(0xe5, 0x37, 0x29))
+style_font_youyuan_70_red.set_text_font(lv.font_70_bold)
+
+style_font_youyuan_40_red = lv.style_t()
+style_font_youyuan_40_red.init()
+style_font_youyuan_40_red.set_text_color(lv.color_make(0xe5, 0x37, 0x29))
+style_font_youyuan_40_red.set_text_font(lv.font_30_week)
 
 class Watchface1():
     NAME = "Watchface1"
@@ -126,10 +140,7 @@ class Watchface1():
         # create style self.watchface1_style_default
 
 
-        style_font_youyuan_70_black = lv.style_t()
-        style_font_youyuan_70_black.init()
-        style_font_youyuan_70_black.set_text_color(lv.color_make(0x32, 0xc8, 0xdb))
-        style_font_youyuan_70_black.set_text_font(lv.font_70_bold)
+
 
         self.watchface1_time1_text = lv.label(self.meta)
         self.watchface1_time1_text.set_pos(20, 60)
@@ -179,7 +190,7 @@ class Watchface1():
         # self.watchface1_HB_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 
         self.watchface1_HB_span = lv.label(self.meta)
-        self.watchface1_HB_span.set_pos(55, 235)
+        self.watchface1_HB_span.set_pos(60, 235)
         self.watchface1_HB_span.set_size(80, 30)
         self.watchface1_HB_span.set_align(lv.TEXT_ALIGN.LEFT)
         self.watchface1_HB_span.set_text("0")
@@ -195,7 +206,7 @@ class Watchface1():
         # self.watchface1_SPO2_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
         
         self.watchface1_SPO2_span = lv.label(self.meta)
-        self.watchface1_SPO2_span.set_pos(160, 235)
+        self.watchface1_SPO2_span.set_pos(164, 235)
         self.watchface1_SPO2_span.set_size(80, 30)
         self.watchface1_SPO2_span.set_align(lv.TEXT_ALIGN.LEFT)
         self.watchface1_SPO2_span.set_text("0")
@@ -363,94 +374,46 @@ class Watchface2():
         # self.watchface1_bg_img.set_src("E:/static/watch_plate/style_1/bg.png")
         # self.watchface1_bg_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
         #时间
-        x = 30
+        x = 25
         y = 80
-        self.watchface1_time1_img = lv.img(self.meta)
-        self.watchface1_time1_img.set_pos(int(x),int(y))
-        self.watchface1_time1_img.set_size(56,56)
-        self.watchface1_time1_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_time1_img.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.watchface1_time1_img.set_src("E:/static/watch_plate/style_2/time/1.png")
-        self.watchface1_time1_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
-        
-        self.watchface1_time2_img = lv.img(self.meta)
-        self.watchface1_time2_img.set_pos(int(x+60),int(y))
-        self.watchface1_time2_img.set_size(56,56)
-        self.watchface1_time2_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_time2_img.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.watchface1_time2_img.set_src("E:/static/watch_plate/style_2/time/3.png")
-        self.watchface1_time2_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
-
-
-        self.watchface1_time4_img = lv.img(self.meta)
-        self.watchface1_time4_img.set_pos(int(x),int(y+20+56))
-        self.watchface1_time4_img.set_size(56,56)
-        self.watchface1_time4_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_time4_img.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.watchface1_time4_img.set_src("E:/static/watch_plate/style_2/time/2.png")
-        self.watchface1_time4_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
-
-        self.watchface1_time5_img = lv.img(self.meta)
-        self.watchface1_time5_img.set_pos(int(x+60),int(y+20+56))
-        self.watchface1_time5_img.set_size(56,56)
-        self.watchface1_time5_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_time5_img.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.watchface1_time5_img.set_src("E:/static/watch_plate/style_2/time/3.png")
-        self.watchface1_time5_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
-        # create style self.watchface1_style_default
-        self.watchface1_style_default = lv.style_t()
-        self.watchface1_style_default.init()
-        self.watchface1_style_default.set_radius(0)
-        self.watchface1_style_default.set_bg_color(lv.color_make(0x21,0x95,0xf6))
-        self.watchface1_style_default.set_bg_grad_color(lv.color_make(0x21,0x95,0xf6))
-        self.watchface1_style_default.set_bg_grad_dir(lv.GRAD_DIR.NONE)
-        self.watchface1_style_default.set_bg_opa(0)
-        self.watchface1_style_default.set_border_color(lv.color_make(0x00,0x00,0x00))
-        self.watchface1_style_default.set_border_width(0)
-        self.watchface1_style_default.set_border_opa(255)
-        self.watchface1_style_default.set_pad_left(0)
-        self.watchface1_style_default.set_pad_right(0)
-        self.watchface1_style_default.set_pad_top(0)
-        self.watchface1_style_default.set_pad_bottom(0)
-        self.watchface1_style_default.set_text_font_v2("font_22.bin",22,0) #将外部字体库与该style对象绑定
-
-        # self.watchface1_time1_text = lv.label(self.meta)
-        # self.watchface1_time1_text.set_pos(44, 60)
-        # self.watchface1_time1_text.set_size(190, 100)
-        # self.watchface1_time1_text.set_align(lv.TEXT_ALIGN.LEFT)
-        # self.watchface1_time1_text.set_text("12:00")
-        # self.watchface1_time1_text.add_style(style_font_youyuan_70_black, lv.PART.MAIN|lv.STATE.DEFAULT)
-        # self.watchface1_time1 = lv.spangroup(self.meta)
-        # self.watchface1_time1.set_pos(int(24),int(60))
-        # self.watchface1_time1.set_size(216,100)
-        # self.watchface1_time1.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        # self.watchface1_time1.set_overflow(lv.SPAN_OVERFLOW.CLIP)
-        # self.watchface1_time1.set_mode(lv.SPAN_MODE.BREAK)
-        # self.watchface1_time1_span = self.watchface1_time1.new_span()
-        # self.watchface1_time1_span.set_text("12:00")
-        # self.watchface1_time1_span.style.set_text_color(lv.color_make(0x32,0xc8,0xdb))
-        # self.watchface1_time1_span.style.set_text_decor(lv.TEXT_DECOR.NONE)
-        # self.watchface1_time1.refr_mode()
-        # # add style for main_style_1_spangroup_week
-        # self.watchface1_time1.add_style(self.watchface1_styletime_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 
-        #日期
-        self.watchface1_date = lv.spangroup(self.meta)
-        self.watchface1_date.set_pos(int(30+56+20+56),int(100))
-        self.watchface1_date.set_size(84,25)
-        self.watchface1_date.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_date.set_align(lv.TEXT_ALIGN.LEFT)
-        self.watchface1_date.set_overflow(lv.SPAN_OVERFLOW.CLIP)
-        self.watchface1_date.set_mode(lv.SPAN_MODE.BREAK)
-        self.watchface1_date_span = self.watchface1_date.new_span()
+
+        self.watchface1_time1_hour1_text = lv.label(self.meta)
+        self.watchface1_time1_hour1_text.set_pos(40, 80)
+        self.watchface1_time1_hour1_text.set_size(50, 70)
+        self.watchface1_time1_hour1_text.set_align(lv.TEXT_ALIGN.LEFT)
+        self.watchface1_time1_hour1_text.set_text("1")
+        self.watchface1_time1_hour1_text.add_style(style_font_youyuan_70_red, lv.PART.MAIN|lv.STATE.DEFAULT)
+
+        self.watchface1_time1_hour2_text = lv.label(self.meta)
+        self.watchface1_time1_hour2_text.set_pos(90, 80)
+        self.watchface1_time1_hour2_text.set_size(50, 70)
+        self.watchface1_time1_hour2_text.set_align(lv.TEXT_ALIGN.LEFT)
+        self.watchface1_time1_hour2_text.set_text("2")
+        self.watchface1_time1_hour2_text.add_style(style_font_youyuan_70_red, lv.PART.MAIN|lv.STATE.DEFAULT)
+
+        self.watchface1_time2_min1_text = lv.label(self.meta)
+        self.watchface1_time2_min1_text.set_pos(40, 156)
+        self.watchface1_time2_min1_text.set_size(50, 70)
+        self.watchface1_time2_min1_text.set_align(lv.TEXT_ALIGN.LEFT)
+        self.watchface1_time2_min1_text.set_text("0")
+        self.watchface1_time2_min1_text.add_style(style_font_youyuan_70_red, lv.PART.MAIN|lv.STATE.DEFAULT)
+
+        self.watchface1_time2_min2_text = lv.label(self.meta)
+        self.watchface1_time2_min2_text.set_pos(90, 156)
+        self.watchface1_time2_min2_text.set_size(50, 70)
+        self.watchface1_time2_min2_text.set_align(lv.TEXT_ALIGN.LEFT)
+        self.watchface1_time2_min2_text.set_text("0")
+        self.watchface1_time2_min2_text.add_style(style_font_youyuan_70_red, lv.PART.MAIN|lv.STATE.DEFAULT)
+
+
+
+        self.watchface1_date_span = lv.label(self.meta)
+        self.watchface1_date_span.set_pos(30+56+20+56, 100)
+        self.watchface1_date_span.set_size(84, 30)
+        self.watchface1_date_span.set_align(lv.TEXT_ALIGN.LEFT)
         self.watchface1_date_span.set_text("12月9")
-        self.watchface1_date_span.style.set_text_color(lv.color_make(0xe0,0xd7,0xd7))
-        self.watchface1_date_span.style.set_text_decor(lv.TEXT_DECOR.NONE)
-        self.watchface1_date_span.style.set_size(100)
-        self.watchface1_date.refr_mode()
-        
-        # add style for main_style_1_spangroup_date
-        self.watchface1_date.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+        self.watchface1_date_span.add_style(style_font_youyuan_20, lv.PART.MAIN|lv.STATE.DEFAULT)
         #星期
         # self.watchface1_week = lv.spangroup(self.meta)
         # self.watchface1_week.set_pos(int(29),int(166))
@@ -467,13 +430,20 @@ class Watchface2():
         # # add style for main_style_1_spangroup_week
         # self.watchface1_week.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT)
         
-        self.watchface1_week = lv.img(self.meta)
-        self.watchface1_week.set_pos(int(30+15),int(y+20+56+56+30))
-        self.watchface1_week.set_size(90,30)
-        self.watchface1_week.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_week.set_src("E:/static/watch_plate/style_2/week/0_week.png")
-        self.watchface1_week.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+
+        # self.watchface1_week = lv.img(self.meta)
+        # self.watchface1_week.set_pos(int(30+15),int(y+20+56+56+30))
+        # self.watchface1_week.set_size(90,30)
+        # self.watchface1_week.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        # self.watchface1_week.set_src("E:/static/watch_plate/style_2/week/0_week.png")
+        # self.watchface1_week.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
         
+        self.watchface1_week_txt = lv.label(self.meta)
+        self.watchface1_week_txt.set_pos(int(30+15),int(y+20+56+56+30))
+        self.watchface1_week_txt.set_size(120,30)
+        self.watchface1_week_txt.set_align(lv.TEXT_ALIGN.LEFT)
+        self.watchface1_week_txt.set_text("星期四")
+        self.watchface1_week_txt.add_style(style_font_youyuan_40_red, lv.PART.MAIN|lv.STATE.DEFAULT)
 
         
         #天气
@@ -484,37 +454,30 @@ class Watchface2():
         self.watchface1_temp_img.set_src("E:/static/watch_plate/style_2/0_main2_weather.png")
         self.watchface1_temp_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 
-        self.watchface1_temp_degree = lv.img(self.meta)
-        self.watchface1_temp_degree.set_pos(int(x+56+56+65),int(215))
-        self.watchface1_temp_degree.set_size(10,10)
-        self.watchface1_temp_degree.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_temp_degree.set_src("E:/static/watch_plate/style_2/degree.png")
-        self.watchface1_temp_degree.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+        # self.watchface1_temp_degree = lv.img(self.meta)
+        # self.watchface1_temp_degree.set_pos(int(x+56+56+65),int(215))
+        # self.watchface1_temp_degree.set_size(10,10)
+        # self.watchface1_temp_degree.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        # self.watchface1_temp_degree.set_src("E:/static/watch_plate/style_2/degree.png")
+        # self.watchface1_temp_degree.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 
         self.watchface1_temp_txt = lv.label(self.meta)
         self.watchface1_temp_txt.set_pos(int(x+56+56+39),int(215))
         self.watchface1_temp_txt.set_size(240-(x+56+56+34),30)
         self.watchface1_temp_txt.set_align(lv.TEXT_ALIGN.LEFT)
-        self.watchface1_temp_txt.set_text("00")
+        self.watchface1_temp_txt.set_text("00°")
         self.watchface1_temp_txt.add_style(style_font_youyuan_20, lv.PART.MAIN|lv.STATE.DEFAULT)
-       
 
-        self.watchface1_no_temp_txt = lv.spangroup(self.meta)
-        self.watchface1_no_temp_txt.set_pos(int(30+56+56+20),int(176))
-        self.watchface1_no_temp_txt.set_size(80,30)
-        self.watchface1_no_temp_txt.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_no_temp_txt.set_align(lv.TEXT_ALIGN.LEFT)
-        self.watchface1_no_temp_txt.set_overflow(lv.SPAN_OVERFLOW.CLIP)
-        self.watchface1_no_temp_txt.set_mode(lv.SPAN_MODE.BREAK)
-        self.watchface1_no_temp_span = self.watchface1_no_temp_txt.new_span()
+
+       
+        self.watchface1_no_temp_span = lv.label(self.meta)
+        self.watchface1_no_temp_span.set_pos(30+56+56+20, 176)
+        self.watchface1_no_temp_span.set_size(80, 30)
+        self.watchface1_no_temp_span.set_align(lv.TEXT_ALIGN.LEFT)
         self.watchface1_no_temp_span.set_text("无数据")
-        self.watchface1_no_temp_span.style.set_text_color(lv.color_make(0xee,0xe7,0xe7))
-        self.watchface1_no_temp_span.style.set_text_decor(lv.TEXT_DECOR.NONE)
-        #self.watchface1_week_step_span.style.set_text_font(lv.font_harmony_19)
-        self.watchface1_no_temp_txt.refr_mode()
-        self.watchface1_no_temp_txt.add_flag(lv.obj.FLAG.HIDDEN)
-        # add style for main_style_1_spangroup_week
-        self.watchface1_no_temp_txt.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+        self.watchface1_no_temp_span.clear_flag(lv.obj.FLAG.HIDDEN)
+        self.watchface1_no_temp_span.add_style(style_font_youyuan_20, lv.PART.MAIN|lv.STATE.DEFAULT)
+
 
     def initialization(self):    
         #获取信号
@@ -546,6 +509,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)
@@ -577,10 +543,14 @@ class Watchface2():
                     self.__weather_type(None,type)
 
                 temp = self.weather_data[4]
+
                 if temp == None:
                     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)
@@ -591,13 +561,20 @@ class Watchface2():
         hour2_chose = (msg[0][0])%10
         min1_chose = (msg[0][1])//10%10
         min2_chose = (msg[0][1])%10
-        # self.watchface1_time1_text.set_text("{}:{}".format("%02d"%(msg[0][0]),"%02d"%(msg[0][1])))
-        self.watchface1_time1_img.set_src("E:/static/watch_plate/style_2/time/%d.png"%(hour1_chose))
-        self.watchface1_time2_img.set_src("E:/static/watch_plate/style_2/time/%d.png"%(hour2_chose))
-        self.watchface1_time4_img.set_src("E:/static/watch_plate/style_2/time/%d.png"%(min1_chose))
-        self.watchface1_time5_img.set_src("E:/static/watch_plate/style_2/time/%d.png"%(min2_chose))
+        # self.watchface1_time1_text.set_text("{}".format("%02d"%(msg[0][0])))
+        # self.watchface1_time2_text.set_text("{}".format("%02d"%(msg[0][1])))
+        self.watchface1_time1_hour1_text.set_text("{}".format("%d"%(hour1_chose)))
+        self.watchface1_time1_hour2_text.set_text("{}".format("%d"%(hour2_chose)))
+        self.watchface1_time2_min1_text.set_text("{}".format("%d"%(min1_chose)))
+        self.watchface1_time2_min2_text.set_text("{}".format("%d"%(min2_chose)))
+
+        # self.watchface1_time1_img.set_src("E:/static/watch_plate/style_2/time/%d.png"%(hour1_chose))
+        # self.watchface1_time2_img.set_src("E:/static/watch_plate/style_2/time/%d.png"%(hour2_chose))
+        # self.watchface1_time4_img.set_src("E:/static/watch_plate/style_2/time/%d.png"%(min1_chose))
+        # self.watchface1_time5_img.set_src("E:/static/watch_plate/style_2/time/%d.png"%(min2_chose))
         self.watchface1_date_span.set_text(msg[2])#日期
-        self.watchface1_week.set_src("E:/static/watch_plate/style_2/week/%d_week.png"%(msg[5]))   #星期
+        self.watchface1_week_txt.set_text(msg[3])
+        # self.watchface1_week.set_src("E:/static/watch_plate/style_2/week/%d_week.png"%(msg[5]))   #星期
 
     def __signal(self, event, msg):
         #print("__signal_cb:",str(msg))
@@ -623,23 +600,21 @@ class Watchface2():
     def __weather_type(self, event, msg):
         if msg == None:
             self.watchface1_temp_img.add_flag(lv.obj.FLAG.HIDDEN)
-            self.watchface1_no_temp_txt.clear_flag(lv.obj.FLAG.HIDDEN)
+            self.watchface1_no_temp_span.clear_flag(lv.obj.FLAG.HIDDEN)
         else:
             type = int(msg)
-            self.watchface1_no_temp_txt.add_flag(lv.obj.FLAG.HIDDEN)
+            self.watchface1_no_temp_span.add_flag(lv.obj.FLAG.HIDDEN)
             self.watchface1_temp_img.clear_flag(lv.obj.FLAG.HIDDEN)
             self.watchface1_temp_img.set_src("E:/static/watch_plate/style_2/%d_main2_weather.png"%(type))
     
     def __weather_value(self, event, msg):
         if msg == None:
-            self.watchface1_temp_degree.add_flag(lv.obj.FLAG.HIDDEN)
-            self.watchface1_no_temp_txt.clear_flag(lv.obj.FLAG.HIDDEN)
+            # self.watchface1_temp_degree.add_flag(lv.obj.FLAG.HIDDEN)
             self.watchface1_temp_txt.add_flag(lv.obj.FLAG.HIDDEN)
         else:
-            self.watchface1_no_temp_txt.add_flag(lv.obj.FLAG.HIDDEN)
             self.watchface1_temp_txt.clear_flag(lv.obj.FLAG.HIDDEN)
-            self.watchface1_temp_degree.clear_flag(lv.obj.FLAG.HIDDEN)
-            self.watchface1_temp_txt.set_text(str(msg))
+            # self.watchface1_temp_degree.clear_flag(lv.obj.FLAG.HIDDEN)
+            self.watchface1_temp_txt.set_text(str(msg)+"°")
         
 
 
index b64b402..4710755 100644 (file)
@@ -42,6 +42,13 @@ style_btn.init()
 style_btn.set_bg_opa(lv.OPA.TRANSP)
 style_btn.set_shadow_opa(0)
 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)
+
 from ext.ui_WatchFaceScreen import WatchFace
 class MainMenuScreen(Screen):
     NAME = "main_menu"
@@ -51,12 +58,14 @@ class MainMenuScreen(Screen):
         #主菜单
         self.main_menu_list = []
         self.meta = None
+        self.button_state = 0
         self.main_menu_style_num = "MainMenu2"
         self.main_menu_WatchFace = None
         EventMesh.subscribe("watch_top_show", self.watch_top_show)
     def initialization(self):
         print("main_menu INIT !!!!!!!!")
         init_flag = False
+        self.button_state = 0
         if self.main_menu_list == [] : #第一次初始化
             #self.main_menu_list.append( MainMenu1())
             self.main_menu_list.append( MainMenu2())
@@ -105,7 +114,6 @@ class MainMenuScreen(Screen):
 
 
     def done_return(self):
-        id = self.main_menu_style.MainMenu.get_tile_act().get_child(0).get_text()
         self.main_menu_style.MainMenu.set_tile_id(0,1,lv.ANIM.OFF)
        
     def btn1_release(self):
@@ -113,21 +121,24 @@ class MainMenuScreen(Screen):
         if flag == 0:
             EventMesh.publish(constants.EVENT.SYSTEM_UP)
         else:
-            self.main_menu_style.MainMenu.set_tile_id(0,1,lv.ANIM.OFF)
+            if self.main_menu_style.MainMenu.get_tile_act() != None:
+                id = self.main_menu_style.MainMenu.get_tile_act().get_child(0).get_text()
+                if id != "0":
+                    self.main_menu_style.MainMenu.set_tile_id(0,1,lv.ANIM.OFF)
+                
         
     def btn8_press(self):
         flag = EventMesh.publish("get_lcd_state")
         if self.main_menu_style.MainMenu.get_tile_act() != None:
             id = self.main_menu_style.MainMenu.get_tile_act().get_child(0).get_text()
             if id == "0":
-                print("flag {}".format(flag))
                 if flag == 1:
                     EventMesh.publish(constants.EVENT.SYSTEM_SLEEP)
                 else:
                     EventMesh.publish(constants.EVENT.SYSTEM_UP)
             else:
                 if flag == 1:
-                    self.main_menu_style.MainMenu.set_tile_id(0,0,lv.ANIM.OFF)
+                    self.main_menu_style.MainMenu.set_tile_id(0,1,lv.ANIM.OFF)
                 else:
                     EventMesh.publish(constants.EVENT.SYSTEM_UP)
         else:
@@ -384,12 +395,19 @@ class MainMenu2():
         self.MainMenu2_img_alipay.add_flag(lv.obj.FLAG.CLICKABLE)
         self.MainMenu2_img_alipay.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         
-        self.MainMenu2_img_alipay_text = lv.img(self.MainMenu2_alipay)
-        self.MainMenu2_img_alipay_text.set_size(160,39)
-        self.MainMenu2_img_alipay_text.set_pos(40,210)
-        self.MainMenu2_img_alipay_text.set_src("E:/static/main_menu/main_menu2/alipay_TEXT.png")
-        self.MainMenu2_img_alipay_text.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.MainMenu2_img_alipay_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+        self.MainMenu2_img_alipay_txt = lv.label(self.MainMenu2_alipay)
+        self.MainMenu2_img_alipay_txt.set_pos(int(0),int(220))
+        self.MainMenu2_img_alipay_txt.set_size(240,100)
+        self.MainMenu2_img_alipay_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+        self.MainMenu2_img_alipay_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+        self.MainMenu2_img_alipay_txt.set_text("支付宝")
+        self.MainMenu2_img_alipay_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
+        # self.MainMenu2_img_alipay_text = lv.img(self.MainMenu2_alipay)
+        # self.MainMenu2_img_alipay_text.set_size(160,39)
+        # self.MainMenu2_img_alipay_text.set_pos(40,210)
+        # self.MainMenu2_img_alipay_text.set_src("E:/static/main_menu/main_menu2/alipay_TEXT.png")
+        # self.MainMenu2_img_alipay_text.add_flag(lv.obj.FLAG.CLICKABLE)
+        # self.MainMenu2_img_alipay_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         # self.label_alipay.set_long_mode(lv.label.LONG.WRAP)
         # self.label_alipay.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
         # self.label_alipay.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -406,12 +424,19 @@ class MainMenu2():
         self.MainMenu2_img_phone.add_flag(lv.obj.FLAG.CLICKABLE)
         self.MainMenu2_img_phone.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         
-        self.MainMenu2_img_phone_text = lv.img(self.MainMenu2_phone)
-        self.MainMenu2_img_phone_text.set_size(160,39)
-        self.MainMenu2_img_phone_text.set_pos(40,210)
-        self.MainMenu2_img_phone_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CALL_TEXT.png")
-        self.MainMenu2_img_phone_text.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.MainMenu2_img_phone_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+        self.MainMenu2_img_alipay_txt = lv.label(self.MainMenu2_phone)
+        self.MainMenu2_img_alipay_txt.set_pos(int(0),int(220))
+        self.MainMenu2_img_alipay_txt.set_size(240,100)
+        self.MainMenu2_img_alipay_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+        self.MainMenu2_img_alipay_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+        self.MainMenu2_img_alipay_txt.set_text("拨号盘")
+        self.MainMenu2_img_alipay_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
+        # self.MainMenu2_img_phone_text = lv.img(self.MainMenu2_phone)
+        # self.MainMenu2_img_phone_text.set_size(160,39)
+        # self.MainMenu2_img_phone_text.set_pos(40,210)
+        # self.MainMenu2_img_phone_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CALL_TEXT.png")
+        # self.MainMenu2_img_phone_text.add_flag(lv.obj.FLAG.CLICKABLE)
+        # self.MainMenu2_img_phone_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         # self.label_phone = lv.label(self.MainMenu2_phone)
         # self.label_phone.set_pos(0, 240)
         # self.label_phone.set_size(240, 80)
@@ -433,12 +458,19 @@ class MainMenu2():
         self.MainMenu2_img_contacts.add_flag(lv.obj.FLAG.CLICKABLE)
         self.MainMenu2_img_contacts.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         
-        self.MainMenu2_img_contacts_text = lv.img(self.MainMenu2_contacts)
-        self.MainMenu2_img_contacts_text.set_size(160,39)
-        self.MainMenu2_img_contacts_text.set_pos(40,210)
-        self.MainMenu2_img_contacts_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CONTACTS_TEXT.png")
-        self.MainMenu2_img_contacts_text.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.MainMenu2_img_contacts_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+        self.MainMenu2_img_alipay_txt = lv.label(self.MainMenu2_contacts)
+        self.MainMenu2_img_alipay_txt.set_pos(int(0),int(220))
+        self.MainMenu2_img_alipay_txt.set_size(240,100)
+        self.MainMenu2_img_alipay_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+        self.MainMenu2_img_alipay_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+        self.MainMenu2_img_alipay_txt.set_text("联系人")
+        self.MainMenu2_img_alipay_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
+        # self.MainMenu2_img_contacts_text = lv.img(self.MainMenu2_contacts)
+        # self.MainMenu2_img_contacts_text.set_size(160,39)
+        # self.MainMenu2_img_contacts_text.set_pos(40,210)
+        # self.MainMenu2_img_contacts_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CONTACTS_TEXT.png")
+        # self.MainMenu2_img_contacts_text.add_flag(lv.obj.FLAG.CLICKABLE)
+        # self.MainMenu2_img_contacts_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         # self.label_contacts = lv.label(self.MainMenu2_contacts)
         # self.label_contacts.set_pos(0, 240)
         # self.label_contacts.set_size(240, 80)
@@ -460,12 +492,19 @@ class MainMenu2():
         self.MainMenu2_img_heartrate.add_flag(lv.obj.FLAG.CLICKABLE)
         self.MainMenu2_img_heartrate.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         
-        self.MainMenu2_img_heartrate_text = lv.img(self.MainMenu2_heartrate)
-        self.MainMenu2_img_heartrate_text.set_size(160,39)
-        self.MainMenu2_img_heartrate_text.set_pos(40,210)
-        self.MainMenu2_img_heartrate_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_HEART_RATE_HEALTH_DETECT_TEXT.png")
-        self.MainMenu2_img_heartrate_text.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.MainMenu2_img_heartrate_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+        self.MainMenu2_img_alipay_txt = lv.label(self.MainMenu2_heartrate)
+        self.MainMenu2_img_alipay_txt.set_pos(int(0),int(220))
+        self.MainMenu2_img_alipay_txt.set_size(240,100)
+        self.MainMenu2_img_alipay_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+        self.MainMenu2_img_alipay_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+        self.MainMenu2_img_alipay_txt.set_text("心率检测")
+        self.MainMenu2_img_alipay_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
+        # self.MainMenu2_img_heartrate_text = lv.img(self.MainMenu2_heartrate)
+        # self.MainMenu2_img_heartrate_text.set_size(160,39)
+        # self.MainMenu2_img_heartrate_text.set_pos(40,210)
+        # self.MainMenu2_img_heartrate_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_HEART_RATE_HEALTH_DETECT_TEXT.png")
+        # self.MainMenu2_img_heartrate_text.add_flag(lv.obj.FLAG.CLICKABLE)
+        # self.MainMenu2_img_heartrate_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         # self.label_heartrate = lv.label(self.MainMenu2_heartrate)
         # self.label_heartrate.set_pos(0, 240)
         # self.label_heartrate.set_size(240, 80)
@@ -487,12 +526,20 @@ class MainMenu2():
         self.MainMenu2_img_spo2.add_flag(lv.obj.FLAG.CLICKABLE)
         self.MainMenu2_img_spo2.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
        
-        self.MainMenu2_img_spo2_text = lv.img(self.MainMenu2_spo2)
-        self.MainMenu2_img_spo2_text.set_size(160,39)
-        self.MainMenu2_img_spo2_text.set_pos(40,210)
-        self.MainMenu2_img_spo2_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SPO2_DETECT_TEXT.png")
-        self.MainMenu2_img_spo2_text.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.MainMenu2_img_spo2_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+        self.MainMenu2_img_alipay_txt = lv.label(self.MainMenu2_spo2)
+        self.MainMenu2_img_alipay_txt.set_pos(int(0),int(220))
+        self.MainMenu2_img_alipay_txt.set_size(240,100)
+        self.MainMenu2_img_alipay_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+        self.MainMenu2_img_alipay_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+        self.MainMenu2_img_alipay_txt.set_text("血氧检测")
+        self.MainMenu2_img_alipay_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
+
+        # self.MainMenu2_img_spo2_text = lv.img(self.MainMenu2_spo2)
+        # self.MainMenu2_img_spo2_text.set_size(160,39)
+        # self.MainMenu2_img_spo2_text.set_pos(40,210)
+        # self.MainMenu2_img_spo2_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SPO2_DETECT_TEXT.png")
+        # self.MainMenu2_img_spo2_text.add_flag(lv.obj.FLAG.CLICKABLE)
+        # self.MainMenu2_img_spo2_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         # self.label_spo2 = lv.label(self.MainMenu2_spo2)
         # self.label_spo2.set_pos(0, 240)
         # self.label_spo2.set_size(240, 80)
@@ -514,12 +561,21 @@ class MainMenu2():
         self.MainMenu2_img_toolbox.add_flag(lv.obj.FLAG.CLICKABLE)
         self.MainMenu2_img_toolbox.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         
-        self.MainMenu2_img_toolbox_text = lv.img(self.MainMenu2_toolbox)
-        self.MainMenu2_img_toolbox_text.set_size(160,39)
-        self.MainMenu2_img_toolbox_text.set_pos(40,210)
-        self.MainMenu2_img_toolbox_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TOOLS_TEXT.png")
-        self.MainMenu2_img_toolbox_text.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.MainMenu2_img_toolbox_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+        self.MainMenu2_img_alipay_txt = lv.label(self.MainMenu2_toolbox)
+        self.MainMenu2_img_alipay_txt.set_pos(int(0),int(220))
+        self.MainMenu2_img_alipay_txt.set_size(240,100)
+        self.MainMenu2_img_alipay_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+        self.MainMenu2_img_alipay_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+        self.MainMenu2_img_alipay_txt.set_text("工具箱")
+        self.MainMenu2_img_alipay_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
+
+        # self.MainMenu2_img_toolbox_text = lv.img(self.MainMenu2_toolbox)
+        # self.MainMenu2_img_toolbox_text.set_size(160,39)
+        # self.MainMenu2_img_toolbox_text.set_pos(40,210)
+        # self.MainMenu2_img_toolbox_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TOOLS_TEXT.png")
+        # self.MainMenu2_img_toolbox_text.add_flag(lv.obj.FLAG.CLICKABLE)
+        # self.MainMenu2_img_toolbox_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         # self.label_toolbox = lv.label(self.MainMenu2_toolbox)
         # self.label_toolbox.set_pos(0, 240)
         # self.label_toolbox.set_size(240, 80)
@@ -541,12 +597,20 @@ class MainMenu2():
         self.MainMenu2_img_setting.add_flag(lv.obj.FLAG.CLICKABLE)
         self.MainMenu2_img_setting.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         
-        self.MainMenu2_img_setting_text = lv.img(self.MainMenu2_setting)
-        self.MainMenu2_img_setting_text.set_size(160,39)
-        self.MainMenu2_img_setting_text.set_pos(40,210)
-        self.MainMenu2_img_setting_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SETTINGS_TEXT.png")
-        self.MainMenu2_img_setting_text.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.MainMenu2_img_setting_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+        self.MainMenu2_img_alipay_txt = lv.label(self.MainMenu2_setting)
+        self.MainMenu2_img_alipay_txt.set_pos(int(0),int(220))
+        self.MainMenu2_img_alipay_txt.set_size(240,100)
+        self.MainMenu2_img_alipay_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+        self.MainMenu2_img_alipay_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+        self.MainMenu2_img_alipay_txt.set_text("设置")
+        self.MainMenu2_img_alipay_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
+
+        # self.MainMenu2_img_setting_text = lv.img(self.MainMenu2_setting)
+        # self.MainMenu2_img_setting_text.set_size(160,39)
+        # self.MainMenu2_img_setting_text.set_pos(40,210)
+        # self.MainMenu2_img_setting_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SETTINGS_TEXT.png")
+        # self.MainMenu2_img_setting_text.add_flag(lv.obj.FLAG.CLICKABLE)
+        # self.MainMenu2_img_setting_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         # self.label_setting = lv.label(self.MainMenu2_setting)
         # self.label_setting.set_pos(0, 240)
         # self.label_setting.set_size(240, 80)
@@ -568,12 +632,20 @@ class MainMenu2():
         self.MainMenu2_img_temperature.add_flag(lv.obj.FLAG.CLICKABLE)
         self.MainMenu2_img_temperature.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         
-        self.MainMenu2_img_temperature_text = lv.img(self.MainMenu2_temperature)
-        self.MainMenu2_img_temperature_text.set_size(160,39)
-        self.MainMenu2_img_temperature_text.set_pos(40,210)
-        self.MainMenu2_img_temperature_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TEMPERATURE_TEXT.png")
-        self.MainMenu2_img_temperature_text.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.MainMenu2_img_temperature_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+        self.MainMenu2_img_alipay_txt = lv.label(self.MainMenu2_temperature)
+        self.MainMenu2_img_alipay_txt.set_pos(int(0),int(220))
+        self.MainMenu2_img_alipay_txt.set_size(240,100)
+        self.MainMenu2_img_alipay_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+        self.MainMenu2_img_alipay_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+        self.MainMenu2_img_alipay_txt.set_text("体温测量")
+        self.MainMenu2_img_alipay_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
+
+        # self.MainMenu2_img_temperature_text = lv.img(self.MainMenu2_temperature)
+        # self.MainMenu2_img_temperature_text.set_size(160,39)
+        # self.MainMenu2_img_temperature_text.set_pos(40,210)
+        # self.MainMenu2_img_temperature_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TEMPERATURE_TEXT.png")
+        # self.MainMenu2_img_temperature_text.add_flag(lv.obj.FLAG.CLICKABLE)
+        # self.MainMenu2_img_temperature_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         # self.label_temperature = lv.label(self.MainMenu2_temperature)
         # self.label_temperature.set_pos(0, 240)
         # self.label_temperature.set_size(240, 80)
@@ -595,12 +667,20 @@ class MainMenu2():
         self.MainMenu2_img_wechat.add_flag(lv.obj.FLAG.CLICKABLE)
         self.MainMenu2_img_wechat.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-        self.MainMenu2_img_wechat_text = lv.img(self.MainMenu2_wechat)
-        self.MainMenu2_img_wechat_text.set_size(160,39)
-        self.MainMenu2_img_wechat_text.set_pos(40,210)
-        self.MainMenu2_img_wechat_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_WECHAT_TEXT.png")
-        self.MainMenu2_img_wechat_text.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.MainMenu2_img_wechat_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+        self.MainMenu2_img_alipay_txt = lv.label(self.MainMenu2_wechat)
+        self.MainMenu2_img_alipay_txt.set_pos(int(0),int(220))
+        self.MainMenu2_img_alipay_txt.set_size(240,100)
+        self.MainMenu2_img_alipay_txt.add_flag(lv.obj.FLAG.CLICKABLE)
+        self.MainMenu2_img_alipay_txt.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+        self.MainMenu2_img_alipay_txt.set_text("微聊")
+        self.MainMenu2_img_alipay_txt.add_style(style_font_youyuan_font_60, lv.PART.MAIN|lv.STATE.DEFAULT)
+
+        # self.MainMenu2_img_wechat_text = lv.img(self.MainMenu2_wechat)
+        # self.MainMenu2_img_wechat_text.set_size(160,39)
+        # self.MainMenu2_img_wechat_text.set_pos(40,210)
+        # self.MainMenu2_img_wechat_text.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_WECHAT_TEXT.png")
+        # self.MainMenu2_img_wechat_text.add_flag(lv.obj.FLAG.CLICKABLE)
+        # self.MainMenu2_img_wechat_text.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         
         # self.label_wechat = lv.label(self.MainMenu2_wechat)
         # self.label_wechat.set_pos(0, 240)
index a8a1722..69ed403 100644 (file)
@@ -710,32 +710,88 @@ version.center()
 version.set_size(240, 320)
 version.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-version_msg = """Software Version:
-MMI
-Version:UIX8910_C55_V
-1.0_Release
-Build Time:
-2-17-2023
-9:32:5
-IMEI:
-"""
-
-version_label = lv.label(version)
-version_label.set_pos(0, 0)
-version_label.set_size(240, 150)
-version_label.set_long_mode(lv.label.LONG.WRAP)
-version_label.set_text(version_msg)
-version_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-version_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+version_msg = "Software Version:\n\
+MMI\n\
+Version:UIX8910_C55_V\n\
+1.0_Release\n\
+Build Time:\n\
+2-17-2023\n\
+9:32:5\n\
+IMEI:\n\
+"
 
 version_label1 = lv.label(version)
-version_label1.set_pos(20, 160)
-version_label1.set_size(220, 100)
+version_label1.set_pos(0, 0)
+version_label1.set_size(240, 25)
 version_label1.set_long_mode(lv.label.LONG.WRAP)
-version_label1.set_text(" ")
+version_label1.set_text("Software Version:")
 version_label1.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 version_label1.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
+version_label2 = lv.label(version)
+version_label2.set_pos(0, 25)
+version_label2.set_size(240, 25)
+version_label2.set_long_mode(lv.label.LONG.WRAP)
+version_label2.set_text("MMI")
+version_label2.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+version_label2.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+version_label3 = lv.label(version)
+version_label3.set_pos(0, 50)
+version_label3.set_size(240, 25)
+version_label3.set_long_mode(lv.label.LONG.WRAP)
+version_label3.set_text("Version:UIX8910_C55_V")
+version_label3.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+version_label3.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+version_label4 = lv.label(version)
+version_label4.set_pos(0, 75)
+version_label4.set_size(240, 25)
+version_label4.set_long_mode(lv.label.LONG.WRAP)
+version_label4.set_text("1.0_Release")
+version_label4.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+version_label4.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+version_label5 = lv.label(version)
+version_label5.set_pos(0, 100)
+version_label5.set_size(240, 25)
+version_label5.set_long_mode(lv.label.LONG.WRAP)
+version_label5.set_text("Build Time:")
+version_label5.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+version_label5.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+version_label6 = lv.label(version)
+version_label6.set_pos(0, 125)
+version_label6.set_size(240, 25)
+version_label6.set_long_mode(lv.label.LONG.WRAP)
+version_label6.set_text("2-17-2023")
+version_label6.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+version_label6.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+version_label7 = lv.label(version)
+version_label7.set_pos(0, 150)
+version_label7.set_size(240, 25)
+version_label7.set_long_mode(lv.label.LONG.WRAP)
+version_label7.set_text("9:32:5")
+version_label7.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+version_label7.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+version_label8 = lv.label(version)
+version_label8.set_pos(0, 175)
+version_label8.set_size(240, 25)
+version_label8.set_long_mode(lv.label.LONG.WRAP)
+version_label8.set_text("IMEI:")
+version_label8.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+version_label8.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
+version_label9 = lv.label(version)
+version_label9.set_pos(20, 200)
+version_label9.set_size(220, 100)
+version_label9.set_long_mode(lv.label.LONG.WRAP)
+version_label9.set_text(" ")
+version_label9.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+version_label9.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+
 
 
 # -------------------------------------------update screen----------------------------------------------------------
@@ -829,7 +885,7 @@ class VersionScreen(Screen):
         self.btn_count = 0
     def initialization(self):
         imei = EventMesh.publish(constants.EVENT.GET_IMEI)
-        version_label1.set_text(imei)
+        version_label9.set_text(imei)
 
     def Close(self):
         self.btn_count = 0
@@ -899,11 +955,6 @@ poweroff_return_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.D
 poweroff_return.set_ext_click_area(20)
 
 
-poweroff_confirm_label1 = lv.label(poweroff)
-poweroff_confirm_label1.set_text("Goodbye")
-poweroff_confirm_label1.align(lv.ALIGN.CENTER, 0, 0)
-poweroff_confirm_label1.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT)
-
 class PoweroffScreen(Screen):
     NAME = "poweroff"
 
@@ -916,66 +967,58 @@ class PoweroffScreen(Screen):
         poweroff_return.add_event_cb(lambda e: self.concel(e),lv.EVENT.CLICKED, None)
 
     def initialization(self):
-        self.button_flag = 0
-        poweroff_confirm_label1.add_flag(lv.obj.FLAG.HIDDEN)
-
-        poweroff_img.clear_flag(lv.obj.FLAG.HIDDEN)
-        poweroff_label.clear_flag(lv.obj.FLAG.HIDDEN)
-        poweroff_confirm.clear_flag(lv.obj.FLAG.HIDDEN)
-        poweroff_confirm_label.clear_flag(lv.obj.FLAG.HIDDEN)
-        poweroff_return.clear_flag(lv.obj.FLAG.HIDDEN)
-        poweroff_return_label.clear_flag(lv.obj.FLAG.HIDDEN)
+        pass
         
     def done_return(self):
-        if self.button_flag == 0:
-            EventMesh.publish("load_screen", {"screen": "setting"})
+        EventMesh.publish("load_screen", {"screen": "setting"})
         
     def confirm(self, e):
-        self.button_flag = 1
-        poweroff_img.add_flag(lv.obj.FLAG.HIDDEN)
-        poweroff_label.add_flag(lv.obj.FLAG.HIDDEN)
-        poweroff_confirm.add_flag(lv.obj.FLAG.HIDDEN)
-        poweroff_confirm_label.add_flag(lv.obj.FLAG.HIDDEN)
-        poweroff_return.add_flag(lv.obj.FLAG.HIDDEN)
-        poweroff_return_label.add_flag(lv.obj.FLAG.HIDDEN)
-        poweroff_confirm_label1.clear_flag(lv.obj.FLAG.HIDDEN)
-        self.timer.start(2*1000,0,self.power_off_event)
+        EventMesh.publish("load_screen", {"screen": "poweroff_comfirm"})
         
-    def power_off_event(self,e):
-        Power.powerDown()
 
     def concel(self, e):
         EventMesh.publish("load_screen", {"screen": "setting"})
 
     def btn1_release(self):
-        if self.button_flag == 0:
-            EventMesh.publish("load_screen", {"screen": "main_menu"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
-        if self.button_flag == 0:
-            EventMesh.publish("load_screen", {"screen": "setting"})
+        EventMesh.publish("load_screen", {"screen": "setting"})
 
 
 
+poweroff_confirm_screen = lv.obj()
+poweroff_confirm = lv.obj(poweroff_confirm_screen)
+poweroff_confirm.center()
+poweroff_confirm.set_size(240, 320)
+poweroff_confirm.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 
+poweroff_confirm_label = lv.label(poweroff_confirm)
+poweroff_confirm_label.set_text("Goodbye")
+poweroff_confirm_label.align(lv.ALIGN.CENTER, 0, 0)
+poweroff_confirm_label.add_style(style_font_youyuan_40, lv.PART.MAIN | lv.STATE.DEFAULT)
 
+class PoweroffConfirmScreen(Screen):
+    NAME = "poweroff_comfirm"
 
-# class PoweroffScreen(Screen):
-#     NAME = "poweroff_comfirm"
+    def __init__(self):
+        super().__init__()
+        self.meta = poweroff_confirm_screen
+        self.timer = osTimer()
+    def initialization(self):
+        self.timer.start(2*1000,0,self.power_off)
 
-#     def __init__(self):
-#         super().__init__()
-#         self.meta = poweroff_confirm_screen
-#         self.timer = osTimer()
-#     def done_return(self):
-#         EventMesh.publish("load_screen", {"screen": "setting"})
-        
-#     def confirm(self, e):
+    def power_off(self,*args):
+        Power.powerDown()
+    
+    def done_return(self):
+        pass
 
+    def btn1_release(self):
+        pass
         
-#         # EventMesh.publish("load_screen", {"screen": "setting"})
-#     def power_off(self,event,msg):
-#         Power.powerDown()
+    def btn8_press(self):
+        pass
 
 
 class LanguageScreen(Screen):
@@ -1479,17 +1522,21 @@ class totalvolumeScreen(Screen):
     def show_bar(self,msg):
         totalvolume_bar.set_value((100 // 11) * self.volum_size, lv.ANIM.OFF)
         if msg == 1:
+            self.read_data = EventMesh.publish("get_storage_data")
             self.read_data["volum"] = self.volum_size
             self.aud.setVolume(self.volum_size)
             EventMesh.publish("set_storage_data", self.read_data)
+            EventMesh.publish("set_volum_size",self.volum_size)
+            print("self.read_data:size :{}".format(self.read_data))
             with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
                 ujson.dump(self.read_data,fd)
-            self.aud.play(1, 0, 'E:/static/audio_audio_haixiu.mp3')  #播放声音
+            self.aud.play(1, 1, 'E:/static/audio_audio_haixiu.mp3')  #播放声音
  
     def Close(self):
         self.aud.stop()
 
     def done_return(self):
+        self.aud.stop()
         EventMesh.publish("load_screen", {"screen": "setting"})
 
     def btn1_release(self):