From: dxy15521469561 <1731678236@qq.com>
Date: Thu, 3 Aug 2023 10:18:27 +0000 (+0800)
Subject: 修改菜单滑动的问题
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=c4f4a0ba2150739badf89454bbbadea828b00aff;p=mirrors%2FASR1603_G5.git

修改菜单滑动的问题
---

diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
index 0dc89bc8..f6048e4c 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/mgr.py
@@ -2737,6 +2737,7 @@ class setSmsIndexManager(Abstract):#
 
 class testSmsSetIPManager(Abstract):#
     def __init__(self):
+        self.timer = osTimer()
         self.newip = ""#默认防走丢协议
         self.newcom = 0
         self.read_data = {}
@@ -2796,6 +2797,11 @@ class testSmsSetIPManager(Abstract):#
         with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
             ujson.dump(self.read_data,fd)
         # print("msg:{} self.read_data:{}".format(msg,self.read_data))
+        number = str(msg[2])
+        sms.sendPduMsg(number, 'set ok', 'UCS2')
+        self.timer.start(5*1000,0,self.fun)
+        
+    def fun(self,*argc):
         Power.powerRestart()
 
     def get_new_ip(self, event, msg):
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 2bb94007..a75b9ff0 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
@@ -1843,14 +1843,16 @@ def msg_cb(args):
     if index != -1:
         tmp = sms.searchTextMsg(index)
         detail = tmp[1]#内容
-        if  detail.find("SETIP:") != -1:
-            new_ip = detail.split(':')[1]
-            new_com = detail.split(':')[2]
-            # new_md5 = detail.split(':')[3]
-            if len(new_ip) != 0 and len(new_com) != 0:
-                EventMesh.publish("set_new_ip", [new_ip,new_com])#设置关机时间
-                # EventMesh.publish("set_new_ip", [new_ip,new_com,new_md5])#设置关机时间
-        # print("detail {} tmp_de:{}".format(detail,new_ip,new_com))
+        if  detail.find("SETIP:") != -1:#寻找是否有这个字符串
+            tmp_test = detail.split("SETIP:")[1]
+            if  tmp_test.find(":") != -1:
+                new_ip = tmp_test.split(':')[0]
+                # print("tmp_test:{} new_ip:{}".format(tmp_test,new_ip))
+                new_com = tmp_test.split(':')[1]
+                # new_md5 = detail.split(':')[3]
+                if len(new_ip) > 0 and len(new_com) > 0:
+                    EventMesh.publish("set_new_ip", [new_ip,new_com,tmp[0]])#设置关机时间
+                    # EventMesh.publish("set_new_ip", [new_ip,new_com,new_md5])#设置关机时间
         
     if index >= sms_max-1:
         EventMesh.publish("load_screen", {"screen": "message_full"})
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 a62ab27d..0226fefc 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
@@ -360,27 +360,28 @@ class MainMenuScreen(Screen):
         pass#
     
     def scroll_begin_event_cb(self, e):
+        pass
     #     EventMesh.publish("publish_message_event_ui",{"func":self.scroll_begin_event,"data":0})
     # def scroll_begin_event(self, data):    
         #处理轻微滑动不跳页面问题
-        self.scroll_begin_event_count+=1
+        # self.scroll_begin_event_count+=1
         
-        if self.scroll_begin_event_count == 1:
-            self.menu_new_id = MainMenu2_til.get_tile_act().get_child(0).get_text()
-            #print("scroll_begin_event scroll_begin_event {} old_id {} new_id{}".format(self.scroll_begin_event_count,self.menu_old_id,self.menu_new_id))
-        elif self.scroll_begin_event_count == 2:
-            self.menu_old_id = MainMenu2_til.get_tile_act().get_child(0).get_text()
-            print("scroll_begin_event menu_action {} old_id {} new_id {}".format(self.menu_action,self.menu_old_id,self.menu_new_id))
-            self.scroll_begin_event_count = 0
-            if self.menu_old_id == self.menu_new_id and self.menu_action == 1:
-                MainMenu2_til.set_tile_id(int(self.menu_old_id)-2,0,lv.ANIM.ON)
-                print("scroll_begin_event menu_action == 1")
-            elif self.menu_old_id == self.menu_new_id and self.menu_action == 2:
-                print("scroll_begin_event menu_action == 2")
-                MainMenu2_til.set_tile_id(int(self.menu_old_id),0,lv.ANIM.ON)
-            self.menu_action = 0
-        else :
-            self.scroll_begin_event_count = 0
+        # if self.scroll_begin_event_count == 1:
+        #     self.menu_new_id = MainMenu2_til.get_tile_act().get_child(0).get_text()
+        #     #print("scroll_begin_event scroll_begin_event {} old_id {} new_id{}".format(self.scroll_begin_event_count,self.menu_old_id,self.menu_new_id))
+        # elif self.scroll_begin_event_count == 2:
+        #     self.menu_old_id = MainMenu2_til.get_tile_act().get_child(0).get_text()
+        #     print("scroll_begin_event menu_action {} old_id {} new_id {}".format(self.menu_action,self.menu_old_id,self.menu_new_id))
+        #     self.scroll_begin_event_count = 0
+        #     if self.menu_old_id == self.menu_new_id and self.menu_action == 1:
+        #         MainMenu2_til.set_tile_id(int(self.menu_old_id)-2,0,lv.ANIM.ON)
+        #         print("scroll_begin_event menu_action == 1")
+        #     elif self.menu_old_id == self.menu_new_id and self.menu_action == 2:
+        #         print("scroll_begin_event menu_action == 2")
+        #         MainMenu2_til.set_tile_id(int(self.menu_old_id),0,lv.ANIM.ON)
+        #     self.menu_action = 0
+        # else :
+        #     self.scroll_begin_event_count = 0
         
         # MainMenu = e.get_target()
         # code = e.get_code()