From: dxy15521469561 <1731678236@qq.com>
Date: Wed, 2 Aug 2023 11:40:28 +0000 (+0800)
Subject: 优化短信更改ip和port
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=bafc2b9f80e1f9568c385c32ff38bd254d045571;p=mirrors%2FASR1603_G5.git

优化短信更改ip和port
---

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 8fd3a796..0dc89bc8 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
@@ -2764,7 +2764,7 @@ class testSmsSetIPManager(Abstract):#
                 
                 self.read_data["set_new_ip_addr"] = self.newip
                 self.read_data["set_new_com"] = self.newcom
-                self.read_data["set_new_md5"] = self.newmd5
+                # self.read_data["set_new_md5"] = self.newmd5
 
 
                 with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
@@ -2772,7 +2772,7 @@ class testSmsSetIPManager(Abstract):#
         else:
             self.newip = "api.xcloudtech.com"#默认防走丢协议
             self.newcom = 9000
-            self.newmd5 = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"
+            # self.newmd5 = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"
 
         # server_addr = "tcptest.tx.kidxin.com"
         # #SETIP:api.xcloudtech.com:9000
@@ -2786,11 +2786,11 @@ class testSmsSetIPManager(Abstract):#
     def set_new_ip(self, event, msg): 
         self.newip = str(msg[0])
         self.newcom = int(msg[1])
-        self.newmd5 = str(msg[2])
+        # self.newmd5 = str(msg[2])
         #短信格式：SETIP:api.xcloudtech.com:9000:bZld0ALsZTt15tKEZhOlLPgbsO75BLTP 以冒号分隔 SETIP:ip地址：ip端口号:ip密钥key
         self.read_data["set_new_ip_addr"] = self.newip #通过短信设置ip地址
         self.read_data["set_new_com"]= self.newcom #通过短信设置ip端口号
-        self.read_data["set_new_md5"] = self.newmd5  #通过短信设置ip的key密钥
+        # self.read_data["set_new_md5"] = self.newmd5  #通过短信设置ip的key密钥
        
         
         with open("/ext/static/storage_file/config.json","w",encoding="utf-8") as fd:
@@ -2800,7 +2800,8 @@ class testSmsSetIPManager(Abstract):#
 
     def get_new_ip(self, event, msg):
         
-        return [self.newip,self.newcom,self.newmd5]
+        # return [self.newip,self.newcom,self.newmd5]
+        return [self.newip,self.newcom]
 
 
     
\ No newline at end of file
diff --git a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py
index 74399d6d..0b25bf5d 100644
--- a/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py
+++ b/2.sdk/project/K5/sdk/services/microPython/ports/quectel/core/protocol.py
@@ -300,7 +300,7 @@ class ProtoCol(Abstract):
     SEPARATOR = ";"
     END = ";" + chr(0x01)
     PID = "SZKW"
-    # md5_key = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"
+    #md5_key = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"
    
     # PID = "qAELPTKmFanR4RHe"
     # md5_key = "3JyCjsw4ryXKzjzudayY"
@@ -316,10 +316,10 @@ class ProtoCol(Abstract):
         self.HEADER = self.HEADER.format(self.TYPE)
 
         self.md5_key = "19ED5F01235A6B360A09C1800432C31B"
-        ip_infor = {}
-        ip_infor = EventMesh.publish("get_new_ip")
-        if ip_infor != None:
-            self.md5_key = ip_infor[2]
+        # ip_infor = {}
+        # ip_infor = EventMesh.publish("get_new_ip")
+        # if ip_infor != None:
+        #     self.md5_key = ip_infor[2]
         # print("md5_key",self.md5_key)
 
     def initialization(self, *args, **kwargs):
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 3418c98a..2bb94007 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,12 +1843,15 @@ def msg_cb(args):
     if index != -1:
         tmp = sms.searchTextMsg(index)
         detail = tmp[1]#内容
-        new_ip = detail.split(':')[1]
-        new_com = detail.split(':')[2]
-        new_md5 = detail.split(':')[3]
+        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 len(new_ip) != 0:
-            EventMesh.publish("set_new_ip", [new_ip,new_com,new_md5])#设置关机时间
+        
     if index >= sms_max-1:
         EventMesh.publish("load_screen", {"screen": "message_full"})
     else: