1.表盘增加

2.设置 工具换成图片

diff --git a/3.code/1.watch/2.code/mgr.py b/3.code/1.watch/2.code/mgr.py
index a93cf02..877a0a1 100644 (file)
--- a/3.code/1.watch/2.code/mgr.py
+++ b/3.code/1.watch/2.code/mgr.py
@@ -914,11 +914,12 @@ class DeviceInfoManager(Abstract):
         date = ("%d月%d日" % (rtc_time[1], rtc_time[2]))
         year = ("%04d年" % (rtc_time[0]))
         week = ("星期%s"%(self.get_week(rtc_time[3])))
+        week_data = rtc_time[3]
         time = [rtc_time[4], rtc_time[5]]
         time_quantum = ("%s" % (self.get_time_bucket(rtc_time[4])))
         
-        result = [time, time_quantum, date , week,year]
-        #时分，上午下午，日期，星期
+        result = [time, time_quantum, date , week,year,week_data]
+        #时分，上午下午，日期，星期,年 星期
         return result
 
     def get_step_count(self, event=None, msg=None):

diff --git a/3.code/1.watch/2.code/static/IMAGE_SECMENU_ALARM.png b/3.code/1.watch/2.code/static/IMAGE_SECMENU_ALARM.png
deleted file mode 100644 (file)
index c533f10..0000000
Binary files a/3.code/1.watch/2.code/static/IMAGE_SECMENU_ALARM.png and /dev/null differ

diff --git a/3.code/1.watch/2.code/static/IMAGE_SECMENU_COUNTDOWN.png b/3.code/1.watch/2.code/static/IMAGE_SECMENU_COUNTDOWN.png
deleted file mode 100644 (file)
index 2970790..0000000
Binary files a/3.code/1.watch/2.code/static/IMAGE_SECMENU_COUNTDOWN.png and /dev/null differ

diff --git a/3.code/1.watch/2.code/static/IMAGE_SECMENU_STEP.png b/3.code/1.watch/2.code/static/IMAGE_SECMENU_STEP.png
deleted file mode 100644 (file)
index 847f341..0000000
Binary files a/3.code/1.watch/2.code/static/IMAGE_SECMENU_STEP.png and /dev/null differ

diff --git a/3.code/1.watch/2.code/static/IMAGE_SECMENU_STOPWATCH.png b/3.code/1.watch/2.code/static/IMAGE_SECMENU_STOPWATCH.png
deleted file mode 100644 (file)
index b1ff086..0000000
Binary files a/3.code/1.watch/2.code/static/IMAGE_SECMENU_STOPWATCH.png and /dev/null differ

diff --git a/3.code/1.watch/2.code/static/IMAGE_SECMENU_WEATHER.png b/3.code/1.watch/2.code/static/IMAGE_SECMENU_WEATHER.png
deleted file mode 100644 (file)
index 6613eb4..0000000
Binary files a/3.code/1.watch/2.code/static/IMAGE_SECMENU_WEATHER.png and /dev/null differ

diff --git a/3.code/1.watch/2.code/static/menu_app_qrcode.png b/3.code/1.watch/2.code/static/menu_app_qrcode.png
deleted file mode 100644 (file)
index 8f23e12..0000000
Binary files a/3.code/1.watch/2.code/static/menu_app_qrcode.png and /dev/null differ

diff --git a/3.code/1.watch/2.code/static/menu_bright.png b/3.code/1.watch/2.code/static/menu_bright.png
deleted file mode 100644 (file)
index e8f67d4..0000000
Binary files a/3.code/1.watch/2.code/static/menu_bright.png and /dev/null differ

diff --git a/3.code/1.watch/2.code/static/menu_imei_qrcode.png b/3.code/1.watch/2.code/static/menu_imei_qrcode.png
deleted file mode 100644 (file)
index 0b24817..0000000
Binary files a/3.code/1.watch/2.code/static/menu_imei_qrcode.png and /dev/null differ

diff --git a/3.code/1.watch/2.code/static/menu_language.png b/3.code/1.watch/2.code/static/menu_language.png
deleted file mode 100644 (file)
index bc368af..0000000
Binary files a/3.code/1.watch/2.code/static/menu_language.png and /dev/null differ

diff --git a/3.code/1.watch/2.code/static/menu_poweroff.png b/3.code/1.watch/2.code/static/menu_poweroff.png
deleted file mode 100644 (file)
index 09434dc..0000000
Binary files a/3.code/1.watch/2.code/static/menu_poweroff.png and /dev/null differ

diff --git a/3.code/1.watch/2.code/static/menu_restore.png b/3.code/1.watch/2.code/static/menu_restore.png
deleted file mode 100644 (file)
index 3fb3bc5..0000000
Binary files a/3.code/1.watch/2.code/static/menu_restore.png and /dev/null differ

diff --git a/3.code/1.watch/2.code/static/menu_theme_switch.png b/3.code/1.watch/2.code/static/menu_theme_switch.png
deleted file mode 100644 (file)
index 62ce1f9..0000000
Binary files a/3.code/1.watch/2.code/static/menu_theme_switch.png and /dev/null differ

diff --git a/3.code/1.watch/2.code/static/menu_upgrade.png b/3.code/1.watch/2.code/static/menu_upgrade.png
deleted file mode 100644 (file)
index 8e18ff6..0000000
Binary files a/3.code/1.watch/2.code/static/menu_upgrade.png and /dev/null differ

diff --git a/3.code/1.watch/2.code/static/menu_version.png b/3.code/1.watch/2.code/static/menu_version.png
deleted file mode 100644 (file)
index 8898c65..0000000
Binary files a/3.code/1.watch/2.code/static/menu_version.png and /dev/null differ

diff --git a/3.code/1.watch/2.code/static/menu_volume.png b/3.code/1.watch/2.code/static/menu_volume.png
deleted file mode 100644 (file)
index e49a0df..0000000
Binary files a/3.code/1.watch/2.code/static/menu_volume.png and /dev/null differ

diff --git a/3.code/1.watch/2.code/static/menu_watch_switch.png b/3.code/1.watch/2.code/static/menu_watch_switch.png
deleted file mode 100644 (file)
index 9631919..0000000
Binary files a/3.code/1.watch/2.code/static/menu_watch_switch.png and /dev/null differ

diff --git a/3.code/1.watch/2.code/ui.py b/3.code/1.watch/2.code/ui.py
index 138e42c..3df09c6 100644 (file)
--- a/3.code/1.watch/2.code/ui.py
+++ b/3.code/1.watch/2.code/ui.py
@@ -181,13 +181,18 @@ toolbox.set_size(240, 320)
 toolbox.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 toolbox.set_scrollbar_mode(0)
 
-toolbox_title = lv.label(toolbox)
-toolbox_title.set_pos(0, 10)
-toolbox_title.set_size(240, 40)
-toolbox_title.set_text("工具箱")
-toolbox_title.set_long_mode(lv.label.LONG.WRAP)
-toolbox_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-toolbox_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+toolbox_step_img = lv.img(toolbox)
+toolbox_step_img.set_pos(75, 10)
+toolbox_step_img.set_size(90, 30)
+toolbox_step_img.set_src("E:/static/tool/tool_text.png")
+toolbox_step_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+# toolbox_title = lv.label(toolbox)
+# toolbox_title.set_pos(0, 10)
+# toolbox_title.set_size(240, 40)
+# toolbox_title.set_text("工具箱")
+# toolbox_title.set_long_mode(lv.label.LONG.WRAP)
+# toolbox_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+# toolbox_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 toolbox_cont = lv.obj(toolbox)
 toolbox_cont.set_pos(0, 50)
@@ -199,7 +204,7 @@ toolbox_cont.add_style(
 
 toolbox_step = lv.btn(toolbox_cont)
 toolbox_step.set_pos(0, 0)
-toolbox_step.set_size(240, 54)
+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)
@@ -207,15 +212,15 @@ 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(10, 0)
-toolbox_step_img.set_size(47, 47)
+toolbox_step_img.set_pos(4, 0)
+toolbox_step_img.set_size(232, 80)
 toolbox_step_img.add_flag(lv.obj.FLAG.CLICKABLE)
-toolbox_step_img.set_src("E:/static/IMAGE_SECMENU_STEP.png")
+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(240, 54)
+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)
@@ -223,15 +228,15 @@ 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(10, 60)
-toolbox_weather_img.set_size(47, 47)
+toolbox_weather_img.set_pos(4, 90)
+toolbox_weather_img.set_size(232, 80)
 toolbox_weather_img.add_flag(lv.obj.FLAG.CLICKABLE)
-toolbox_weather_img.set_src("E:/static/IMAGE_SECMENU_WEATHER.png")
+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(240, 54)
+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)
@@ -239,15 +244,15 @@ 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(10, 120)
-toolbox_alarm_img.set_size(47, 47)
+toolbox_alarm_img.set_pos(4, 180)
+toolbox_alarm_img.set_size(232, 80)
 toolbox_alarm_img.add_flag(lv.obj.FLAG.CLICKABLE)
-toolbox_alarm_img.set_src("E:/static/IMAGE_SECMENU_ALARM.png")
+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(240, 54)
+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)
@@ -255,15 +260,15 @@ 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(10, 180)
-toolbox_countdown_img.set_size(47, 47)
+toolbox_countdown_img.set_pos(4, 270)
+toolbox_countdown_img.set_size(232, 80)
 toolbox_countdown_img.add_flag(lv.obj.FLAG.CLICKABLE)
-toolbox_countdown_img.set_src("E:/static/IMAGE_SECMENU_COUNTDOWN.png")
+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(240, 54)
+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)
@@ -271,10 +276,10 @@ 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(10, 240)
-toolbox_stopwatch_img.set_size(47, 47)
+toolbox_stopwatch_img.set_pos(4, 360)
+toolbox_stopwatch_img.set_size(232, 80)
 toolbox_stopwatch_img.add_flag(lv.obj.FLAG.CLICKABLE)
-toolbox_stopwatch_img.set_src("E:/static/IMAGE_SECMENU_STOPWATCH.png")
+toolbox_stopwatch_img.set_src("E:/static/tool/IMAGE_SECMENU_STOPWATCH.png")
 toolbox_stopwatch_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 
@@ -3109,11 +3114,11 @@ class UIFINDScreen(Screen):
         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(50),int(80))
-        self.watchface_mpsignal_img.set_size(140,140)
+        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/time_finish.png")
+        self.watchface_mpsignal_img.set_src("E:/static/find_phone.png")
         self.watchface_mpsignal_img.add_style(style_screen, lv.PART.MAIN|lv.STATE.DEFAULT)
 
     def initialization(self):
@@ -3397,7 +3402,7 @@ class UI(object):
         for scr in self.screen_list:
             if scr.NAME == msg["screen"]:
                 # 每次屏幕切换开始息屏倒计时
-                self.__lcd_on()
+                
                 if scr.NAME == 'main_menu':
                     self.main_flag = 1
                 else :
@@ -3417,22 +3422,19 @@ class UI(object):
                 self.screen.load()
                 self.lv.scr_load_anim(self.screen.get_meta(),lv.SCR_LOAD_ANIM.MOVE_BOTTOM,100,0,0)
                 self.screen.post_processor_after_initialization()
+                print("__lcd_on......01.........")
+                self.__lcd_on()
     
     def load_screen_animtop(self, topic, msg):
         print("msg={}".format(msg))
         for scr in self.screen_list:
             if scr.NAME == msg["screen"]:
                 # 每次屏幕切换开始息屏倒计时
-                self.__lcd_on()
+                
                 if scr.NAME == 'main_menu':
                     self.main_flag = 1
                 else :
                     self.main_flag = 0
-                
-                if scr.NAME == 'FIND' or scr.NAME == 'popup_alarm':#弹窗界面需要回到主界面
-                    self.main_id = 1
-                else:
-                    self.main_id = 0
 
                 self.screen = scr
                 if self.screen_old != None :
@@ -3448,6 +3450,8 @@ class UI(object):
                 self.screen.load()
                 self.lv.scr_load_anim(self.screen.get_meta(),lv.SCR_LOAD_ANIM.MOVE_TOP,100,0,0)
                 self.screen.post_processor_after_initialization()
+                print("__lcd_on......02.........")
+                self.__lcd_on()
 
 
 

diff --git a/3.code/1.watch/2.code/ui_WatchFaceScreen.py b/3.code/1.watch/2.code/ui_WatchFaceScreen.py
index aa4565f..e6c8afd 100644 (file)
--- a/3.code/1.watch/2.code/ui_WatchFaceScreen.py
+++ b/3.code/1.watch/2.code/ui_WatchFaceScreen.py
@@ -13,13 +13,13 @@ style_font_youyuan_20.set_text_font_v2("font_20.bin",20,0)
 
 class Watchface2():
     NAME = "Watchface2"
-    # # #表盘2
+    # # #表盘1
     def __init__(self,main_menu): 
         print("Watchface2:__init__")
         
         self.meta = lv.obj(main_menu)
         self.meta.set_size(240,320)
-        # self.meta.set_pos(0,0)
+        #self.meta.set_pos(0,0)
         self.meta.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
         # # create style watchface_default
         # self.watchface_default = lv.style_t()
@@ -36,6 +36,13 @@ class Watchface2():
         self.style_watchface_img_default.set_img_recolor_opa(0)
         self.style_watchface_img_default.set_img_opa(255)
 
+
+        #表盘
+        
+        label_text = lv.label(self.meta)
+        label_text.set_pos(0, 240)
+        label_text.set_size(0, 0)
+        label_text.set_text("0")
         #状态栏
         
         self.watchface_mpsignal_img = lv.img(self.meta)
@@ -63,55 +70,48 @@ class Watchface2():
         # add style for watchface_res_stat_charge_in_img
         self.watchface_res_stat_charge_in_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
         
-        #主图片
-        self.watchface1_bg_img = lv.img(self.meta)
-        self.watchface1_bg_img.set_pos(int(50),int(50))
-        self.watchface1_bg_img.set_size(140,140)
-        self.watchface1_bg_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_bg_img.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.watchface1_bg_img.set_src("E:/static/time_finish.png")
-        self.watchface1_bg_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+        # #主图片
+        # self.watchface1_bg_img = lv.img(self.meta)
+        # self.watchface1_bg_img.set_pos(int(0),int(40))
+        # self.watchface1_bg_img.set_size(240,280)
+        # self.watchface1_bg_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        # self.watchface1_bg_img.add_flag(lv.obj.FLAG.CLICKABLE)
+        # 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 = 40
+        x = 30
         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(36,44)
+        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_1/time/1.png")
+        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+36),int(y))
-        self.watchface1_time2_img.set_size(36,44)
+        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_1/time/3.png")
+        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_time3_img = lv.img(self.meta)
-        self.watchface1_time3_img.set_pos(int(x+36+36+4),int(y+11))
-        self.watchface1_time3_img.set_size(8,24)
-        self.watchface1_time3_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_time3_img.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.watchface1_time3_img.set_src("E:/static/watch_plate/style_1/time/colon.png")
-        self.watchface1_time3_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+36+36+4+12),int(y))
-        self.watchface1_time4_img.set_size(36,44)
+        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_1/time/2.png")
+        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+36+36+4+12+36),int(y))
-        self.watchface1_time5_img.set_size(36,44)
+        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_1/time/3.png")
+        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()
@@ -128,17 +128,38 @@ class Watchface2():
         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_18.bin",18,0) #将外部字体库与该style对象绑定
+        self.watchface1_style_default.set_text_font_v2("font_20.bin",20,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(24),int(131))
+        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_date_span.set_text("12月9日")
+        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)
@@ -147,113 +168,69 @@ class Watchface2():
         # 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_week = lv.spangroup(self.meta)
-        self.watchface1_week.set_pos(int(29),int(166))
-        self.watchface1_week.set_size(80,25)
-        self.watchface1_week.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_week.set_align(lv.TEXT_ALIGN.LEFT)
-        self.watchface1_week.set_overflow(lv.SPAN_OVERFLOW.CLIP)
-        self.watchface1_week.set_mode(lv.SPAN_MODE.BREAK)
-        self.watchface1_week_span = self.watchface1_week.new_span()
-        self.watchface1_week_span.set_text("星期四")
-        self.watchface1_week_span.style.set_text_color(lv.color_make(0xee,0xe7,0xe7))
-        self.watchface1_week_span.style.set_text_decor(lv.TEXT_DECOR.NONE)
-        self.watchface1_week.refr_mode()
-        # 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_lunar_calendar = lv.spangroup(self.meta)
-        # self.watchface1_lunar_calendar.set_pos(int(124),int(131))
-        # self.watchface1_lunar_calendar.set_size(110,17)
-        # self.watchface1_lunar_calendar.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        # self.watchface1_lunar_calendar.set_align(lv.TEXT_ALIGN.LEFT)
-        # self.watchface1_lunar_calendar.set_overflow(lv.SPAN_OVERFLOW.CLIP)
-        # self.watchface1_lunar_calendar.set_mode(lv.SPAN_MODE.BREAK)
-        # self.watchface1_lunar_calendar_span = self.watchface1_lunar_calendar.new_span()
-        # self.watchface1_lunar_calendar_span.set_text("三月初三")
-        # self.watchface1_lunar_calendar_span.style.set_text_color(lv.color_make(0xee,0xe7,0xe7))
-        # self.watchface1_lunar_calendar_span.style.set_text_decor(lv.TEXT_DECOR.NONE)
-        # self.watchface1_lunar_calendar.refr_mode()
+        # self.watchface1_week = lv.spangroup(self.meta)
+        # self.watchface1_week.set_pos(int(29),int(166))
+        # self.watchface1_week.set_size(80,25)
+        # self.watchface1_week.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        # self.watchface1_week.set_align(lv.TEXT_ALIGN.LEFT)
+        # self.watchface1_week.set_overflow(lv.SPAN_OVERFLOW.CLIP)
+        # self.watchface1_week.set_mode(lv.SPAN_MODE.BREAK)
+        # self.watchface1_week_span = self.watchface1_week.new_span()
+        # self.watchface1_week_span.set_text("星期四")
+        # self.watchface1_week_span.style.set_text_color(lv.color_make(0xee,0xe7,0xe7))
+        # self.watchface1_week_span.style.set_text_decor(lv.TEXT_DECOR.NONE)
+        # self.watchface1_week.refr_mode()
         # # add style for main_style_1_spangroup_week
-        # self.watchface1_lunar_calendar.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+        # self.watchface1_week.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT)
         
-        #计步
-        self.watchface1_step_img = lv.img(self.meta)
-        self.watchface1_step_img.set_pos(int(130),int(160))
-        self.watchface1_step_img.set_size(26,24)
-        self.watchface1_step_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_step_img.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.watchface1_step_img.set_src("E:/static/watch_plate/style_1/step.png")
-        self.watchface1_step_img.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_step_txt = lv.spangroup(self.meta)
-        self.watchface1_step_txt.set_pos(int(170),int(163))
-        self.watchface1_step_txt.set_size(70,25)
-        self.watchface1_step_txt.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_step_txt.set_align(lv.TEXT_ALIGN.LEFT)
-        self.watchface1_step_txt.set_overflow(lv.SPAN_OVERFLOW.CLIP)
-        self.watchface1_step_txt.set_mode(lv.SPAN_MODE.BREAK)
-        self.watchface1_step_span = self.watchface1_step_txt.new_span()
-        self.watchface1_step_span.set_text("0")
-        self.watchface1_step_span.style.set_text_color(lv.color_make(0xee,0xe7,0xe7))
-        self.watchface1_step_span.style.set_text_decor(lv.TEXT_DECOR.NONE)
-        #self.watchface1_week_step_span.style.set_text_font(lv.font_harmony_19)
-        self.watchface1_step_txt.refr_mode()
-        # add style for main_style_1_spangroup_week
-        self.watchface1_step_txt.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 
-        #心律
-        self.watchface1_HB_img = lv.img(self.meta)
-        self.watchface1_HB_img.set_pos(int(53),int(198))
-        self.watchface1_HB_img.set_size(30,27)
-        self.watchface1_HB_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_HB_img.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.watchface1_HB_img.set_src("E:/static/watch_plate/style_1/heart.png")
-        self.watchface1_HB_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
         
-        self.watchface1_HB_txt = lv.spangroup(self.meta)
-        self.watchface1_HB_txt.set_pos(int(55),int(235))
-        self.watchface1_HB_txt.set_size(80,25)
-        self.watchface1_HB_txt.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_HB_txt.set_align(lv.TEXT_ALIGN.LEFT)
-        self.watchface1_HB_txt.set_overflow(lv.SPAN_OVERFLOW.CLIP)
-        self.watchface1_HB_txt.set_mode(lv.SPAN_MODE.BREAK)
-        self.watchface1_HB_span = self.watchface1_HB_txt.new_span()
-        self.watchface1_HB_span.set_text("0")
-        self.watchface1_HB_span.style.set_text_color(lv.color_make(0xee,0xe7,0xe7))
-        self.watchface1_HB_span.style.set_text_decor(lv.TEXT_DECOR.NONE)
-        #self.watchface1_week_HB_span.style.set_text_font(lv.font_harmony_19)
-        self.watchface1_HB_txt.refr_mode()
-        # add style for main_style_1_spangroup_week
-        self.watchface1_HB_txt.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+        #天气
+        self.watchface1_temp_img = lv.img(self.meta)
+        self.watchface1_temp_img.set_pos(int(x+56+56+20),int(y+56+20))
+        self.watchface1_temp_img.set_size(65,45)
+        self.watchface1_temp_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        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_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.add_style(style_font_youyuan_20, lv.PART.MAIN|lv.STATE.DEFAULT)
+       
 
-        #血氧
-        self.watchface1_SPO2_img = lv.img(self.meta)
-        self.watchface1_SPO2_img.set_pos(int(161),int(193))
-        self.watchface1_SPO2_img.set_size(23,32)
-        self.watchface1_SPO2_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_SPO2_img.add_flag(lv.obj.FLAG.CLICKABLE)
-        self.watchface1_SPO2_img.set_src("E:/static/watch_plate/style_1/blood.png")
-        self.watchface1_SPO2_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
-        
-        self.watchface1_SPO2_txt = lv.spangroup(self.meta)
-        self.watchface1_SPO2_txt.set_pos(int(160),int(235))
-        self.watchface1_SPO2_txt.set_size(80,25)
-        self.watchface1_SPO2_txt.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        self.watchface1_SPO2_txt.set_align(lv.TEXT_ALIGN.LEFT)
-        self.watchface1_SPO2_txt.set_overflow(lv.SPAN_OVERFLOW.CLIP)
-        self.watchface1_SPO2_txt.set_mode(lv.SPAN_MODE.BREAK)
-        self.watchface1_SPO2_span = self.watchface1_SPO2_txt.new_span()
-        self.watchface1_SPO2_span.set_text("0")
-        self.watchface1_SPO2_span.style.set_text_color(lv.color_make(0xee,0xe7,0xe7))
-        self.watchface1_SPO2_span.style.set_text_decor(lv.TEXT_DECOR.NONE)
-        #self.watchface1_week_SPO2_span.style.set_text_font(lv.font_harmony_19)
-        self.watchface1_SPO2_txt.refr_mode()
+        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.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_SPO2_txt.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT)
-
-       
+        self.watchface1_no_temp_txt.add_style(self.watchface1_style_default, lv.PART.MAIN|lv.STATE.DEFAULT)
 
     def initialization(self):    
         #获取信号
@@ -268,18 +245,26 @@ class Watchface2():
         #print("publish_time:"+time)
         if time:
             self.__time(None, time)
-        hrValue = EventMesh.publish("get_old_hr_data")
-        self.__oldHrValue(None, hrValue)
-
-        spo2Value = EventMesh.publish("get_old_spo2_data")
-        self.__oldSpo2Value(None, spo2Value)
-        
-
-    def get_step(self,event,msg):
-        # print("main get_step msg:{}".format(msg))
-        self.step = msg[0]
-        self.watchface1_step_span.set_text(str(self.step))
 
+        connect = EventMesh.publish(constants.EVENT.GET_CONNECT) #获取网络状态
+        self.weather_data = EventMesh.publish("get_weather_data")
+        if connect != 0:
+            no_data = self.weather_data[8]
+            if no_data != 0:
+                type = self.weather_data[3]
+                if type == None:
+                    self.__weather_type(None,None)
+                else:
+                    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)
 
     def timerout_update(self):
         #获取信号
@@ -296,11 +281,25 @@ class Watchface2():
         if time:
             self.__time(None, time)
 
-        hrValue = EventMesh.publish("get_old_hr_data")
-        self.__oldHrValue(None, hrValue)
-
-        spo2Value = EventMesh.publish("get_old_spo2_data")
-        self.__oldSpo2Value(None, spo2Value)
+        connect = EventMesh.publish(constants.EVENT.GET_CONNECT) #获取网络状态
+        self.weather_data = EventMesh.publish("get_weather_data")
+        if connect != 0:
+            no_data = self.weather_data[8]
+            if no_data != 0:
+                type = self.weather_data[3]
+                if type == None:
+                    self.__weather_type(None,None)
+                else:
+                    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)
 
     def __time(self, event, msg):
         #时间
@@ -308,12 +307,13 @@ class Watchface2():
         hour2_chose = (msg[0][0])%10
         min1_chose = (msg[0][1])//10%10
         min2_chose = (msg[0][1])%10
-        self.watchface1_time1_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(hour1_chose))
-        self.watchface1_time2_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(hour2_chose))
-        self.watchface1_time4_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(min1_chose))
-        self.watchface1_time5_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(min2_chose))
+        # 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_date_span.set_text(msg[2])#日期
-        self.watchface1_week_span.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))
@@ -336,11 +336,27 @@ class Watchface2():
         self.watchface_res_stat_battery_img.set_src("E:/static/vbat_%d.png"%(msg[1]))#"E:/vbat_60.png"
         pass
 
-    def __oldHrValue(self, event, msg):
-        self.watchface1_HB_span.set_text(str(msg))
+    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)
+        else:
+            type = int(msg)
+            self.watchface1_no_temp_txt.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 __oldSpo2Value(self, event, msg):
-        self.watchface1_SPO2_span.set_text(str(msg))
+    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_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))
+        
 
 
 
@@ -414,45 +430,45 @@ class Watchface1():
         #时间
         x = 40
         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(36,44)
-        # 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_1/time/1.png")
-        # self.watchface1_time1_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+        self.watchface1_time1_img = lv.img(self.meta)
+        self.watchface1_time1_img.set_pos(int(x),int(y))
+        self.watchface1_time1_img.set_size(36,44)
+        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_1/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+36),int(y))
-        # self.watchface1_time2_img.set_size(36,44)
-        # 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_1/time/3.png")
-        # self.watchface1_time2_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
-
-        # self.watchface1_time3_img = lv.img(self.meta)
-        # self.watchface1_time3_img.set_pos(int(x+36+36+4),int(y+11))
-        # self.watchface1_time3_img.set_size(8,24)
-        # self.watchface1_time3_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
-        # self.watchface1_time3_img.add_flag(lv.obj.FLAG.CLICKABLE)
-        # self.watchface1_time3_img.set_src("E:/static/watch_plate/style_1/time/colon.png")
-        # self.watchface1_time3_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+36+36+4+12),int(y))
-        # self.watchface1_time4_img.set_size(36,44)
-        # 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_1/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+36+36+4+12+36),int(y))
-        # self.watchface1_time5_img.set_size(36,44)
-        # 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_1/time/3.png")
-        # self.watchface1_time5_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+36),int(y))
+        self.watchface1_time2_img.set_size(36,44)
+        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_1/time/3.png")
+        self.watchface1_time2_img.add_style(self.style_watchface_img_default, lv.PART.MAIN|lv.STATE.DEFAULT)
+
+        self.watchface1_time3_img = lv.img(self.meta)
+        self.watchface1_time3_img.set_pos(int(x+36+36+4),int(y+11))
+        self.watchface1_time3_img.set_size(8,24)
+        self.watchface1_time3_img.set_scrollbar_mode(lv.SCROLLBAR_MODE.OFF)
+        self.watchface1_time3_img.add_flag(lv.obj.FLAG.CLICKABLE)
+        self.watchface1_time3_img.set_src("E:/static/watch_plate/style_1/time/colon.png")
+        self.watchface1_time3_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+36+36+4+12),int(y))
+        self.watchface1_time4_img.set_size(36,44)
+        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_1/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+36+36+4+12+36),int(y))
+        self.watchface1_time5_img.set_size(36,44)
+        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_1/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()
@@ -475,12 +491,12 @@ class Watchface1():
         style_font_youyuan_70_black.set_text_color(lv.color_make(0x32, 0xc8, 0xdb))
         style_font_youyuan_70_black.set_text_font_v2("font_70.bin",70,0)
 
-        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_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)
@@ -674,11 +690,11 @@ class Watchface1():
         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_1/time/%d.png"%(hour1_chose))
-        # self.watchface1_time2_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(hour2_chose))
-        # self.watchface1_time4_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(min1_chose))
-        # self.watchface1_time5_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(min2_chose))
+        # 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_1/time/%d.png"%(hour1_chose))
+        self.watchface1_time2_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(hour2_chose))
+        self.watchface1_time4_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(min1_chose))
+        self.watchface1_time5_img.set_src("E:/static/watch_plate/style_1/time/%d.png"%(min2_chose))
         self.watchface1_date_span.set_text(msg[2])#日期
         self.watchface1_week_span.set_text(msg[3])   #星期
 
@@ -717,12 +733,14 @@ class WatchFace():
         #表盘
         self.watchface_list = []
         self.meta = None
-        self.watchface_style_num = "Watchface1"
+        self.watchface_style_num = "Watchface2"
         self.timer_update = osTimer()
         self.main_menu = main_menu
+        self.watchface_style = "Watchface2"
+        EventMesh.subscribe("change_face", self.change_face)
 
     def initialization(self):
-        print("watchface INIT !!!!!!!!")
+        print("watchface INIT !!!!!!!!:",self.watchface_style)
         if self.watchface_list == [] : #第一次初始化
             self.watchface_list.append( Watchface1(self.main_menu))
             self.watchface_list.append( Watchface2(self.main_menu))
@@ -733,15 +751,13 @@ class WatchFace():
         self.meta = self.watchface_style.meta
         self.watchface_style.meta.clear_flag(lv.obj.FLAG.HIDDEN)#显示
         self.watchface_style.initialization()
-
-        EventMesh.subscribe(constants.EVENT.PUSH_STEP,self.watchface_style.get_step)
         self.timer_update.start(10000, 1, self.timerout_update)
-        EventMesh.subscribe("change_face", self.change_face)
+        
     
 
     def change_face(self, event=None, msg=None):
         print("change_face :",msg)
-        self.watchface_style_num = msg
+        self.watchface_style_num = str(msg)
         for wat in self.watchface_list:
             if wat.NAME == self.watchface_style_num :
                 self.watchface_style = wat

diff --git a/3.code/1.watch/2.code/ui_main_menu.py b/3.code/1.watch/2.code/ui_main_menu.py
index f792ea2..ebd6b9d 100644 (file)
--- a/3.code/1.watch/2.code/ui_main_menu.py
+++ b/3.code/1.watch/2.code/ui_main_menu.py
@@ -53,6 +53,7 @@ class MainMenuScreen(Screen):
         self.meta = None
         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 !!!!!!!!")
@@ -74,8 +75,10 @@ class MainMenuScreen(Screen):
 
     def post_processor_after_instantiation(self):
         EventMesh.subscribe("change_style", self.change_style)
-    
 
+    def watch_top_show(self, event, msg): #
+        self.main_menu_style.MainMenu.set_tile_id(0,0,lv.ANIM.OFF)
+        
     def change_style(self, event=None, msg=None): #换风格
         print("change style :",msg)
         self.Close()
@@ -101,12 +104,10 @@ class MainMenuScreen(Screen):
 
     def done_return(self):
         id = self.main_menu_style.MainMenu.get_tile_act().get_child(0).get_text()
-        print("main id:{} {}".format(id,type(id)))
         self.main_menu_style.MainMenu.set_tile_id(0,0,lv.ANIM.OFF)
        
     def btn1_release(self):
         flag = EventMesh.publish("get_lcd_state")
-        print("flag ...{}".format(flag))
         if flag == 0:
             EventMesh.publish(constants.EVENT.SYSTEM_UP)
         else:
@@ -114,12 +115,19 @@ class MainMenuScreen(Screen):
         
     def btn8_press(self):
         flag = EventMesh.publish("get_lcd_state")
-        if self.main_menu_style.MainMenu.get_tile_act().get_child(0).get_text() == "0":
-            print("flag {}".format(flag))
-            if flag == 1:
-                EventMesh.publish(constants.EVENT.SYSTEM_SLEEP)
+        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:
-                EventMesh.publish(constants.EVENT.SYSTEM_UP)
+                if flag == 1:
+                    self.main_menu_style.MainMenu.set_tile_id(0,0,lv.ANIM.OFF)
+                else:
+                    EventMesh.publish(constants.EVENT.SYSTEM_UP)
         else:
             if flag == 1:
                 self.main_menu_style.MainMenu.set_tile_id(0,0,lv.ANIM.OFF)

diff --git a/3.code/1.watch/2.code/ui_setting.py b/3.code/1.watch/2.code/ui_setting.py
index 9832652..5749302 100644 (file)
--- a/3.code/1.watch/2.code/ui_setting.py
+++ b/3.code/1.watch/2.code/ui_setting.py
@@ -45,13 +45,18 @@ setting.center()
 setting.set_size(240, 320)
 setting.add_style(style_screen, lv.PART.MAIN | lv.STATE.DEFAULT)
 
-setting_title = lv.label(setting)
-setting_title.set_pos(0, 10)
-setting_title.set_size(240, 40)
-setting_title.set_text("设置")
-setting_title.set_long_mode(lv.label.LONG.WRAP)
-setting_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
-setting_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
+setting_imei_img = lv.img(setting)
+setting_imei_img.set_pos(75, 10)
+setting_imei_img.set_size(90, 30)
+setting_imei_img.set_src("E:/static/setting/setting_text.png")
+setting_imei_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
+# setting_title = lv.label(setting)
+# setting_title.set_pos(0, 10)
+# setting_title.set_size(240, 40)
+# setting_title.set_text("设置")
+# setting_title.set_long_mode(lv.label.LONG.WRAP)
+# setting_title.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
+# setting_title.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 setting_cont = lv.obj(setting)
 setting_cont.set_pos(0, 50)
@@ -72,8 +77,8 @@ setting_cont.add_style(
 # setting_language_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 # setting_language.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
 # setting_language_img = lv.img(setting_cont)
-# setting_language_img.set_pos(10, setting_cont_y)
-# setting_language_img.set_size(47, 47)
+# setting_language_img.set_pos(10, setting_cont_y)set_size(47, 47)
+# setting_language_img.set_size(232, 80)
 # setting_language_img.add_flag(lv.obj.FLAG.CLICKABLE)
 # setting_language_img.set_src("E:/static/menu_language.png")
 # setting_language_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -81,7 +86,7 @@ setting_cont.add_style(
 
 setting_dialswitch = lv.btn(setting_cont)
 setting_dialswitch.set_pos(0, setting_cont_y)
-setting_dialswitch.set_size(240, 60)
+setting_dialswitch.set_size(0, 0)
 setting_dialswitch_label = lv.label(setting_dialswitch)
 setting_dialswitch_label.set_text("表盘切换")
 setting_dialswitch.set_style_pad_all(0, lv.STATE.DEFAULT)
@@ -90,12 +95,12 @@ setting_dialswitch_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), l
 setting_dialswitch_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_dialswitch.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_dialswitch_img = lv.img(setting_cont)
-setting_dialswitch_img.set_pos(10, setting_cont_y)
-setting_dialswitch_img.set_size(47, 47)
+setting_dialswitch_img.set_pos(0, setting_cont_y)
+setting_dialswitch_img.set_size(232, 80)
 setting_dialswitch_img.add_flag(lv.obj.FLAG.CLICKABLE)
-setting_dialswitch_img.set_src("E:/static/menu_watch_switch.png")
+setting_dialswitch_img.set_src("E:/static/setting/menu_watch_switch.png")
 setting_dialswitch_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-setting_cont_y+=60
+setting_cont_y+=90
 
 
 # setting_themeswitch = lv.btn(setting_cont)
@@ -110,7 +115,7 @@ setting_cont_y+=60
 # setting_themeswitch.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
 # setting_themeswitch_img = lv.img(setting_cont)
 # setting_themeswitch_img.set_pos(10, 120)
-# setting_themeswitch_img.set_size(47, 47)
+# setting_themeswitch_img.set_size(232, 80)
 # setting_themeswitch_img.add_flag(lv.obj.FLAG.CLICKABLE)
 # setting_themeswitch_img.set_src("E:/static/menu_theme_switch.png")
 # setting_themeswitch_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -118,7 +123,7 @@ setting_cont_y+=60
 
 setting_imei = lv.btn(setting_cont)
 setting_imei.set_pos(0, setting_cont_y)
-setting_imei.set_size(240, 60)
+setting_imei.set_size(0, 0)
 setting_imei_label = lv.label(setting_imei)
 setting_imei_label.set_text("设备IMEI号")
 setting_imei.set_style_pad_all(0, lv.STATE.DEFAULT)
@@ -127,16 +132,16 @@ setting_imei_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STAT
 setting_imei_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_imei.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_imei_img = lv.img(setting_cont)
-setting_imei_img.set_pos(10, setting_cont_y)
-setting_imei_img.set_size(47, 47)
+setting_imei_img.set_pos(0, setting_cont_y)
+setting_imei_img.set_size(232, 80)
 setting_imei_img.add_flag(lv.obj.FLAG.CLICKABLE)
-setting_imei_img.set_src("E:/static/menu_imei_qrcode.png")
+setting_imei_img.set_src("E:/static/setting/menu_imei_qrcode.png")
 setting_imei_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-setting_cont_y+=60
+setting_cont_y+=90
 
 setting_app = lv.btn(setting_cont)
 setting_app.set_pos(0, setting_cont_y)
-setting_app.set_size(240, 60)
+setting_app.set_size(0, 0)
 setting_app_label = lv.label(setting_app)
 setting_app_label.set_text("手机安装APP")
 setting_app.set_style_pad_all(0, lv.STATE.DEFAULT)
@@ -145,16 +150,16 @@ setting_app_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.STATE
 setting_app_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_app.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_app_img = lv.img(setting_cont)
-setting_app_img.set_pos(10, setting_cont_y)
-setting_app_img.set_size(47, 47)
+setting_app_img.set_pos(0, setting_cont_y)
+setting_app_img.set_size(232, 80)
 setting_app_img.add_flag(lv.obj.FLAG.CLICKABLE)
-setting_app_img.set_src("E:/static/menu_app_qrcode.png")
+setting_app_img.set_src("E:/static/setting/menu_app_qrcode.png")
 setting_app_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-setting_cont_y+=60
+setting_cont_y+=90
 
 setting_bright = lv.btn(setting_cont)
 setting_bright.set_pos(0, setting_cont_y)
-setting_bright.set_size(240, 60)
+setting_bright.set_size(0, 0)
 setting_bright_label = lv.label(setting_bright)
 setting_bright_label.set_text("屏幕调节")
 setting_bright.set_style_pad_all(0, lv.STATE.DEFAULT)
@@ -163,16 +168,16 @@ setting_bright_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.ST
 setting_bright_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_bright.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_bright_img = lv.img(setting_cont)
-setting_bright_img.set_pos(10, setting_cont_y)
-setting_bright_img.set_size(47, 47)
+setting_bright_img.set_pos(0, setting_cont_y)
+setting_bright_img.set_size(232, 80)
 setting_bright_img.add_flag(lv.obj.FLAG.CLICKABLE)
-setting_bright_img.set_src("E:/static/menu_bright.png")
+setting_bright_img.set_src("E:/static/setting/menu_bright.png")
 setting_bright_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-setting_cont_y+=60
+setting_cont_y+=90
 
 setting_volume = lv.btn(setting_cont)
 setting_volume.set_pos(0, setting_cont_y)
-setting_volume.set_size(240, 60)
+setting_volume.set_size(0, 0)
 setting_volume_label = lv.label(setting_volume)
 setting_volume_label.set_text("铃声")
 setting_volume.set_style_pad_all(0, lv.STATE.DEFAULT)
@@ -181,16 +186,16 @@ setting_volume_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.ST
 setting_volume_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_volume.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_volume_img = lv.img(setting_cont)
-setting_volume_img.set_pos(10, setting_cont_y)
-setting_volume_img.set_size(47, 47)
+setting_volume_img.set_pos(0, setting_cont_y)
+setting_volume_img.set_size(232, 80)
 setting_volume_img.add_flag(lv.obj.FLAG.CLICKABLE)
-setting_volume_img.set_src("E:/static/menu_volume.png")
+setting_volume_img.set_src("E:/static/setting/menu_volume.png")
 setting_volume_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-setting_cont_y+=60
+setting_cont_y+=90
 
 setting_restore = lv.btn(setting_cont)
 setting_restore.set_pos(0, setting_cont_y)
-setting_restore.set_size(240, 60)
+setting_restore.set_size(0, 0)
 setting_restore_label = lv.label(setting_restore)
 setting_restore_label.set_text("恢复出厂设置")
 setting_restore.set_style_pad_all(0, lv.STATE.DEFAULT)
@@ -199,16 +204,16 @@ setting_restore_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.S
 setting_restore_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_restore.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_restore_img = lv.img(setting_cont)
-setting_restore_img.set_pos(10, setting_cont_y)
-setting_restore_img.set_size(47, 47)
+setting_restore_img.set_pos(0, setting_cont_y)
+setting_restore_img.set_size(232, 80)
 setting_restore_img.add_flag(lv.obj.FLAG.CLICKABLE)
-setting_restore_img.set_src("E:/static/menu_restore.png")
+setting_restore_img.set_src("E:/static/setting/menu_restore.png")
 setting_restore_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-setting_cont_y+=60
+setting_cont_y+=90
 
 setting_poweroff = lv.btn(setting_cont)
 setting_poweroff.set_pos(0, setting_cont_y)
-setting_poweroff.set_size(240, 60)
+setting_poweroff.set_size(0, 0)
 setting_poweroff_label = lv.label(setting_poweroff)
 setting_poweroff_label.set_text("关机")
 setting_poweroff.set_style_pad_all(0, lv.STATE.DEFAULT)
@@ -217,16 +222,16 @@ setting_poweroff_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.
 setting_poweroff_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_poweroff.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_poweroff_img = lv.img(setting_cont)
-setting_poweroff_img.set_pos(10, setting_cont_y)
-setting_poweroff_img.set_size(47, 47)
+setting_poweroff_img.set_pos(0, setting_cont_y)
+setting_poweroff_img.set_size(232, 80)
 setting_poweroff_img.add_flag(lv.obj.FLAG.CLICKABLE)
-setting_poweroff_img.set_src("E:/static/menu_poweroff.png")
+setting_poweroff_img.set_src("E:/static/setting/menu_poweroff.png")
 setting_poweroff_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-setting_cont_y+=60
+setting_cont_y+=90
 
 setting_version = lv.btn(setting_cont)
 setting_version.set_pos(0, setting_cont_y)
-setting_version.set_size(240, 60)
+setting_version.set_size(0, 0)
 setting_version_label = lv.label(setting_version)
 setting_version_label.set_text("关于设备")
 setting_version.set_style_pad_all(0, lv.STATE.DEFAULT)
@@ -235,16 +240,16 @@ setting_version_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.S
 setting_version_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_version.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_version_img = lv.img(setting_cont)
-setting_version_img.set_pos(10, setting_cont_y)
-setting_version_img.set_size(47, 47)
+setting_version_img.set_pos(0, setting_cont_y)
+setting_version_img.set_size(232, 80)
 setting_version_img.add_flag(lv.obj.FLAG.CLICKABLE)
-setting_version_img.set_src("E:/static/menu_version.png")
+setting_version_img.set_src("E:/static/setting/menu_version.png")
 setting_version_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
-setting_cont_y+=60
+setting_cont_y+=90
 
 setting_update = lv.btn(setting_cont)
 setting_update.set_pos(0, setting_cont_y)
-setting_update.set_size(240, 60)
+setting_update.set_size(0, 0)
 setting_update_label = lv.label(setting_update)
 setting_update_label.set_text("系统升级")
 setting_update.set_style_pad_all(0, lv.STATE.DEFAULT)
@@ -253,10 +258,10 @@ setting_update_label.set_style_text_color(lv.color_make(0xff, 0xff, 0xff), lv.ST
 setting_update_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_update.add_style(style_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
 setting_update_img = lv.img(setting_cont)
-setting_update_img.set_pos(10, setting_cont_y)
-setting_update_img.set_size(47, 47)
+setting_update_img.set_pos(0, setting_cont_y)
+setting_update_img.set_size(232, 80)
 setting_update_img.add_flag(lv.obj.FLAG.CLICKABLE)
-setting_update_img.set_src("E:/static/menu_upgrade.png")
+setting_update_img.set_src("E:/static/setting/menu_upgrade.png")
 setting_update_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 class SettingScreen(Screen):
@@ -1007,6 +1012,8 @@ class DialswitchScreen(Screen):
         #watchface01.clear_flag(lv.obj.FLAG.HIDDEN)
         btn1_switch.add_state(lv.STATE.CHECKED)
         btn2_switch.clear_state(lv.STATE.CHECKED)
+        EventMesh.publish("change_face", "Watchface1")
+        EventMesh.publish("watch_top_show")
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def watchface02(self,e):
@@ -1014,6 +1021,8 @@ class DialswitchScreen(Screen):
         #watchface2.clear_flag(lv.obj.FLAG.HIDDEN)
         btn1_switch.clear_state(lv.STATE.CHECKED)
         btn2_switch.add_state(lv.STATE.CHECKED)
+        EventMesh.publish("change_face", "Watchface2")
+        EventMesh.publish("watch_top_show")
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def done_return(self):