From ec4e3a3c28d4f97b18894eeadad22200b68d32d8 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Tue, 30 Dec 2025 15:49:26 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E5=85=B3=E4=BA=8E=E6=89=8B?= =?utf8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/aivoice/include/AiVoiceModel.h | 2 +- .../system/include/SystemAboutTheWatchView.h | 4 ++++ .../system/src/SystemAboutTheWatchView.cpp | 21 ++++++++++++++++--- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/include/AiVoiceModel.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/include/AiVoiceModel.h index 4a13a3736..63b8dda3f 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/include/AiVoiceModel.h +++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/aivoice/include/AiVoiceModel.h @@ -32,7 +32,7 @@ #define AI_VOICE_XINGCHEN 0 //打开星辰康瑞的宏 -#if defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_CHINA_MOBILE_AI_REGULATION) || defined(SUPPORT_CHINA_MOBILE_AI_REGULATION) +#if defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_CHINA_MOBILE_AI_REGULATION) #define AI_VOICE_FD230 // 九天版本 #elif defined(BOARD_N9) #define AI_VOICE_N9 //N9 星辰Ai diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/system/include/SystemAboutTheWatchView.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/system/include/SystemAboutTheWatchView.h index 1f943bdb5..fd28f425e 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativeui/system/include/SystemAboutTheWatchView.h +++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/system/include/SystemAboutTheWatchView.h @@ -69,6 +69,10 @@ namespace OHOS UILabel *APNprotocolTitle = nullptr; //APN协议 UILabel * APNprotocol = nullptr; bool initViewStatus{false}; + + std::string pyver; + std::string imei; + std::string modem_ver; }; } #endif \ No newline at end of file diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp index 003d634a3..1d4919bb2 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp +++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp @@ -432,6 +432,11 @@ namespace OHOS } SystemAboutTheWatchScrollView->Add(Network4GTitle); /* -------------------------------------------------------------------------- */ + modem_ver = cat1_api_runtime_get_cat1_modemver(); + if(modem_ver == "" || modem_ver.empty()) + { + modem_ver = "pls poweron 4G first"; + } Config = { .left = LABEL_X, .top = WATCH_MODEM_VERSION_VALUE_TOP, @@ -439,7 +444,7 @@ namespace OHOS .height = LABEL_H, .fontSize = LABEL_FONTSIZE - 2, .lineHeigh = LABEL_LINEHEIGHT, - .text = cat1_api_runtime_get_cat1_modemver(), + .text = modem_ver, .lineBreakMode = UILabel::LINE_BREAK_WRAP, }; Network4G = InitLabel(Config); @@ -469,6 +474,11 @@ namespace OHOS } SystemAboutTheWatchScrollView->Add(PyVerTitle); /* -------------------------------------------------------------------------- */ + pyver = cat1_api_runtime_get_cat1_pyver(); + if(pyver == "" || pyver.empty()) + { + pyver = "pls poweron 4G first"; + } Config = { .left = LABEL_X, .top = WATCH_MODEM_APP_VERSION_VALUE_TOP, @@ -476,7 +486,7 @@ namespace OHOS .height = LABEL_H, .fontSize = LABEL_FONTSIZE, .lineHeigh = LABEL_LINEHEIGHT, - .text = cat1_api_runtime_get_cat1_pyver(), + .text = pyver, .lineBreakMode = UILabel::LINE_BREAK_WRAP, }; PyVer = InitLabel(Config); @@ -543,6 +553,11 @@ namespace OHOS } SystemAboutTheWatchScrollView->Add(IMELTitle); /* -------------------------------------------------------------------------- */ + imei = cat1_api_runtime_get_cat1_imei(); + if(imei == "" || imei.empty()) + { + imei = "pls poweron 4G first"; + } Config = { .left = LABEL_X, .top = WATCH_IMEI_VALUE_TOP, @@ -550,7 +565,7 @@ namespace OHOS .height = LABEL_H, .fontSize = LABEL_FONTSIZE, .lineHeigh = TITLE_LABEL_LINEHEIGHT, - .text = cat1_api_runtime_get_cat1_imei(), + .text = imei, .lineBreakMode = UILabel::LINE_BREAK_WRAP, }; IMEL = InitLabel(Config); -- 2.17.1