一级界面优化时间字体优化

diff --git a/3.code/1.watch/2.code/alarm.py b/3.code/1.watch/2.code/alarm.py
index 40e672c..de339a5 100644 (file)
--- a/3.code/1.watch/2.code/alarm.py
+++ b/3.code/1.watch/2.code/alarm.py
@@ -646,25 +646,28 @@ class PopupAlarmScreen(Screen):
         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.aud.stop()
+
     def exit_alarm_page(self,*arges):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def done_left_to_right(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
     def done_right_to_left(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
     def done_bottom_to_top(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
     def done_top_to_bottom(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
     def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
                
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 #闹钟列表
 class ClkListScreen(Screen):
@@ -820,7 +823,7 @@ class ClkListScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "toolbox"})
                
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "toolbox"})

diff --git a/3.code/1.watch/2.code/appAlipay.py b/3.code/1.watch/2.code/appAlipay.py
index 9eab224..0a89359 100644 (file)
--- a/3.code/1.watch/2.code/appAlipay.py
+++ b/3.code/1.watch/2.code/appAlipay.py
@@ -353,7 +353,7 @@ class AlipayOpenScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 class Alipay_1_1(Screen):
     NAME = "alipay_1_1"
@@ -430,7 +430,7 @@ class Alipay_1_1(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 class Alipay_invite(Screen):
     NAME = "alipay_invite"
@@ -487,7 +487,7 @@ class Alipay_invite(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 class Alipay_inviting(Screen):
     NAME = "alipay_inviting"
@@ -522,7 +522,7 @@ class Alipay_inviting(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 class Alipay_success(Screen):
     NAME = "alipay_success"
@@ -565,7 +565,7 @@ class Alipay_success(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 class Alipay_paycode(Screen):
     NAME = "alipay_paycode"
@@ -650,7 +650,7 @@ class Alipay_paycode(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 class Alipay_pay_success(Screen):
     NAME = "alipay_pay_success"
@@ -706,7 +706,7 @@ class Alipay_pay_success(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 class Alipay_collect(Screen):
     NAME = "alipay_collect"
@@ -756,7 +756,7 @@ class Alipay_collect(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 
 class Alipay_parent(Screen):
@@ -830,4 +830,4 @@ class Alipay_parent(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
\ No newline at end of file
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
\ No newline at end of file

diff --git a/3.code/1.watch/2.code/appFactoryMode.py b/3.code/1.watch/2.code/appFactoryMode.py
index c2ec6d0..bc5dd7e 100644 (file)
--- a/3.code/1.watch/2.code/appFactoryMode.py
+++ b/3.code/1.watch/2.code/appFactoryMode.py
@@ -58,7 +58,7 @@ class FactoryModeScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 
 FactoryModeLocation_screen = lv.obj()
@@ -156,4 +156,4 @@ class FactoryModeLocationScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "factorymode"})
         
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
\ No newline at end of file
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
\ No newline at end of file

diff --git a/3.code/1.watch/2.code/appWechat.py b/3.code/1.watch/2.code/appWechat.py
index 74d77cb..631161c 100644 (file)
--- a/3.code/1.watch/2.code/appWechat.py
+++ b/3.code/1.watch/2.code/appWechat.py
@@ -435,10 +435,10 @@ class WechatScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 
 class TK_ProtoCol(ProtoCol):

diff --git a/3.code/1.watch/2.code/main.py b/3.code/1.watch/2.code/main.py
index 565f87a..2f635a7 100644 (file)
--- a/3.code/1.watch/2.code/main.py
+++ b/3.code/1.watch/2.code/main.py
@@ -54,7 +54,7 @@ if __name__ == '__main__':
     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.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
@@ -68,7 +68,7 @@ if __name__ == '__main__':
     btn_device.start()
 
     ui = _ui.UI()
-    ui.add_screen(WatchFaceScreen()) 
+    # ui.add_screen(WatchFaceScreen()) 
     ui.add_screen(_ui.PopupScreen()) 
     ui.add_screen(_ui.PhoneScreen()) 
     ui.add_screen(MainMenuScreen()) 
@@ -176,5 +176,5 @@ if __name__ == '__main__':
     app.append_manager(sm)
     app.start()
 
-    EventMesh.publish("load_screen", {"screen": "watchface"})
+    EventMesh.publish("load_screen", {"screen": "main_menu"})
 

diff --git a/3.code/1.watch/2.code/main_1.py b/3.code/1.watch/2.code/main_1.py
index 565f87a..2f635a7 100644 (file)
--- a/3.code/1.watch/2.code/main_1.py
+++ b/3.code/1.watch/2.code/main_1.py
@@ -54,7 +54,7 @@ if __name__ == '__main__':
     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.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
@@ -68,7 +68,7 @@ if __name__ == '__main__':
     btn_device.start()
 
     ui = _ui.UI()
-    ui.add_screen(WatchFaceScreen()) 
+    # ui.add_screen(WatchFaceScreen()) 
     ui.add_screen(_ui.PopupScreen()) 
     ui.add_screen(_ui.PhoneScreen()) 
     ui.add_screen(MainMenuScreen()) 
@@ -176,5 +176,5 @@ if __name__ == '__main__':
     app.append_manager(sm)
     app.start()
 
-    EventMesh.publish("load_screen", {"screen": "watchface"})
+    EventMesh.publish("load_screen", {"screen": "main_menu"})
 

diff --git a/3.code/1.watch/2.code/main_t.py b/3.code/1.watch/2.code/main_t.py
index c0c0cae..68070b5 100644 (file)
--- a/3.code/1.watch/2.code/main_t.py
+++ b/3.code/1.watch/2.code/main_t.py
@@ -125,5 +125,5 @@ if __name__ == '__main__':
     app.append_manager(sm)
     app.start()
 
-    EventMesh.publish("load_screen", {"screen": "watchface"})
+    EventMesh.publish("load_screen", {"screen": "main_menu"})
 

diff --git a/3.code/1.watch/2.code/mgr.py b/3.code/1.watch/2.code/mgr.py
index 219e092..a93cf02 100644 (file)
--- a/3.code/1.watch/2.code/mgr.py
+++ b/3.code/1.watch/2.code/mgr.py
@@ -462,7 +462,7 @@ def voice_callback(args):
 
    elif args[0] == 12:
         print('voicecall disconnect')
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
    elif args[0] == 13:
         print('voicecall is waiting, PhoneNO.: ', args[6])

diff --git a/3.code/1.watch/2.code/static/watch_plate/style_1/bg.png b/3.code/1.watch/2.code/static/watch_plate/style_1/bg.png
index 71c4338..cedcfba 100644 (file)
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_1/bg.png and b/3.code/1.watch/2.code/static/watch_plate/style_1/bg.png differ

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

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

diff --git a/3.code/1.watch/2.code/static/watch_plate/style_1/step.png b/3.code/1.watch/2.code/static/watch_plate/style_1/step.png
deleted file mode 100644 (file)
index 385213b..0000000
Binary files a/3.code/1.watch/2.code/static/watch_plate/style_1/step.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 25b9586..138e42c 100644 (file)
--- a/3.code/1.watch/2.code/ui.py
+++ b/3.code/1.watch/2.code/ui.py
@@ -454,7 +454,7 @@ incoming_call_img.set_src("E:/static/IMAGE_NOTICE_CALL.png")
 incoming_call_img.add_style(style_img, lv.PART.MAIN | lv.STATE.DEFAULT)
 
 incoming_call_name_label = lv.label(incoming_call)
-incoming_call_name_label.set_pos(0, 100)
+incoming_call_name_label.set_pos(0, 140)
 incoming_call_name_label.set_size(240, 50)
 incoming_call_name_label.set_style_text_align(lv.TEXT_ALIGN.CENTER, 0)
 incoming_call_name_label.add_style(style_font_youyuan_20, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -969,10 +969,10 @@ class PhoneScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 
 
@@ -1167,13 +1167,13 @@ class CallLogScreen(Screen):
             voiceCall.callStart(str(phonnum))
 
     def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 # ------------------------------拨打电话-------------dialing screen----------------------------------------------------------
 dialing_screen = lv.obj()
@@ -1286,13 +1286,13 @@ class DialingScreen(Screen):
         voiceCall.callEnd()
 
     def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 ############短信###############################
 MSG_FLAG = 0
 MSG_MAX = 10 #最大显示短信内容条数
@@ -1396,7 +1396,7 @@ class PopupScreen(Screen):
             
             self.sms_detail_list = lv.obj(msg_list_screen)
             self.sms_detail_list.set_pos(0, 50)
-            self.sms_detail_list.set_size(180, 270)
+            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:
@@ -1408,7 +1408,7 @@ class PopupScreen(Screen):
  
                 if tmp != -1:
                     msg_btn = lv.btn(self.sms_detail_list)
-                    msg_btn.set_size(240,65)
+                    msg_btn.set_size(230,65)
                     msg_btn.set_pos(0,67*count)
                     msg_btn.add_style(style_sms_bg_btn, lv.PART.MAIN | lv.STATE.DEFAULT)
                     msg_btn.add_event_cb(lambda e: self.calling(e),
@@ -1433,7 +1433,7 @@ class PopupScreen(Screen):
                     detail1 = tmp[1]
                     _btn_label4 = lv.label(msg_btn)
                     _btn_label4.set_pos(0, 34)
-                    _btn_label4.set_size(220, 28)
+                    _btn_label4.set_size(180, 28)
                     _btn_label4.set_text(detail1)
                     _btn_label4.set_long_mode(lv.label.LONG.DOT)
                     _btn_label4.add_style(style_font_youyuan_20_black, lv.PART.MAIN | lv.STATE.DEFAULT)
@@ -1464,11 +1464,11 @@ class PopupScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "msg_detail"})
     
     def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 
 
@@ -1495,9 +1495,9 @@ class MsgDetailScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "popup"})
 
     def hangup(self,e):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "popup"})
 # -------------------------------------------heartrate screen----------------------------------------------------------
@@ -1617,10 +1617,10 @@ class HeartrateScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     
 
@@ -1646,10 +1646,10 @@ class ToolboxScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 
 
@@ -1888,10 +1888,10 @@ class OnCallScreen(Screen):
         
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 # -------------------------------------------step screen----------------------------------------------------------#
 step_screen = lv.obj()
 step = lv.obj(step_screen)
@@ -1946,7 +1946,7 @@ class StepScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "toolbox"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "toolbox"})
@@ -2089,7 +2089,7 @@ class WeatherScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "toolbox"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "toolbox"})
@@ -2247,10 +2247,10 @@ class ContactsScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 
 
@@ -2304,10 +2304,10 @@ class AlarmScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "toolbox"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 
 class TemperatureScreen(Screen):
@@ -2321,10 +2321,10 @@ class TemperatureScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 
 spo2_screen = lv.obj()
@@ -2478,10 +2478,10 @@ class Spo2Screen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 # -------------------------------------------countdown screen----------------------------------------------------------
 countdown_screen = lv.obj()
 countdown = lv.obj(countdown_screen)
@@ -2850,7 +2850,7 @@ class CountdownScreen(Screen):
     def btn1_release(self):
         if self.g_state == 0:
             self.timer.stop()
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         if self.g_state == 0:
@@ -2889,7 +2889,7 @@ class CountdownEndScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "countdown"})
         
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
 # -------------------------------------------stopwatch screen----------------------------------------------------------
 stopwatch_screen = lv.obj()
@@ -3064,7 +3064,7 @@ class StopwatchScreen(Screen):
     def btn1_release(self):
         if self.s_state == 0:
             self.timer.stop()
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         if self.s_state == 0:
@@ -3137,23 +3137,24 @@ class UIFINDScreen(Screen):
        self.stop_FIND()
 
     def done_left_to_right(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
     def done_right_to_left(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
     def done_bottom_to_top(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
     def done_top_to_bottom(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
     def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
     def done_click(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
  
 
 #from usr.ui_WatchFaceScreen import WatchFaceScreen
@@ -3167,12 +3168,13 @@ class UI(object):
         self.lv = lv
         self.system_sleep_timer = osTimer()
         self.system_sleep_timer_count = 0
-        self.main_flag = 0
         self.sleep_flag = 1
         self.level = 0
         self.read_data = {}
         self.level = EventMesh.publish("get_brightness_level")
         self.read_data = EventMesh.publish("get_storage_data")
+        self.main_flag = 0
+        self.main_id = 0
         # print("self.read_data:{} self.level:{}".format(self.read_data,self.level))
         if self.level == None:
             
@@ -3222,7 +3224,9 @@ class UI(object):
         EventMesh.subscribe("done_error", self.ui_press)
         EventMesh.subscribe("call_in", self.publish_call_in)
 
-
+        EventMesh.subscribe("get_lcd_state", self.get_lcd_state)
+        EventMesh.subscribe("set_lcd_state", self.set_lcd_state)
+        
         #EventMesh.subscribe("call_in", self.publish_call_in)
         #EventMesh.subscribe("set_bg_img", self.set_bg_img)
 
@@ -3234,6 +3238,13 @@ class UI(object):
         for screen in self.screen_list:
             screen.post_processor_after_instantiation()
 
+    def get_lcd_state(self, event, key):
+        return self.sleep_flag
+    
+    def set_lcd_state(self, event, key):
+        print("key_:{}".format(key))
+        self.sleep_flag = key
+    
     def system_sleep_rest(self, event, key):
         self.system_sleep_timeout_rest()
 
@@ -3255,20 +3266,15 @@ class UI(object):
     def btn_press(self, event, key):
         print("btn_press: {}".format(event))
         #主表盘按电源键，息屏
-        if event == "btn8_press" and self.main_flag == 1:
-            if self.sleep_flag == 1 :
-                self.__lcd_off()
-                return
+        
         #息屏状态按按钮都亮屏
-        if event == "btn8_press" and self.sleep_flag == 0:
-            self.__lcd_on()
-            return
-        self.__lcd_on()
         
         
+        if self.main_flag != 1 and self.sleep_flag == 0:
+            self.__lcd_on()
+            return
         # if event == "btn1_press":
         #     self.screen.btn1_press()
-
         if event == "btn8_press":
             self.screen.btn8_press()
         if event == "btn8_long_press":
@@ -3280,8 +3286,9 @@ class UI(object):
             self.screen.btn1_release()
 
     def __lcd_on(self):
-        print("__lcd_on")
+        
         if self.sleep_flag == 0 :
+            print("__lcd_on")
             if self.sleep_lock == 1:
                 utime.sleep_ms(200)
             self.sleep_lock = 1
@@ -3295,6 +3302,7 @@ class UI(object):
             lv.autoSleep(0)
             pm.autosleep(0)
             utime.sleep_ms(100)
+            EventMesh.publish("set_lcd_state",self.sleep_flag)
             self.level = EventMesh.publish("get_brightness_level")
 
             self.read_data = EventMesh.publish("get_storage_data")
@@ -3313,8 +3321,9 @@ class UI(object):
         EventMesh.publish("load_screen", {"screen": "dialing", "meta": msg})
 
     def __lcd_off(self):
-        #print("__lcd_off")
+        
         if self.sleep_flag == 1 :
+            print("__lcd_off")
             if self.sleep_lock == 1:
                 utime.sleep_ms(200)
             self.sleep_lock = 1
@@ -3328,7 +3337,7 @@ class UI(object):
             lv.autoSleep(1)
             pm.autosleep(1)
             utime.sleep_ms(100)
-           
+            EventMesh.publish("set_lcd_state",self.sleep_flag)
             self.sleep_lock = 0
 
     def system_sleep(self, event, msg) :
@@ -3361,10 +3370,12 @@ class UI(object):
             if scr.NAME == msg["screen"]:
                 # 每次屏幕切换开始息屏倒计时
                 self.__lcd_on()
-                if scr.NAME == 'watchface':
+                if scr.NAME == 'main_menu':
                     self.main_flag = 1
                 else :
                     self.main_flag = 0
+                
+    
                 self.screen = scr
                 if self.screen_old != None :
                     self.screen_old.Close() #先关闭上一次界面
@@ -3387,10 +3398,11 @@ class UI(object):
             if scr.NAME == msg["screen"]:
                 # 每次屏幕切换开始息屏倒计时
                 self.__lcd_on()
-                if scr.NAME == 'watchface':
+                if scr.NAME == 'main_menu':
                     self.main_flag = 1
                 else :
                     self.main_flag = 0
+
                 self.screen = scr
                 if self.screen_old != None :
                     self.screen_old.Close() #先关闭上一次界面
@@ -3412,10 +3424,16 @@ class UI(object):
             if scr.NAME == msg["screen"]:
                 # 每次屏幕切换开始息屏倒计时
                 self.__lcd_on()
-                if scr.NAME == 'watchface':
+                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 :
                     self.screen_old.Close() #先关闭上一次界面

diff --git a/3.code/1.watch/2.code/ui_WatchFaceScreen.py b/3.code/1.watch/2.code/ui_WatchFaceScreen.py
index 7ecebe8..aa4565f 100644 (file)
--- a/3.code/1.watch/2.code/ui_WatchFaceScreen.py
+++ b/3.code/1.watch/2.code/ui_WatchFaceScreen.py
@@ -369,6 +369,13 @@ class Watchface1():
         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)
@@ -407,45 +414,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()
@@ -461,7 +468,33 @@ class Watchface1():
         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对象绑定
+
+        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_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 = 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))
@@ -641,10 +674,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_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])   #星期
 
@@ -677,7 +711,7 @@ class Watchface1():
 
 
 class WatchFace():
-    NAME = "watchface"
+    NAME = "main_menu"
 
     def __init__(self,main_menu):
         #表盘

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 cdf93d0..f792ea2 100644 (file)
--- a/3.code/1.watch/2.code/ui_main_menu.py
+++ b/3.code/1.watch/2.code/ui_main_menu.py
@@ -98,12 +98,44 @@ class MainMenuScreen(Screen):
         print("main_menu Close !!!!!!!!")
         return
 
+
     def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        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):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        flag = EventMesh.publish("get_lcd_state")
+        print("flag ...{}".format(flag))
+        if flag == 0:
+            EventMesh.publish(constants.EVENT.SYSTEM_UP)
+        else:
+            self.main_menu_style.MainMenu.set_tile_id(0,0,lv.ANIM.OFF)
+        
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        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)
+            else:
+                EventMesh.publish(constants.EVENT.SYSTEM_UP)
+        else:
+            if flag == 1:
+                self.main_menu_style.MainMenu.set_tile_id(0,0,lv.ANIM.OFF)
+            else:
+                EventMesh.publish(constants.EVENT.SYSTEM_UP)
+
+    def done_bottom_to_top(self):
+        id = self.main_menu_style.MainMenu.get_tile_act().get_child(0).get_text()
+        if id == "0":
+            EventMesh.publish("load_screen", {"screen": "call_log"})
+
+    def done_top_to_bottom(self):
+        id = self.main_menu_style.MainMenu.get_tile_act().get_child(0).get_text()
+        if id == "0":
+            EventMesh.publish("load_screen", {"screen": "popup"})
+    
 
 #主菜单风格1，四宫格
 class MainMenu1():
@@ -111,11 +143,12 @@ class MainMenu1():
     def __init__(self): 
         print("MainMenuSquare:__init__")    
         self.meta = lv.obj()
-        self.MainMenu1 = lv.tileview(self.meta)
-        self.MainMenu1.set_scrollbar_mode(0)
-        self.MainMenu1.add_style(style_MainMenu_screen_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+        self.MainMenu = lv.tileview(self.meta)
+        self.MainMenu.set_scrollbar_mode(0)
+        self.MainMenu.add_style(style_MainMenu_screen_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+        
         #第一页
-        self.MainMenu1_1 = self.MainMenu1.add_tile(0, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu1_1 = self.MainMenu.add_tile(0, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
 
         # #闹钟
         self.MainMenu1_img_alarm = lv.btn(self.MainMenu1_1)
@@ -157,7 +190,7 @@ class MainMenu1():
 
 
         #第二页
-        self.MainMenu1_2 = self.MainMenu1.add_tile(1, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu1_2 = self.MainMenu.add_tile(1, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
 
         # #通话
         self.MainMenu1_img_call = lv.btn(self.MainMenu1_2)
@@ -197,7 +230,7 @@ class MainMenu1():
         self.MainMenu1_2_img.add_style(style_MainMenu_img_default, lv.PART.MAIN | lv.STATE.DEFAULT)
 
         #第三页
-        self.MainMenu1_3 = self.MainMenu1.add_tile(2, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu1_3 = self.MainMenu.add_tile(2, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
 
         #第三页图片
         self.MainMenu1_3_img = lv.img(self.MainMenu1_3)
@@ -235,7 +268,7 @@ class MainMenu1():
         self.MainMenu1_img_steps.add_event_cb(lambda e: self.img_cb(e,  "step"), lv.EVENT.CLICKED, None)
 
         #第四页
-        self.MainMenu1_4 = self.MainMenu1.add_tile(3, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu1_4 = self.MainMenu.add_tile(3, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
 
         #第四页图片
         self.MainMenu1_4_img = lv.img(self.MainMenu1_4)
@@ -277,7 +310,7 @@ class MainMenu1():
         self.MainMenu1_img_tem.add_event_cb(lambda e: self.img_cb(e,  "temperature"), lv.EVENT.CLICKED, None)
         
         #第五页
-        self.MainMenu1_5 = self.MainMenu1.add_tile(4, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu1_5 = self.MainMenu.add_tile(4, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
 
         #微聊
         self.MainMenu1_img_wechat = lv.img(self.MainMenu1_5)
@@ -304,35 +337,45 @@ class MainMenu2():
     def __init__(self): 
         print("MainMenu1:__init__")    
         self.meta = lv.obj()
-        self.MainMenu2 = lv.tileview(self.meta)
-        self.MainMenu2.set_scrollbar_mode(0)
-        self.MainMenu2.add_style(style_MainMenu_screen_default, lv.PART.MAIN | lv.STATE.DEFAULT)
+        self.MainMenu = lv.tileview(self.meta)
+        self.MainMenu.set_scrollbar_mode(0)
+        self.MainMenu.add_style(style_MainMenu_screen_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         #表盘
-        self.MainMenu_Watchface = self.MainMenu2.add_tile(0, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
-        
+        self.MainMenu_Watchface = self.MainMenu.add_tile(0, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        label_text = lv.label(self.MainMenu_Watchface)
+        label_text.set_pos(0, 240)
+        label_text.set_size(0, 0)
+        label_text.set_text("0")
+        #self.MainMenu2.set_tile_id(2,0,lv.ANIM.ON)
         #支付宝
-        self.MainMenu2_alipay = self.MainMenu2.add_tile(1, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_alipay = self.MainMenu.add_tile(1, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        label_text = lv.label(self.MainMenu2_alipay)
+        label_text.set_pos(0, 240)
+        label_text.set_size(0, 0)
+        label_text.set_text("1")
         self.MainMenu2_img_alipay = lv.img(self.MainMenu2_alipay)
         self.MainMenu2_img_alipay.set_size(160,230)
         self.MainMenu2_img_alipay.set_pos(40,20)
         self.MainMenu2_img_alipay.set_src("E:/static/main_menu/main_menu2/alipay_.png")
         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.label_alipay = lv.label(self.MainMenu2_alipay)
-        # self.label_alipay.set_pos(0, 240)
-        # self.label_alipay.set_size(240, 80)
-        # self.label_alipay.set_text("支付宝")
+        
         # 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)
         #拨号盘
-        self.MainMenu2_phone = self.MainMenu2.add_tile(2, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_phone = self.MainMenu.add_tile(2, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        label_text = lv.label(self.MainMenu2_phone)
+        label_text.set_pos(0, 240)
+        label_text.set_size(0, 0)
+        label_text.set_text("2")
         self.MainMenu2_img_phone = lv.img(self.MainMenu2_phone)
         self.MainMenu2_img_phone.set_size(160,230)
         self.MainMenu2_img_phone.set_pos(40,20)
         self.MainMenu2_img_phone.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CALL.png")
         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.label_phone = lv.label(self.MainMenu2_phone)
         # self.label_phone.set_pos(0, 240)
         # self.label_phone.set_size(240, 80)
@@ -342,13 +385,18 @@ class MainMenu2():
         # self.label_phone.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
 
         #通讯录
-        self.MainMenu2_contacts = self.MainMenu2.add_tile(3, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_contacts = self.MainMenu.add_tile(3, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        label_text = lv.label(self.MainMenu2_contacts)
+        label_text.set_pos(0, 240)
+        label_text.set_size(0, 0)
+        label_text.set_text("3")
         self.MainMenu2_img_contacts = lv.img(self.MainMenu2_contacts)
         self.MainMenu2_img_contacts.set_size(160,230)
         self.MainMenu2_img_contacts.set_pos(40,20)
         self.MainMenu2_img_contacts.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_CONTACTS.png")
         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.label_contacts = lv.label(self.MainMenu2_contacts)
         # self.label_contacts.set_pos(0, 240)
         # self.label_contacts.set_size(240, 80)
@@ -358,13 +406,18 @@ class MainMenu2():
         # self.label_contacts.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
 
         #心律检测
-        self.MainMenu2_heartrate = self.MainMenu2.add_tile(4, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_heartrate = self.MainMenu.add_tile(4, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        label_text = lv.label(self.MainMenu2_heartrate)
+        label_text.set_pos(0, 240)
+        label_text.set_size(0, 0)
+        label_text.set_text("4")
         self.MainMenu2_img_heartrate = lv.img(self.MainMenu2_heartrate)
         self.MainMenu2_img_heartrate.set_size(160,230)
         self.MainMenu2_img_heartrate.set_pos(40,20)
         self.MainMenu2_img_heartrate.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_HEART_RATE_HEALTH_DETECT.png")
         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.label_heartrate = lv.label(self.MainMenu2_heartrate)
         # self.label_heartrate.set_pos(0, 240)
         # self.label_heartrate.set_size(240, 80)
@@ -374,13 +427,18 @@ class MainMenu2():
         # self.label_heartrate.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
 
         #血样检测
-        self.MainMenu2_spo2 = self.MainMenu2.add_tile(5, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_spo2 = self.MainMenu.add_tile(5, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        label_text = lv.label(self.MainMenu2_spo2)
+        label_text.set_pos(0, 240)
+        label_text.set_size(0, 0)
+        label_text.set_text("5")
         self.MainMenu2_img_spo2 = lv.img(self.MainMenu2_spo2)
         self.MainMenu2_img_spo2.set_size(160,230)
         self.MainMenu2_img_spo2.set_pos(40,20)
         self.MainMenu2_img_spo2.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SPO2_DETECT.png")
         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.label_spo2 = lv.label(self.MainMenu2_spo2)
         # self.label_spo2.set_pos(0, 240)
         # self.label_spo2.set_size(240, 80)
@@ -390,13 +448,18 @@ class MainMenu2():
         # self.label_spo2.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
 
         #工具箱
-        self.MainMenu2_toolbox = self.MainMenu2.add_tile(6, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_toolbox = self.MainMenu.add_tile(6, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        label_text = lv.label(self.MainMenu2_toolbox)
+        label_text.set_pos(0, 240)
+        label_text.set_size(0, 0)
+        label_text.set_text("6")
         self.MainMenu2_img_toolbox = lv.img(self.MainMenu2_toolbox)
         self.MainMenu2_img_toolbox.set_size(160,230)
         self.MainMenu2_img_toolbox.set_pos(40,20)
         self.MainMenu2_img_toolbox.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TOOLS.png")
         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.label_toolbox = lv.label(self.MainMenu2_toolbox)
         # self.label_toolbox.set_pos(0, 240)
         # self.label_toolbox.set_size(240, 80)
@@ -406,13 +469,18 @@ class MainMenu2():
         # self.label_toolbox.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
 
         #设置
-        self.MainMenu2_setting = self.MainMenu2.add_tile(7, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_setting = self.MainMenu.add_tile(7, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        label_text = lv.label(self.MainMenu2_setting)
+        label_text.set_pos(0, 240)
+        label_text.set_size(0, 0)
+        label_text.set_text("7")
         self.MainMenu2_img_setting = lv.img(self.MainMenu2_setting)
         self.MainMenu2_img_setting.set_size(160,230)
         self.MainMenu2_img_setting.set_pos(40,20)
         self.MainMenu2_img_setting.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_SETTINGS.png")
         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.label_setting = lv.label(self.MainMenu2_setting)
         # self.label_setting.set_pos(0, 240)
         # self.label_setting.set_size(240, 80)
@@ -422,13 +490,18 @@ class MainMenu2():
         # self.label_setting.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
 
         #体温测量
-        self.MainMenu2_temperature = self.MainMenu2.add_tile(8, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_temperature = self.MainMenu.add_tile(8, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        label_text = lv.label(self.MainMenu2_temperature)
+        label_text.set_pos(0, 240)
+        label_text.set_size(0, 0)
+        label_text.set_text("8")
         self.MainMenu2_img_temperature = lv.img(self.MainMenu2_temperature)
         self.MainMenu2_img_temperature.set_size(160,230)
         self.MainMenu2_img_temperature.set_pos(40,20)
         self.MainMenu2_img_temperature.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_TEMPERATURE.png")
         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.label_temperature = lv.label(self.MainMenu2_temperature)
         # self.label_temperature.set_pos(0, 240)
         # self.label_temperature.set_size(240, 80)
@@ -438,13 +511,18 @@ class MainMenu2():
         # self.label_temperature.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
 
         #微聊
-        self.MainMenu2_wechat = self.MainMenu2.add_tile(9, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_wechat = self.MainMenu.add_tile(9, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        label_text = lv.label(self.MainMenu2_wechat)
+        label_text.set_pos(0, 240)
+        label_text.set_size(0, 0)
+        label_text.set_text("9")
         self.MainMenu2_img_wechat = lv.img(self.MainMenu2_wechat)
         self.MainMenu2_img_wechat.set_size(160,230)
         self.MainMenu2_img_wechat.set_pos(40,20)
         self.MainMenu2_img_wechat.set_src("E:/static/main_menu/main_menu2/IMAGE_ONE_PAGE_WECHAT.png")
         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.label_wechat = lv.label(self.MainMenu2_wechat)
         # self.label_wechat.set_pos(0, 240)
         # self.label_wechat.set_size(240, 80)

diff --git a/3.code/1.watch/2.code/ui_setting.py b/3.code/1.watch/2.code/ui_setting.py
index 3bbe5e3..9832652 100644 (file)
--- a/3.code/1.watch/2.code/ui_setting.py
+++ b/3.code/1.watch/2.code/ui_setting.py
@@ -296,10 +296,10 @@ class SettingScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 ##################################################################
 # -------------------------------------------language screen----------------------------------------------------------
 language_screen = lv.obj()
@@ -788,7 +788,7 @@ class RestoreScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "setting"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "setting"})
@@ -809,7 +809,7 @@ class UpdateScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "setting"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "setting"})
@@ -843,7 +843,7 @@ class VersionScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "setting"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "setting"})
@@ -944,7 +944,7 @@ class PoweroffScreen(Screen):
 
     def btn1_release(self):
         if self.button_flag == 0:
-            EventMesh.publish("load_screen", {"screen": "watchface"})
+            EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         if self.button_flag == 0:
@@ -984,7 +984,7 @@ class LanguageScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "setting"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "setting"})
@@ -1007,20 +1007,20 @@ 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("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def watchface02(self,e):
         #watchface01.add_flag(lv.obj.FLAG.HIDDEN)
         #watchface2.clear_flag(lv.obj.FLAG.HIDDEN)
         btn1_switch.clear_state(lv.STATE.CHECKED)
         btn2_switch.add_state(lv.STATE.CHECKED)
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def done_return(self):
         EventMesh.publish("load_screen", {"screen": "setting"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "setting"})
@@ -1042,19 +1042,19 @@ class ThemeswitchScreen(Screen):
         menu_btn1_switch.add_state(lv.STATE.CHECKED)
         menu_btn2_switch.clear_state(lv.STATE.CHECKED)
         EventMesh.publish("change_style", "MainMenu1")
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def fun2(self,e):
         menu_btn1_switch.clear_state(lv.STATE.CHECKED)
         menu_btn2_switch.add_state(lv.STATE.CHECKED)
         EventMesh.publish("change_style", "MainMenu2")
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def done_return(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "setting"})
@@ -1101,7 +1101,7 @@ class ImeiScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "setting"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "setting"})
@@ -1121,7 +1121,7 @@ class AppScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "setting"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "setting"})
@@ -1209,7 +1209,7 @@ class BrightnessScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "setting"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "setting"})
@@ -1229,7 +1229,7 @@ class VolumeScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "setting"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "setting"})
@@ -1276,7 +1276,7 @@ class PhoneringScreen(Screen):
     def done_right_to_left(self):
         pass
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "volume"})
@@ -1316,7 +1316,7 @@ class AlarmvolumeScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "volume"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "volume"})
@@ -1356,7 +1356,7 @@ class MsgvolumeScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "volume"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "volume"})
@@ -1465,7 +1465,7 @@ class totalvolumeScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "setting"})
 
     def btn1_release(self):
-        EventMesh.publish("load_screen", {"screen": "watchface"})
+        EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):
         EventMesh.publish("load_screen", {"screen": "setting"})