From: dxy15521469561 <1731678236@qq.com>
Date: Thu, 20 Jul 2023 06:55:25 +0000 (+0800)
Subject: 处理菜单返回bug
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=3bf7dbe1f5fd793cd7f3ee7a3a732c536fffa0d6;p=mirrors%2FASR1603_G5.git

处理菜单返回bug
---

diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appAlipay.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appAlipay.py
index 3cd377ff..0ddd7597 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appAlipay.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/appAlipay.py
@@ -441,6 +441,7 @@ class AlipayOpenScreen(Screen):
         pass
         
     def btn1_release(self):
+        EventMesh.publish("return_alipay")
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn8_press(self):
diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
index a47ffb71..2b8038c9 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui.py
@@ -3148,13 +3148,13 @@ class StepScreen(Screen):
             self.meta = step_screen
 
         step = EventMesh.publish("get_old_step_value")
-        step_label_01.set_text("{}æ­¥".format(step))
+        step_label_01.set_text("{} æ­¥".format(step))
         self.timer.start(1000, 1, self.revcing)
 
     def revcing(self, *args, **kwargs):
         global step_screen,step_label ,step_label_01 ,step_img 
         step = EventMesh.publish("get_old_step_value")
-        step_label_01.set_text("{}æ­¥".format(step))
+        step_label_01.set_text("{} æ­¥".format(step))
 
     def Close(self):
         self.timer.stop()
@@ -4119,13 +4119,6 @@ spo2_label_1 = None
 spo2_line = None
 spo2_last_time = None
 spo2_last_value = None
-heartrate_screen = None
-heartrate_label = None
-heartrate_done_img = None
-heartrate_start_label = None
-heartrate_bpm_label = None
-heartrate_done_label = None
-heartrate_line_bg_img = None
 spo2_line1 = None
 spo2_line2 = None
 spo2_line3 = None
diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_main_menu.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_main_menu.py
index 3ddafc4f..06e04cdc 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_main_menu.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_main_menu.py
@@ -329,6 +329,8 @@ class MainMenuScreen(Screen):
         MainMenu2_img_alipay.add_event_cb(lambda e: EventMesh.callback_wrapper(self.img_cb(e, "alipay_open")), lv.EVENT.CLICKED, None)
         
         EventMesh.subscribe("watch_top_show", self.watch_top_show)
+        EventMesh.subscribe("return_alipay", self.return_alipay)
+        EventMesh.subscribe("return_setiing", self.return_setiing)
         #MainMenu2_img_alipay.add_event_cb(lambda e: img_cb(e, "Watchface_set"), lv.EVENT.CLICKED, None)
         
     def initialization(self):
@@ -373,7 +375,14 @@ class MainMenuScreen(Screen):
                 if id != "0":
                     MainMenu2_til.set_tile_id(0,1,lv.ANIM.OFF)
                 else:
-                    MainMenu2_til.set_tile_id(0,0,lv.ANIM.OFF)
+                    EventMesh.publish("load_screen", {"screen": "alipay_open"})
+    
+    def return_alipay(self, event, msg):
+        MainMenu2_til.set_tile_id(0,0,lv.ANIM.OFF)
+
+    def return_setiing(self, event, msg):
+        MainMenu2_til.set_tile_id(7,0,lv.ANIM.OFF)
+
                 
         
     def btn8_press(self):
@@ -427,5 +436,6 @@ class MainMenuScreen(Screen):
     def Close(self):
         self.watchface.Close()
         print("main_menu Close !!!!!!!!")
+        self.menu_id = '1'
         return
 
diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_setting.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_setting.py
index 54a873ff..5f1edb51 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_setting.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/ui_setting.py
@@ -293,6 +293,7 @@ class SettingScreen(Screen):
         EventMesh.publish("load_screen", {"screen": "main_menu"})
 
     def btn1_release(self):
+        EventMesh.publish("return_setiing")
         EventMesh.publish("load_screen", {"screen": "main_menu"})
         
     def btn8_press(self):