fd272:设置和关于手表页面去掉4G相关ui

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingModel.cpp
index ecf6787..6470d1a 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/settings/src/SettingModel.cpp
@@ -37,7 +37,7 @@ namespace OHOS
         int index = 0;
         settings[index++] = {VIEW_SETTING, nullptr, STR_SETTINGS, false};//标题：设置
         settings[index++] = {VIEW_DISPLAY_BRIGHTNESS, PNG_SETTINGS_DISPLAY_BRIGHTNESS, STR_SCREEN_AND_BRIGHTNESS, true};
-        settings[index++] = {VIEW_NETWORKANDCALL, PNG_SETTINGS_NETWORKANDCALL, STR_NETWORKANDCALL, true};
+        // settings[index++] = {VIEW_NETWORKANDCALL, PNG_SETTINGS_NETWORKANDCALL, STR_NETWORKANDCALL, true};
         settings[index++] = {VIEW_CLASSIC_BLUETOOTH, PNG_SETTINGS_BLUETOOTH, STR_BLUETOOTH, true};
         settings[index++] = {VIEW_SOUND_VIBRATION, PNG_SETTINGS_SOUND_VIBRATION, STR_SOUND_AND_VIBRATION, true};
         settings[index++] = {VIEW_THEME_STYLE, PNG_SETTINGS_DISPLAY_MODE, STR_DISPLAY_MODE, true};

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp
index efac5da..305c756 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/system/src/SystemAboutTheWatchView.cpp
@@ -26,7 +26,7 @@
 #define WATCH_APN_PROTOCOL_VALUE_TOP (WATCH_APN_PROTOCOL_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
 #define WATCH_IMEI_TOP (WATCH_APN_PROTOCOL_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
 #define WATCH_IMEI_VALUE_TOP (WATCH_IMEI_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
-#define WATCH_FONT_TOP (WATCH_IMEI_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
+#define WATCH_FONT_TOP (WATCH_BT_ADDR_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
 #define WATCH_FONT_VALUE_TOP (WATCH_FONT_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
 #define WATCH_CYWEEVER_TOP (WATCH_FONT_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT)\r
 #define WATCH_CYWEEVER_TOP_VALUE_TOP (WATCH_CYWEEVER_TOP + WATCH_ABOUT_TITLE_HEIGHT)\r
@@ -425,7 +425,8 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::Network4GTitle new fail!");\r
             return nullptr;\r
         }\r
-        SystemAboutTheWatchScrollView->Add(Network4GTitle);\r
+        Network4GTitle->SetVisible(false);\r
+        // SystemAboutTheWatchScrollView->Add(Network4GTitle);\r
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = LABEL_X,\r
@@ -444,7 +445,8 @@ namespace OHOS
             return nullptr;\r
         }\r
         Network4G->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87));\r
-        SystemAboutTheWatchScrollView->Add(Network4G);\r
+        Network4G->SetVisible(false);\r
+        // SystemAboutTheWatchScrollView->Add(Network4G);\r
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = TITLE_LABEL_X,\r
@@ -462,7 +464,8 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::PyVerTitle new fail!");\r
             return nullptr;\r
         }\r
-        SystemAboutTheWatchScrollView->Add(PyVerTitle);\r
+        PyVerTitle->SetVisible(false);\r
+        // SystemAboutTheWatchScrollView->Add(PyVerTitle);\r
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = LABEL_X,\r
@@ -481,7 +484,8 @@ namespace OHOS
             return nullptr;\r
         }\r
         PyVer->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87));\r
-        SystemAboutTheWatchScrollView->Add(PyVer);\r
+        PyVer->SetVisible(false);\r
+        // SystemAboutTheWatchScrollView->Add(PyVer);\r
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = TITLE_LABEL_X,\r
@@ -499,7 +503,8 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::APNprotocolTitle new fail!");\r
             return nullptr;\r
         }\r
-        SystemAboutTheWatchScrollView->Add(APNprotocolTitle);\r
+        APNprotocolTitle->SetVisible(false);\r
+        // SystemAboutTheWatchScrollView->Add(APNprotocolTitle);\r
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = LABEL_X,\r
@@ -518,7 +523,8 @@ namespace OHOS
             return nullptr;\r
         }\r
         APNprotocol->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87));\r
-        SystemAboutTheWatchScrollView->Add(APNprotocol);\r
+        APNprotocol->SetVisible(false);\r
+        // SystemAboutTheWatchScrollView->Add(APNprotocol);\r
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = TITLE_LABEL_X,\r
@@ -536,7 +542,8 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::IMELTitle new fail!");\r
             return nullptr;\r
         }\r
-        SystemAboutTheWatchScrollView->Add(IMELTitle);\r
+        IMELTitle->SetVisible(false);\r
+        // SystemAboutTheWatchScrollView->Add(IMELTitle);\r
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = LABEL_X,\r
@@ -555,7 +562,8 @@ namespace OHOS
             return nullptr;\r
         }\r
         IMEL->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87));\r
-        SystemAboutTheWatchScrollView->Add(IMEL);\r
+        IMEL->SetVisible(false);\r
+        // SystemAboutTheWatchScrollView->Add(IMEL);\r
         /* -------------------------------------------------------------------------- */\r
         Config = {\r
             .left = TITLE_LABEL_X,\r