From a7b3b57823270ab2572da472c07b6803ba14aa31 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Tue, 9 Dec 2025 15:58:03 +0800 Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3=E6=A8=A1=E7=BB=84=E5=8D=87?= =?utf8?q?=E7=BA=A7=E6=97=B6=EF=BC=9A=E8=87=AA=E5=8A=A8=E8=B7=B3=E8=BD=AC?= =?utf8?q?=E5=88=B0=E5=8D=87=E7=BA=A7=E4=B8=AD=E7=95=8C=E9=9D=A2=E6=9C=AA?= =?utf8?q?=E8=B0=83=E7=94=A8=E6=A8=A1=E7=BB=84=E5=8D=87=E7=BA=A7=E5=87=BD?= =?utf8?q?=E6=95=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../ln/nativeapp/nativeui/ota/src/OtaModel.cpp | 10 +++++++++- .../sdk/zhihui/4g/cat1Service/Service/cat1_tcpServer.c | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaModel.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaModel.cpp index 4ad9f988c..8ee7654d2 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaModel.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/ota/src/OtaModel.cpp @@ -257,7 +257,15 @@ namespace OHOS // 跳转到升级中界面 if (OtaView::GetInstance()) { - do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_OTA_DOWNLOAD, NULL, 0); + std::string cat1_pyver = uapi_dev_runtime_get_cat1_pyver(); + if(cat1_pyver == "PY_SRV_V27") + { + do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_OTA_GET_TASK_CAT1_RUN, NULL, 0); + } + else + { + do_ln_http_server_send_data(LN_HTTP_SERVICE_CMD_OTA_DOWNLOAD, NULL, 0); + } OtaView::GetInstance()->ChangeView(OtaView::OTA_VIEW_COUNTDOWN, OtaView::OTA_VIEW_UPDATING); } diff --git a/code/sdk/zhihui/4g/cat1Service/Service/cat1_tcpServer.c b/code/sdk/zhihui/4g/cat1Service/Service/cat1_tcpServer.c index ce0133f34..f8cf2c54b 100644 --- a/code/sdk/zhihui/4g/cat1Service/Service/cat1_tcpServer.c +++ b/code/sdk/zhihui/4g/cat1Service/Service/cat1_tcpServer.c @@ -1371,15 +1371,19 @@ static osTimerId_t modem_ota_timer=NULL; static uint16 mode_ota_count=0; +#ifdef BOARD_LEINIAO #include "ln_api_interface.h" +#endif static void modem_ota_timer_CallBack(int data_tmp) { + printf("modem_ota_timer_CallBack mode_ota_count:%d\n",mode_ota_count); if(old_model_ver!=g_py_ver) { uint8_t TRANSMIT_DATA=TRANS_FREE; #ifdef BOARD_LEINIAO push_ota_status(OTA_UI_STATUS_SUCCESS); + LOS_Msleep(1000); shutdown_reboot_prejobs(REBOOT_TYPE); #else CustomEventPublish(TOPIC_EVENT_BLE_TRANSMIT,&TRANSMIT_DATA,1); -- 2.17.1