From: p15692025051 <846603105@qq.com>
Date: Wed, 18 Oct 2023 08:18:26 +0000 (+0800)
Subject: c06s添加编码器代码
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=846db7a7af5b1502dab654bb81c8ff6671cae34e;p=mirrors%2FASR1603_G5.git

c06s添加编码器代码
---

diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui.py
index 00e9ba15..72a46767 100644
--- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui.py
+++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui.py
@@ -258,6 +258,10 @@ class Screen(Abstract):
 
     def done_error(self):
         pass
+    def done_DOWN(self):
+        pass
+    def done_UP(self):
+        pass
     def handle_message_event(self,data):
         pass
     def publish_message_event(self,data):
@@ -6467,6 +6471,8 @@ class UI(object):
         EventMesh.subscribe("done_click", self.ui_press)
         EventMesh.subscribe("done_error", self.ui_press)
         EventMesh.subscribe("done_press", self.ui_press)
+        EventMesh.subscribe("done_DOWN", self.ui_press)
+        EventMesh.subscribe("done_UP", self.ui_press)
         EventMesh.subscribe("call_in", self.publish_call_in)
 
         EventMesh.subscribe("get_lcd_state", self.get_lcd_state)
@@ -6551,6 +6557,10 @@ class UI(object):
             self.screen.done_return()
         if event == "done_click":
             self.screen.done_click()
+        if event == "done_DOWN":
+            self.screen.done_DOWN()
+        if event == "done_UP":
+            self.screen.done_UP()
         # if event == "done_press":
         #     self.system_sleep_timeout_rest()
     def btn_press(self, event, key):
diff --git a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_main_menu.py b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_main_menu.py
index 2d1ad777..e8737dd7 100644
--- a/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_main_menu.py
+++ b/2.sdk/project/C06S/sdk/services/microPython/ports/quectel/core/ui_main_menu.py
@@ -477,7 +477,33 @@ class MainMenuScreen(Screen):
         else :
             self.menu_action = 2
         self.menu_id = id   
+    def done_DOWN(self):#下滑
+        id = MainMenu2_til.get_tile_act().get_child(0).get_text()
+        print("done_right_to_left: {} {} {}".format(id,self.menu_id,MainMenu2_num))
+        if id == "0":
+            MainMenu2_til.set_tile_id(MainMenu2_num-2,0,lv.ANIM.OFF)
+        elif self.menu_id != '2' and id == '1':
+            MainMenu2_til.set_tile_id(MainMenu2_num-2,0,lv.ANIM.OFF) 
+        else :
+            if id == "1":
+                MainMenu2_til.set_tile_id(MainMenu2_num-2,0,lv.ANIM.OFF)
+            else :
+                MainMenu2_til.set_tile_id(int(id)-2,0,lv.ANIM.ON)
+        self.menu_id = id
+    def done_UP(self):#上滑
+        id = MainMenu2_til.get_tile_act().get_child(0).get_text()
+        print("done_right_to_left: {} {} {}".format(id,self.menu_id,MainMenu2_num))
+        if id == "0":
+            MainMenu2_til.set_tile_id(0,0,lv.ANIM.OFF)
+        elif (self.menu_id != str(MainMenu2_num-2) ) and id == str(MainMenu2_num-1) :
+            MainMenu2_til.set_tile_id(0,0,lv.ANIM.OFF)
+        else :
+            if int(id) == MainMenu2_num-1 :
+                MainMenu2_til.set_tile_id(0,0,lv.ANIM.OFF)
+            else :
+                MainMenu2_til.set_tile_id(int(id),0,lv.ANIM.ON)
 
+        self.menu_id = id 
     def Close(self):
         self.watchface.Close()
         print("main_menu Close !!!!!!!!")
diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
index d7825f8a..b94b1f2c 100644
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
@@ -75,14 +75,14 @@ class intervManager(Abstract):
         self.alarm_timer_count = 0
         self.old_min = 0
         self.interInfo_queue = Queue()
-        _thread.stack_size(10*1024)
+        _thread.stack_size(10*1024+64)
         _thread.start_new_thread(self.interInfo_queue_thread, ())
         _thread.stack_size(8*1024)
         EventMesh.subscribe("publish_message_event_interInfo",self.publish_message_event_interInfo)
         
 
         self.audio_event_queue = Queue()
-        _thread.stack_size(10*1024)
+        _thread.stack_size(10*1024+128)
         _thread.start_new_thread(self.audio_event_queue_thread, ())
         _thread.stack_size(8*1024)
         EventMesh.subscribe("publish_message_event_audio",self.publish_message_event_audio)
@@ -1694,7 +1694,7 @@ class BtnDevice(Abstract):
         self.led_state = 0
 
         self.btnInfo_queue = Queue()
-        _thread.stack_size(10*1024)
+        _thread.stack_size(10*1024+192)
         _thread.start_new_thread(self.btnInfo_queue_thread, ())
         _thread.stack_size(8*1024)
         
@@ -1790,6 +1790,7 @@ class BtnDevice(Abstract):
             
             if self.GPIO26_status == 1:#松开
                 if self.pwkey_count >= 1: #防抖100ms
+                    print("self.GPIO26_status == 1")
                     self.pwkey_timer.stop()
                     self.pwkey_count = 0
                     self.pwkey_press = 0
@@ -1801,10 +1802,11 @@ class BtnDevice(Abstract):
         EventMesh.publish("publish_message_event_btnInfo",{"func":self.pwKey_timeout_cb,"data":0})  
 
     def pwKey_timeout_cb(self, data):#侧边按键
-        if self.pwKey_press_count == 1:
+        if self.pwKey_press_count >= 1:
+            print("pwKey_timeout_cb:self.pwKey_press_count >= 1")
             EventMesh.publish("stop_led_timer")#设置参数
             EventMesh.publish("dialing_out_event")#电话呼叫中voiceCall.callEnd()
-            self.pwKey_press_count = 0
+            
             # EventMesh.publish(constants.EVENT.START_LOCATION) #开始定位
             sos_flag = EventMesh.publish("get_sos_flag")
             if sos_flag == 1:
@@ -1816,6 +1818,7 @@ class BtnDevice(Abstract):
             flag = EventMesh.publish("get_call_state") 
             if flag != 1:
                 EventMesh.publish("set_sim_mode")#
+        self.pwKey_press_count = 0
 
     def sosKey_extint_cb(self,args):
         power_off = EventMesh.publish("get_power_off_state")#获取关机标识
@@ -1833,6 +1836,7 @@ class BtnDevice(Abstract):
                     self.pwkey_timer.stop()
                     self.sosKey_timer.stop()
                     self.wechatKey_press_count = 0
+                    self.pwKey_press_count = 0
                     self.sosKey_press = 1
                     self.pwkey_press = 0
                     self.wechatKey_press = 0
diff --git a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py
index e92b866f..1d710304 100644
--- a/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py
+++ b/2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py
@@ -95,6 +95,7 @@ def main_init():
 
     app = watchApp()
     app.set_ui(ui)
+    app.append_manager(getStorageDataManager())
     app.append_manager(mgr.AlarmVolumeLevelManager()) \
         .append_manager(mgr.MsgVolumeLevelManager()) \
         .append_manager(mgr.PhoneVolumeLevelManager()) \
@@ -128,7 +129,7 @@ def main_init():
     app.append_manager(gethistoryDataManager())
     app.append_manager(getHrTimeManager())
     app.append_manager(getBrightnessManager())
-    app.append_manager(getStorageDataManager())
+    
     app.append_manager(getUpLoadDataManager())
     app.append_manager(getVolumSizeManager())
     app.append_manager(getTempTimeManager())