From 7ac8fa08ac1d71076b56ea229006dc59a09ed83e Mon Sep 17 00:00:00 2001 From: hcj <1224667075@qq.com> Date: Sat, 23 Nov 2024 17:29:17 +0800 Subject: [PATCH] =?utf8?q?cat1=E5=8D=87=E7=BA=A7=E6=9D=A1=E4=BB=B6?= =?utf8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../peripheral/slip/cat1Service/cat1_server.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp index 4599a858d..539c5b936 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp @@ -250,7 +250,7 @@ static uint8_t g_time_sync_retry_time = 0; static uint8_t need_py_srv_ver_txt = 0; -#define PY_SRV_VER_CURRENT 16 +#define PY_SRV_VER_CURRENT 15 #define PY_SRV_VER_SUPORT_PY_OTA_MINI_VER 13 @@ -770,12 +770,13 @@ static int decodeNetStat(char* msg) if(read_size) { need_py_srv_ver_txt=atoi(read_buf); + printf("need_py_srv_ver_txt : %d\r\n",need_py_srv_ver_txt); } fclose(fp); } - if (g_py_ver >= PY_SRV_VER_SUPORT_PY_OTA_MINI_VER && (g_py_ver < PY_SRV_VER_CURRENT ) || g_py_ver= PY_SRV_VER_SUPORT_PY_OTA_MINI_VER && ((g_py_ver < PY_SRV_VER_CURRENT ) || g_py_ver=16 + // #if PY_SRV_VER_CURRENT >=16 if(g_py_ver>=16) { if(osTimerIsRunning(g_timer_time_answer)==0 ) @@ -836,7 +837,7 @@ void cat1_call_answer(void) WEARABLE_LOGI(WEARABLE_LOG_MODULE_MAIN_SERVICE,"cat1 g_timer_time_answer timer ret %d\n",ret); } } - #endif + // #endif udp_send_msg_toCat1(UDP_CMD_ANSWER,"0"); } @@ -851,7 +852,7 @@ void cat1_call_dial(char* phonenum) bool volte = OHOS::ConfigModel::GetInstance()->GetVoLTE_Call(); if (volte == true){ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"cat1_call_dial %s\n",phonenum); - #if PY_SRV_VER_CURRENT >=16 + // #if PY_SRV_VER_CURRENT >=16 if(g_py_ver>=16) { if(osTimerIsRunning(g_timer_time_Dial)==0 ) @@ -861,7 +862,7 @@ void cat1_call_dial(char* phonenum) } } - #endif + // #endif udp_send_msg_toCat1(UDP_CMD_DIAL_NUMB,phonenum); } -- 2.17.1