解决关于手表页面4G模组信息和py信息不显示问题

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp
index 7d65c2d..d9da6ea 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp
@@ -5,6 +5,7 @@
 #include "ConfigModel.h"\r
 #include "ui_resource_string.h"\r
 #include "common/screen.h"\r
+#include <cat1_runtime.h>\r
 \r
 #define WATCH_ABOUT_TITLE_HEIGHT 50\r
 #define WATCH_ABOUT_VALUE_HEIGHT 80\r
@@ -438,7 +439,7 @@ namespace OHOS
             .height = LABEL_H,\r
             .fontSize = LABEL_FONTSIZE - 2,\r
             .lineHeigh = LABEL_LINEHEIGHT,\r
-            .text = ConfigModel::GetInstance()->GetmoderVer(),\r
+            .text = cat1_api_runtime_get_cat1_modemver(),\r
             .lineBreakMode = UILabel::LINE_BREAK_WRAP,\r
         };\r
         Network4G = InitLabel(Config);\r
@@ -475,7 +476,7 @@ namespace OHOS
             .height = LABEL_H,\r
             .fontSize = LABEL_FONTSIZE,\r
             .lineHeigh = LABEL_LINEHEIGHT,\r
-            .text = ConfigModel::GetInstance()->GetpyVer(),\r
+            .text = cat1_api_runtime_get_cat1_pyver(),\r
             .lineBreakMode = UILabel::LINE_BREAK_WRAP,\r
         };\r
         PyVer = InitLabel(Config);\r
@@ -549,7 +550,7 @@ namespace OHOS
             .height = LABEL_H,\r
             .fontSize = LABEL_FONTSIZE,\r
             .lineHeigh = TITLE_LABEL_LINEHEIGHT,\r
-            .text = ConfigModel::GetInstance()->Getimei(),\r
+            .text = cat1_api_runtime_get_cat1_imei(),\r
             .lineBreakMode = UILabel::LINE_BREAK_WRAP,\r
         };\r
         IMEL = InitLabel(Config);\r

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 4d9cdbc..003d634 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
@@ -5,6 +5,7 @@
 #include "ConfigModel.h"\r
 #include "ui_resource_string.h"\r
 #include "common/screen.h"\r
+#include <cat1_runtime.h>\r
 \r
 #define WATCH_ABOUT_TITLE_HEIGHT 50\r
 #define WATCH_ABOUT_VALUE_HEIGHT 80\r
@@ -438,7 +439,7 @@ namespace OHOS
             .height = LABEL_H,\r
             .fontSize = LABEL_FONTSIZE - 2,\r
             .lineHeigh = LABEL_LINEHEIGHT,\r
-            .text = ConfigModel::GetInstance()->GetmoderVer(),\r
+            .text = cat1_api_runtime_get_cat1_modemver(),\r
             .lineBreakMode = UILabel::LINE_BREAK_WRAP,\r
         };\r
         Network4G = InitLabel(Config);\r
@@ -475,7 +476,7 @@ namespace OHOS
             .height = LABEL_H,\r
             .fontSize = LABEL_FONTSIZE,\r
             .lineHeigh = LABEL_LINEHEIGHT,\r
-            .text = ConfigModel::GetInstance()->GetpyVer(),\r
+            .text = cat1_api_runtime_get_cat1_pyver(),\r
             .lineBreakMode = UILabel::LINE_BREAK_WRAP,\r
         };\r
         PyVer = InitLabel(Config);\r
@@ -549,7 +550,7 @@ namespace OHOS
             .height = LABEL_H,\r
             .fontSize = LABEL_FONTSIZE,\r
             .lineHeigh = TITLE_LABEL_LINEHEIGHT,\r
-            .text = ConfigModel::GetInstance()->Getimei(),\r
+            .text = cat1_api_runtime_get_cat1_imei(),\r
             .lineBreakMode = UILabel::LINE_BREAK_WRAP,\r
         };\r
         IMEL = InitLabel(Config);\r