同步雷鸟修改

diff --git a/cat1modem/leiniao/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_TEST0725_LN_PY_SRV_V25_20250919-1516_20251024-1731.zip b/cat1modem/leiniao/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_TEST0725_LN_PY_SRV_V25_20250919-1516_20251024-1731.zip
new file mode 100644 (file)
index 0000000..5bcc9c1
Binary files /dev/null and b/cat1modem/leiniao/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_TEST0725_LN_PY_SRV_V25_20250919-1516_20251024-1731.zip differ

diff --git a/cat1modem/n9/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_TEST0725_W9_20251024-1729.zip b/cat1modem/n9/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_TEST0725_W9_20251024-1729.zip
new file mode 100644 (file)
index 0000000..dc011e4
Binary files /dev/null and b/cat1modem/n9/EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_TEST0725_W9_20251024-1729.zip differ

diff --git a/cat1modem/src/LeiNiao/cat1Service.py b/cat1modem/src/LeiNiao/cat1Service.py
index 2491cac..aca9d61 100644 (file)
--- a/cat1modem/src/LeiNiao/cat1Service.py
+++ b/cat1modem/src/LeiNiao/cat1Service.py
@@ -57,6 +57,7 @@ from usr.EventMesh import eventMesh
 from usr.httpota import httpota
 from usr.telecom_dmp import telecomDmpCb
 from usr.china_mobile_dmp import chinamobileCb
+from usr.tcpserver import TcpServiceInit
 
 from usr.china_mobile_ai_regulation import aiRegulation
 # 设置日志输出级别
@@ -414,6 +415,9 @@ class Cat1Service:
             # UDP_MSG_OTA
         elif cmd == "1C":# 
             self.read_dev_ai_id()
+        elif cmd== "1D":
+            TcpService = TcpServiceInit()
+            TcpService.start_socket_thread()
         elif cmd == "AC":#
             if self.ack_sem==1:
                 self.ack_sem=0

diff --git a/cat1modem/src/LeiNiao/tcpserver.py b/cat1modem/src/LeiNiao/tcpserver.py
index d107056..aa0a0e5 100644 (file)
--- a/cat1modem/src/LeiNiao/tcpserver.py
+++ b/cat1modem/src/LeiNiao/tcpserver.py
@@ -84,8 +84,7 @@ class TcpServiceInit:
         self.conn= None
         self.__sock_file = None
         self.__sock_file = self.__socket_file_init()
-        self.__thread_file = _thread.start_new_thread(self.__Socket_File_Thread, ())
-        self.conn_thread=_thread.start_new_thread(self._client_conn_proc, ())
+
 
     def __pack_tlv_format(self, head, content):
         head1 = head
@@ -596,7 +595,12 @@ class TcpServiceInit:
                     
     def otaTimeOut(self,*argc):
         clog.info("重启成功！！！！！！！！\r\n")
+        
+    def start_socket_thread(self):
+        __thread_file = _thread.start_new_thread(self.__Socket_File_Thread, ())
+        conn_thread=_thread.start_new_thread(self._client_conn_proc, ())
+
 
-TcpService = TcpServiceInit()
+# TcpService = TcpServiceInit()
 
 

diff --git a/cat1modem/src/cat1Service.py b/cat1modem/src/cat1Service.py
index d7515e7..979553f 100644 (file)
--- a/cat1modem/src/cat1Service.py
+++ b/cat1modem/src/cat1Service.py
@@ -920,7 +920,7 @@ class Cat1Service:
                 clog.info("Socket_SEND_Thread data:{} {}".format(data[0],data[1]))
                 count=20
                 
-                while count and self.ack_sem :
+                while count & self.ack_sem :
                     utime.sleep_ms(1)
                     count=count-1
                     # if data[2]: