From: dxy15521469561 <1731678236@qq.com>
Date: Mon, 17 Jun 2024 02:28:55 +0000 (+0800)
Subject: 优化表盘切换滑动事件
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=c645eac5fe06b30c8328a268cb99819059bc43f1;p=mirrors%2FASR1603_G5.git

优化表盘切换滑动事件
分配内存配置文件
---

diff --git a/2.sdk/project/W8/sdk/services/microPython/ports/quectel/core/ui_setting.py b/2.sdk/project/W8/sdk/services/microPython/ports/quectel/core/ui_setting.py
index 86e9cb71..1eead47f 100644
--- a/2.sdk/project/W8/sdk/services/microPython/ports/quectel/core/ui_setting.py
+++ b/2.sdk/project/W8/sdk/services/microPython/ports/quectel/core/ui_setting.py
@@ -1332,7 +1332,9 @@ class DialswitchScreen(Screen):
         super().__init__()
         self.meta = dialswitch_screen
         self.watchface_style_num = "Watchface1"
-        dialswitch_img1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.watchface01(e)),
+        dialswitch_screen.add_event_cb(lambda e:EventMesh.callback_wrapper(self.button_cb(e,1)), lv.EVENT.GESTURE, None)
+        
+        dialswitch_img1.add_event_cb(lambda e: EventMesh.callback_wrapper(self.button_cb(e,2)),
                                      lv.EVENT.SHORT_CLICKED, None)
         self.dial_num = 1
         self.move = 0
@@ -1368,7 +1370,30 @@ class DialswitchScreen(Screen):
     def done_return(self):
         EventMesh.publish("load_screen", {"screen": "setting"})
 
+    def button_cb(self,e,msg):
+        code = e.get_code()
+        indev = lv.indev_get_act()
+        lv.indev_t.wait_release(indev)
+        dir = lv.indev_t.get_gesture_dir(indev)
+        if code == lv.EVENT.GESTURE:
+            if dir == lv.DIR.RIGHT:
+                if self.dial_num > 1:
+                    self.dial_num-=1
+                else:
+                    self.dial_num = 2 
+                self.show_info()
+            elif dir == lv.DIR.LEFT:
+                self.dial_num+=1
+                if self.dial_num > 2:
+                    self.dial_num = 1
+                self.show_info()
+
+        elif  code == lv.EVENT.SHORT_CLICKED:
+            if msg != 1:
+                self.enter_main_show(1)
+
     def done_left_to_right(self):#右滑
+        return
         #print("done_left_to_right!!!!!!!!!")
         self.move = 1
         if self.dial_num > 1:
@@ -1379,6 +1404,7 @@ class DialswitchScreen(Screen):
         self.show_info()
 
     def done_right_to_left(self):#左滑
+        return
         #print("done_right_to_left!!!!!!!!!")
         self.move = 2
         self.dial_num+=1
diff --git a/2.sdk/project/W8/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip b/2.sdk/project/W8/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip
index eaa52580..262acd14 100644
Binary files a/2.sdk/project/W8/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip and b/2.sdk/project/W8/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip differ