From: p15692025051 <846603105@qq.com>
Date: Wed, 19 Apr 2023 07:19:55 +0000 (+0800)
Subject: 优化滑动
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=8985838a67969f6fa2b4b8cf12371864b47b26d3;p=mirrors%2FASR1603_G5.git

优化滑动
---

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 f792ea2f..a48bf246 100644
--- a/3.code/1.watch/2.code/ui_main_menu.py
+++ b/3.code/1.watch/2.code/ui_main_menu.py
@@ -53,13 +53,14 @@ class MainMenuScreen(Screen):
         self.meta = None
         self.main_menu_style_num = "MainMenu2"
         self.main_menu_WatchFace = None
-
+        self.menu_id = "0"
     def initialization(self):
         print("main_menu INIT !!!!!!!!")
+        init_flag = False
         if self.main_menu_list == [] : #第一次初始化
             #self.main_menu_list.append( MainMenu1())
             self.main_menu_list.append( MainMenu2())
-
+            init_flag = True
         for menu in self.main_menu_list:
             if menu.NAME == self.main_menu_style_num :
                 self.main_menu_style = menu
@@ -71,6 +72,8 @@ class MainMenuScreen(Screen):
         self.main_menu_WatchFace.initialization()#初始化表盘
         self.meta = self.main_menu_style.meta
         self.main_menu_style.initialization()#初始化菜单
+        if init_flag == True :
+            self.main_menu_style.MainMenu.set_tile_id(0,1,lv.ANIM.OFF)
 
     def post_processor_after_instantiation(self):
         EventMesh.subscribe("change_style", self.change_style)
@@ -92,7 +95,7 @@ class MainMenuScreen(Screen):
         self.main_menu_WatchFace.initialization()#初始化表盘
         self.meta = self.main_menu_style.meta
         self.main_menu_style.initialization()#初始化菜单
-
+        self.main_menu_style.MainMenu.set_tile_id(0,1,lv.ANIM.OFF)
     def Close(self):
         self.main_menu_WatchFace.Close()
         print("main_menu Close !!!!!!!!")
@@ -102,7 +105,7 @@ 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)
+        self.main_menu_style.MainMenu.set_tile_id(0,1,lv.ANIM.OFF)
        
     def btn1_release(self):
         flag = EventMesh.publish("get_lcd_state")
@@ -110,7 +113,7 @@ class MainMenuScreen(Screen):
         if flag == 0:
             EventMesh.publish(constants.EVENT.SYSTEM_UP)
         else:
-            self.main_menu_style.MainMenu.set_tile_id(0,0,lv.ANIM.OFF)
+            self.main_menu_style.MainMenu.set_tile_id(0,1,lv.ANIM.OFF)
         
     def btn8_press(self):
         flag = EventMesh.publish("get_lcd_state")
@@ -122,7 +125,7 @@ class MainMenuScreen(Screen):
                 EventMesh.publish(constants.EVENT.SYSTEM_UP)
         else:
             if flag == 1:
-                self.main_menu_style.MainMenu.set_tile_id(0,0,lv.ANIM.OFF)
+                self.main_menu_style.MainMenu.set_tile_id(0,1,lv.ANIM.OFF)
             else:
                 EventMesh.publish(constants.EVENT.SYSTEM_UP)
 
@@ -135,8 +138,22 @@ class MainMenuScreen(Screen):
         id = self.main_menu_style.MainMenu.get_tile_act().get_child(0).get_text()
         if id == "0":
             EventMesh.publish("load_screen", {"screen": "popup"})
-    
-
+    def done_left_to_right(self):
+        id = self.main_menu_style.MainMenu.get_tile_act().get_child(0).get_text()
+        print("done_left_to_right:ID{}".format(id))
+        if id == "0":
+            self.main_menu_style.MainMenu.set_tile_id(8,0,lv.ANIM.OFF)
+        elif self.menu_id != '2' and id == '1':
+            self.main_menu_style.MainMenu.set_tile_id(8,0,lv.ANIM.OFF)
+        self.menu_id = id
+    def done_right_to_left(self):
+        id = self.main_menu_style.MainMenu.get_tile_act().get_child(0).get_text()
+        print("done_right_to_left:ID{}".format(id))
+        if id == "0":
+            self.main_menu_style.MainMenu.set_tile_id(0,0,lv.ANIM.OFF)
+        elif (self.menu_id != '8' ) and id == '9':
+            self.main_menu_style.MainMenu.set_tile_id(0,0,lv.ANIM.OFF)
+        self.menu_id = id   
 #主菜单风格1，四宫格
 class MainMenu1():
     NAME = "MainMenu1"
@@ -341,14 +358,14 @@ class MainMenu2():
         self.MainMenu.set_scrollbar_mode(0)
         self.MainMenu.add_style(style_MainMenu_screen_default, lv.PART.MAIN | lv.STATE.DEFAULT)
         #表盘
-        self.MainMenu_Watchface = self.MainMenu.add_tile(0, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu_Watchface = self.MainMenu.add_tile(0, 1,  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.MainMenu.add_tile(1, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_alipay = self.MainMenu.add_tile(0, 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)
@@ -364,7 +381,7 @@ class MainMenu2():
         # 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.MainMenu.add_tile(2, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_phone = self.MainMenu.add_tile(1, 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)
@@ -385,7 +402,7 @@ class MainMenu2():
         # self.label_phone.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
 
         #通讯录
-        self.MainMenu2_contacts = self.MainMenu.add_tile(3, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_contacts = self.MainMenu.add_tile(2, 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)
@@ -406,7 +423,7 @@ class MainMenu2():
         # self.label_contacts.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
 
         #心律检测
-        self.MainMenu2_heartrate = self.MainMenu.add_tile(4, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_heartrate = self.MainMenu.add_tile(3, 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)
@@ -427,7 +444,7 @@ class MainMenu2():
         # self.label_heartrate.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
 
         #血样检测
-        self.MainMenu2_spo2 = self.MainMenu.add_tile(5, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_spo2 = self.MainMenu.add_tile(4, 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)
@@ -448,7 +465,7 @@ class MainMenu2():
         # self.label_spo2.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
 
         #工具箱
-        self.MainMenu2_toolbox = self.MainMenu.add_tile(6, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_toolbox = self.MainMenu.add_tile(5, 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)
@@ -469,7 +486,7 @@ class MainMenu2():
         # self.label_toolbox.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
 
         #设置
-        self.MainMenu2_setting = self.MainMenu.add_tile(7, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_setting = self.MainMenu.add_tile(6, 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)
@@ -490,7 +507,7 @@ class MainMenu2():
         # self.label_setting.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
 
         #体温测量
-        self.MainMenu2_temperature = self.MainMenu.add_tile(8, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_temperature = self.MainMenu.add_tile(7, 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)
@@ -511,7 +528,7 @@ class MainMenu2():
         # self.label_temperature.add_style(style_font_youyuan_25, lv.PART.MAIN | lv.STATE.DEFAULT)
 
         #微聊
-        self.MainMenu2_wechat = self.MainMenu.add_tile(9, 0,  lv.DIR.LEFT | lv.DIR.RIGHT)
+        self.MainMenu2_wechat = self.MainMenu.add_tile(8, 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)