优化关于手表页面显示

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 4a13a37..63b8dda 100644 (file)
--- 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 1f943bd..fd28f42 100644 (file)
--- 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协议\r
         UILabel * APNprotocol = nullptr;\r
         bool initViewStatus{false};\r
+\r
+        std::string pyver;\r
+        std::string imei;\r
+        std::string modem_ver;\r
     };\r
 }\r
 #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 003d634..1d4919b 100644 (file)
--- 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
         }\r
         SystemAboutTheWatchScrollView->Add(Network4GTitle);\r
         /* -------------------------------------------------------------------------- */\r
+        modem_ver = cat1_api_runtime_get_cat1_modemver();\r
+        if(modem_ver == "" || modem_ver.empty())\r
+        {\r
+            modem_ver = "pls poweron 4G first";\r
+        }\r
         Config = {\r
             .left = LABEL_X,\r
             .top = WATCH_MODEM_VERSION_VALUE_TOP,\r
@@ -439,7 +444,7 @@ namespace OHOS
             .height = LABEL_H,\r
             .fontSize = LABEL_FONTSIZE - 2,\r
             .lineHeigh = LABEL_LINEHEIGHT,\r
-            .text = cat1_api_runtime_get_cat1_modemver(),\r
+            .text = modem_ver,\r
             .lineBreakMode = UILabel::LINE_BREAK_WRAP,\r
         };\r
         Network4G = InitLabel(Config);\r
@@ -469,6 +474,11 @@ namespace OHOS
         }\r
         SystemAboutTheWatchScrollView->Add(PyVerTitle);\r
         /* -------------------------------------------------------------------------- */\r
+        pyver = cat1_api_runtime_get_cat1_pyver();\r
+        if(pyver == "" || pyver.empty())\r
+        {\r
+            pyver = "pls poweron 4G first";\r
+        }\r
         Config = {\r
             .left = LABEL_X,\r
             .top = WATCH_MODEM_APP_VERSION_VALUE_TOP,\r
@@ -476,7 +486,7 @@ namespace OHOS
             .height = LABEL_H,\r
             .fontSize = LABEL_FONTSIZE,\r
             .lineHeigh = LABEL_LINEHEIGHT,\r
-            .text = cat1_api_runtime_get_cat1_pyver(),\r
+            .text = pyver,\r
             .lineBreakMode = UILabel::LINE_BREAK_WRAP,\r
         };\r
         PyVer = InitLabel(Config);\r
@@ -543,6 +553,11 @@ namespace OHOS
         }\r
         SystemAboutTheWatchScrollView->Add(IMELTitle);\r
         /* -------------------------------------------------------------------------- */\r
+        imei = cat1_api_runtime_get_cat1_imei();\r
+        if(imei == "" || imei.empty())\r
+        {\r
+            imei = "pls poweron 4G first";\r
+        }\r
         Config = {\r
             .left = LABEL_X,\r
             .top = WATCH_IMEI_VALUE_TOP,\r
@@ -550,7 +565,7 @@ namespace OHOS
             .height = LABEL_H,\r
             .fontSize = LABEL_FONTSIZE,\r
             .lineHeigh = TITLE_LABEL_LINEHEIGHT,\r
-            .text = cat1_api_runtime_get_cat1_imei(),\r
+            .text = imei,\r
             .lineBreakMode = UILabel::LINE_BREAK_WRAP,\r
         };\r
         IMEL = InitLabel(Config);\r