From: 胡传军 <1224667075@qq.com> Date: Fri, 24 Oct 2025 11:15:42 +0000 (+0000) Subject: Merge #2598 into sdk650pathc0423 from refs/changes/2598/head X-Git-Tag: V1.0.9_20251128_194606_LN~173^2^2 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=244c8b40c90af4d8ddd3f04e0b2ef53a6720c514;p=mirrors%2FFD230.git Merge #2598 into sdk650pathc0423 from refs/changes/2598/head Code review from 胡传军 * refs/changes/2598/head: (10 commits squashed) - 增加优化 EG810 雷鸟对话 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 - 修改雷鸟 播放卡顿问题 - sos修改 - 合并 - 修改 cat1 python的tcp控制逻辑 - Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 - 同步雷鸟修改 Signed-off-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/2598 --- 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 index 000000000..5bcc9c19a 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 index 000000000..dc011e449 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 2491cace4..aca9d6199 100644 --- 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 d10705662..aa0a0e58b 100644 --- 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 5551b2c49..979553f6c 100644 --- a/cat1modem/src/cat1Service.py +++ b/cat1modem/src/cat1Service.py @@ -55,6 +55,7 @@ import ujson from usr.EventMesh import eventMesh from usr.httpota import httpota +from usr.tcpserver import TcpServiceInit # from usr.telecom_dmp import telecomDmpCb # from usr.china_mobile_dmp import chinamobileCb @@ -81,7 +82,7 @@ sms.setCallback(msg_cb)#sms注册回调 CAT1_SERVICE_HEAD = 'FE' #固定head PROJECT_NAME = "Cat1SlipUDPService" -PROJECT_VERSION = "PY_SRV_V21" +PROJECT_VERSION = "PY_SRV_V22" CONFIG_JSON="/usr/system_config.json" CURRENT_APP_TYPE="pysrv" @@ -408,6 +409,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 @@ -916,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]: diff --git a/cat1modem/src/tcpserver.py b/cat1modem/src/tcpserver.py index 080331b9d..aa0a0e58b 100644 --- a/cat1modem/src/tcpserver.py +++ b/cat1modem/src/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 @@ -153,7 +152,7 @@ class TcpServiceInit: self.conn=cli_conn clog.info('[serveice] accept a client: %s, %s' % (cli_ip_addr, cli_port)) except : - utime.sleep_ms(2000) + utime.sleep_ms(2000) def cat1FileTimerCb(self,*argc): clog.info("timer test\r\n") @@ -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/code/sdk/application/wearable/evb/service/msg_center/src/notify/makephone_notification.cpp b/code/sdk/application/wearable/evb/service/msg_center/src/notify/makephone_notification.cpp index c0929b0df..1c150c208 100644 --- a/code/sdk/application/wearable/evb/service/msg_center/src/notify/makephone_notification.cpp +++ b/code/sdk/application/wearable/evb/service/msg_center/src/notify/makephone_notification.cpp @@ -769,6 +769,10 @@ bool CallViewEventListener::OnClick(UIView& view, const ClickEvent& event) return false; } } + if (strcmp(view.GetViewId(), "SOS_FAIL") == 0) { + NotificationManager::GetInstance()->StopNotify(); + } + return true; } } // namespace OHOS diff --git a/code/sdk/application/wearable/fd230/service/msg_center/src/notify/makephone_notification.cpp b/code/sdk/application/wearable/fd230/service/msg_center/src/notify/makephone_notification.cpp index 118bb320c..8d3b49283 100644 --- a/code/sdk/application/wearable/fd230/service/msg_center/src/notify/makephone_notification.cpp +++ b/code/sdk/application/wearable/fd230/service/msg_center/src/notify/makephone_notification.cpp @@ -774,6 +774,9 @@ bool CallViewEventListener::OnClick(UIView& view, const ClickEvent& event) return false; } } + if (strcmp(view.GetViewId(), "SOS_FAIL") == 0) { + NotificationManager::GetInstance()->StopNotify(); + } return true; } } // namespace OHOS diff --git a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/makephone_notification.cpp b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/makephone_notification.cpp index 118bb320c..8d3b49283 100644 --- a/code/sdk/application/wearable/fd272/service/msg_center/src/notify/makephone_notification.cpp +++ b/code/sdk/application/wearable/fd272/service/msg_center/src/notify/makephone_notification.cpp @@ -774,6 +774,9 @@ bool CallViewEventListener::OnClick(UIView& view, const ClickEvent& event) return false; } } + if (strcmp(view.GetViewId(), "SOS_FAIL") == 0) { + NotificationManager::GetInstance()->StopNotify(); + } return true; } } // namespace OHOS diff --git a/code/sdk/application/wearable/n9/service/msg_center/src/notify/makephone_notification.cpp b/code/sdk/application/wearable/n9/service/msg_center/src/notify/makephone_notification.cpp index 118bb320c..8d3b49283 100644 --- a/code/sdk/application/wearable/n9/service/msg_center/src/notify/makephone_notification.cpp +++ b/code/sdk/application/wearable/n9/service/msg_center/src/notify/makephone_notification.cpp @@ -774,6 +774,9 @@ bool CallViewEventListener::OnClick(UIView& view, const ClickEvent& event) return false; } } + if (strcmp(view.GetViewId(), "SOS_FAIL") == 0) { + NotificationManager::GetInstance()->StopNotify(); + } return true; } } // namespace OHOS diff --git a/code/sdk/application/wearable/n9/service/msg_center/src/notify/phone_crt.cpp b/code/sdk/application/wearable/n9/service/msg_center/src/notify/phone_crt.cpp index ada010a06..b562c356a 100644 --- a/code/sdk/application/wearable/n9/service/msg_center/src/notify/phone_crt.cpp +++ b/code/sdk/application/wearable/n9/service/msg_center/src/notify/phone_crt.cpp @@ -872,7 +872,8 @@ void phone_VibratorFunc(void) custom_VibratorFunc_int(0); } } - + +