From: dxy15521469561 <1731678236@qq.com>
Date: Tue, 8 Aug 2023 02:24:41 +0000 (+0800)
Subject: K5
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=d10c99c7d77bb027453756f526e768a2fbe45d07;p=mirrors%2FASR1603_G5.git

K5
1.修改WT协议
---

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 8a23d387..5ccdeb9c 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
@@ -94,14 +94,17 @@ class SockManager(Abstract):
         # self.server_addr = "tcptest.tx.kidxin.com"
         # self.server_port = 11500
         
-        self.server_addr = "api.xcloudtech.com"
-        self.server_port = 9000
-        ip_infor = {}
-        ip_infor = EventMesh.publish("get_new_ip")
-        # print("ip_infor:{} ".format(ip_infor))
-        if ip_infor != None:
-            self.server_addr = ip_infor[0]
-            self.server_port = ip_infor[1]
+        self.server_addr = "8.134.110.49"
+        self.server_port = 30346
+
+        # self.server_addr = "api.xcloudtech.com"
+        # self.server_port = 9000
+        # ip_infor = {}
+        # ip_infor = EventMesh.publish("get_new_ip")
+        # # print("ip_infor:{} ".format(ip_infor))
+        # if ip_infor != None:
+        #     self.server_addr = ip_infor[0]
+        #     self.server_port = ip_infor[1]
         print("server_addr:{} server_port:{}".format(self.server_addr,self.server_port))
         _thread.start_new_thread(self.connect, ())
         
@@ -168,7 +171,7 @@ class SockManager(Abstract):
     def socket_send_queue_thread(self):
          while True:
             data = self.socket_send_queue.get()
-            print("TCP:send data1 len:{}".format(len(data)))
+            print("TCP:send data1 len:{}".format(data))
 
             #print("ui_queue_thread:data = {}".format(data))
             socketsta = self.sock.getsocketsta() 
@@ -299,7 +302,8 @@ class ProtoCol(Abstract):
     HEADER = "#@{}@#;"
     SEPARATOR = ";"
     END = ";" + chr(0x01)
-    PID = "SZKW"
+    # PID = "SZKW"
+    PID = "qAELPTKmFanR4RHe"
     #md5_key = "bZld0ALsZTt15tKEZhOlLPgbsO75BLTP"
    
     # PID = "qAELPTKmFanR4RHe"
@@ -315,7 +319,8 @@ class ProtoCol(Abstract):
         self.key = EventMesh.publish(constants.EVENT.GET_KEY)
         self.HEADER = self.HEADER.format(self.TYPE)
 
-        self.md5_key = "19ED5F01235A6B360A09C1800432C31B"
+        # self.md5_key = "19ED5F01235A6B360A09C1800432C31B"
+        self.md5_key = "3JyCjsw4ryXKzjzudayY"
         # ip_infor = {}
         # ip_infor = EventMesh.publish("get_new_ip")
         # if ip_infor != None:
@@ -598,11 +603,13 @@ class UD_ProtoCol(ProtoCol):
     
         #这个是发送WT位置数据到手机端
         msg_tmp = wt_data.split('UD,')
-        msg_tmp = msg_tmp[1]
+        msg_tmp = "WT,"+msg_tmp[1]
+        data_1_len = len(msg_tmp)
         # print("WT_ProtoCol:msg_tmp:%s"%(msg_tmp))
-        send_data_1 = self.PID+"*%s*%04x*WT"%(self.imei,len(msg_tmp))
-        MD5_SIGN_1 = self.pack_MD5_head(send_data_1)
-        data_1 = "[%s%s,%s]"%(str(MD5_SIGN_1),send_data_1,msg_tmp)
+        MD5_head_data_1 = self.PID+"*%s*%04x*WT"%(self.imei,data_1_len)
+        MD5_SIGN_1 = self.pack_MD5_head(MD5_head_data_1)
+        send_data_1 = self.PID+"*%s*%04X*%s"%(self.imei,data_1_len,msg_tmp)
+        data_1 = "[%s%s]"%(str(MD5_SIGN_1),send_data_1)
         # print("WT_ProtoCol:send:%s"%(data_1))
         EventMesh.publish(constants.EVENT.CHANNEL_SOCKET_SEND, data_1)
         # 通过socket发送到服务器端
@@ -755,7 +762,7 @@ class WT_ProtoCol(ProtoCol):
 
     def send(self, event, msg):
         # [SZKW*867387060319491*0008*WT]
-        send_data = self.PID+"*%s*003*WT"%(self.imei)
+        send_data = self.PID+"*%s*0002*WT"%(self.imei)
         MD5_SIGN = self.pack_MD5_head(send_data)
         data = "[%s%s]"%(str(MD5_SIGN),send_data)
         # print("WT_ProtoCol:send:%s"%(data))
@@ -804,7 +811,7 @@ class REMIND_ProtoCol(ProtoCol):
 
     def send(self, event, msg):
         # [SZKW*867387060319491*0008*REMIND]
-        send_data = self.PID+"*%s*006*REMIND"%(self.imei)
+        send_data = self.PID+"*%s*0006*REMIND"%(self.imei)
         MD5_SIGN = self.pack_MD5_head(send_data)
         data = "[%s%s]"%(str(MD5_SIGN),send_data)
         # print("REMIND_ProtoCol:send:%s"%(data))
@@ -874,7 +881,7 @@ class HRSTART_ProtoCol(ProtoCol):
 
     def send(self, event, msg):
         # [SZKW*867387060319491*0008*hrtstart]
-        send_data = self.PID+"*%s*008*hrtstart"%(self.imei)
+        send_data = self.PID+"*%s*0008*hrtstart"%(self.imei)
         MD5_SIGN = self.pack_MD5_head(send_data)
         data = "[%s%s]"%(str(MD5_SIGN),send_data)
         # print("HRSTART_ProtoCol:send:%s"%(data))
@@ -1373,7 +1380,7 @@ class ProtoColResolver(object):
     def handler(self, data):
         # 这里接收数据
         
-        # print("handler -> {}".format(data))
+        #print("handler -> {}".format(data))
         # if data.startswith('Init;'):
         #     data = data[5:]
         #     EventMesh.publish(constants.EVENT.SET_KEY, {"value": ujson.loads(data)['KEY']})