From e0c89a9d0264f4bb99204250b7e53be613af0449 Mon Sep 17 00:00:00 2001 From: hcj <1224667075@qq.com> Date: Thu, 28 Aug 2025 14:39:33 +0800 Subject: [PATCH] =?utf8?q?n9=20=E5=85=A5=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../src/AlarmClockTimerConfig.cpp | 4 +++- .../networkandcall/include/NetworkAndCallView.h | 2 +- .../nativeui/networkandcall/src/NetworkAndCallView.cpp | 4 ++-- .../nativeui/system/src/SystemAboutTheWatchView.cpp | 10 +++++++++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp index ca01d7a4f..6b1b6ec2e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp @@ -435,7 +435,9 @@ extern "C" } HandleDrinkReminder(&curTime); - #ifndef BOARD_N9 + #if (defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_TELECOM_DMP) ) && defined(BOARD_N9) + WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "不进行检测"); + #else HandleHeartRateDetection(&curTime); #endif diff --git a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/include/NetworkAndCallView.h b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/include/NetworkAndCallView.h index ac2d97540..58afa35ba 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/include/NetworkAndCallView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/include/NetworkAndCallView.h @@ -26,7 +26,7 @@ namespace OHOS MAX_NETWORKANDCALLVIEWID, } NETWORKANDCALLVIEWID; -#if defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_CHINA_MOBILE_AI_REGULATION) +#if defined(SUPPORT_CHINA_MOBILE_AI_REGULATION) static constexpr const uint8_t ITEM_NUM = 2; #else static constexpr const uint8_t ITEM_NUM = 1; diff --git a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp index e76a13d05..6c9fc4180 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp @@ -138,7 +138,7 @@ namespace OHOS NetworkAndCallLabel[i]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); } /* -------------------------------------------------------------------------- */ -#if defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_CHINA_MOBILE_AI_REGULATION) +#if defined(SUPPORT_CHINA_MOBILE_AI_REGULATION) if (VoLTE_toggleButton == nullptr) { VoLTE_toggleButton = new UIToggleButton(); @@ -219,7 +219,7 @@ namespace OHOS NetworkAndCallScrollView[NETWORKANDCALLVIEW]->Add(NetworkAndCallImage[i]); NetworkAndCallScrollView[NETWORKANDCALLVIEW]->Add(NetworkAndCallLabel[i]); } -#if defined(SUPPORT_CHINA_MOBILE_DMP) ||defined(SUPPORT_CHINA_MOBILE_AI_REGULATION) +#if defined(SUPPORT_CHINA_MOBILE_AI_REGULATION) if (MobileData_toggleButton != nullptr) { VoLTE_toggleButton->SetState(MobileData_toggleButton->GetState() == true && ConfigModel::GetInstance()->GetVoLTE_Call()); diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp index 7a7d405df..488f7e0d8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemAboutTheWatchView.cpp @@ -597,7 +597,15 @@ namespace OHOS .height = LABEL_H, .fontSize = LABEL_FONTSIZE, .lineHeigh = LABEL_LINEHEIGHT, - .text = "OpenHarmony 5.0 Release", + + + + + #if defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_TELECOM_DMP) + .text = "OHOS 5.0", + #else + .text = "OpenHarmony 5.0 Release", + #endif .lineBreakMode = UILabel::LINE_BREAK_WRAP, }; FONT = InitLabel(Config); -- 2.17.1