n9 入库修改

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 ca01d7a..6b1b6ec 100644 (file)
--- 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"
         }\r
 \r
         HandleDrinkReminder(&curTime);  \r
-        #ifndef BOARD_N9\r
+        #if (defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_TELECOM_DMP) ) && defined(BOARD_N9)\r
+            WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "不进行检测");\r
+        #else\r
             HandleHeartRateDetection(&curTime);  \r
         #endif\r
 \r

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 ac2d975..58afa35 100644 (file)
--- 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 e76a13d..6c9fc41 100644 (file)
--- 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 7a7d405..488f7e0 100644 (file)
--- 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,\r
             .fontSize = LABEL_FONTSIZE,\r
             .lineHeigh = LABEL_LINEHEIGHT,\r
-            .text = "OpenHarmony 5.0 Release",\r
+\r
+           \r
+\r
+          \r
+            #if defined(SUPPORT_CHINA_MOBILE_DMP) || defined(SUPPORT_TELECOM_DMP)\r
+                .text = "OHOS 5.0",\r
+            #else\r
+                .text = "OpenHarmony 5.0 Release",\r
+            #endif\r
             .lineBreakMode = UILabel::LINE_BREAK_WRAP,\r
         };\r
         FONT = InitLabel(Config);\r