From: luozheng <1732036298@qq.com> Date: Sat, 8 Nov 2025 10:02:49 +0000 (+0800) Subject: fd272:设置和关于手表页面去掉4G相关ui X-Git-Tag: V1.0.9_20251128_194606_LN~86^2~2^2~6 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=8fccc3883e1184083dddbd78da6c670f09ab69ac;p=mirrors%2FFD230.git 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 ecf67875e..6470d1ac0 100644 --- 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 efac5da96..305c756fa 100644 --- 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) #define WATCH_IMEI_TOP (WATCH_APN_PROTOCOL_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT) #define WATCH_IMEI_VALUE_TOP (WATCH_IMEI_TOP + WATCH_ABOUT_TITLE_HEIGHT) -#define WATCH_FONT_TOP (WATCH_IMEI_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT) +#define WATCH_FONT_TOP (WATCH_BT_ADDR_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT) #define WATCH_FONT_VALUE_TOP (WATCH_FONT_TOP + WATCH_ABOUT_TITLE_HEIGHT) #define WATCH_CYWEEVER_TOP (WATCH_FONT_VALUE_TOP + WATCH_ABOUT_VALUE_HEIGHT) #define WATCH_CYWEEVER_TOP_VALUE_TOP (WATCH_CYWEEVER_TOP + WATCH_ABOUT_TITLE_HEIGHT) @@ -425,7 +425,8 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::Network4GTitle new fail!"); return nullptr; } - SystemAboutTheWatchScrollView->Add(Network4GTitle); + Network4GTitle->SetVisible(false); + // SystemAboutTheWatchScrollView->Add(Network4GTitle); /* -------------------------------------------------------------------------- */ Config = { .left = LABEL_X, @@ -444,7 +445,8 @@ namespace OHOS return nullptr; } Network4G->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); - SystemAboutTheWatchScrollView->Add(Network4G); + Network4G->SetVisible(false); + // SystemAboutTheWatchScrollView->Add(Network4G); /* -------------------------------------------------------------------------- */ Config = { .left = TITLE_LABEL_X, @@ -462,7 +464,8 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::PyVerTitle new fail!"); return nullptr; } - SystemAboutTheWatchScrollView->Add(PyVerTitle); + PyVerTitle->SetVisible(false); + // SystemAboutTheWatchScrollView->Add(PyVerTitle); /* -------------------------------------------------------------------------- */ Config = { .left = LABEL_X, @@ -481,7 +484,8 @@ namespace OHOS return nullptr; } PyVer->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); - SystemAboutTheWatchScrollView->Add(PyVer); + PyVer->SetVisible(false); + // SystemAboutTheWatchScrollView->Add(PyVer); /* -------------------------------------------------------------------------- */ Config = { .left = TITLE_LABEL_X, @@ -499,7 +503,8 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::APNprotocolTitle new fail!"); return nullptr; } - SystemAboutTheWatchScrollView->Add(APNprotocolTitle); + APNprotocolTitle->SetVisible(false); + // SystemAboutTheWatchScrollView->Add(APNprotocolTitle); /* -------------------------------------------------------------------------- */ Config = { .left = LABEL_X, @@ -518,7 +523,8 @@ namespace OHOS return nullptr; } APNprotocol->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); - SystemAboutTheWatchScrollView->Add(APNprotocol); + APNprotocol->SetVisible(false); + // SystemAboutTheWatchScrollView->Add(APNprotocol); /* -------------------------------------------------------------------------- */ Config = { .left = TITLE_LABEL_X, @@ -536,7 +542,8 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemAboutTheWatchView::IMELTitle new fail!"); return nullptr; } - SystemAboutTheWatchScrollView->Add(IMELTitle); + IMELTitle->SetVisible(false); + // SystemAboutTheWatchScrollView->Add(IMELTitle); /* -------------------------------------------------------------------------- */ Config = { .left = LABEL_X, @@ -555,7 +562,8 @@ namespace OHOS return nullptr; } IMEL->SetTextColor(Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x87)); - SystemAboutTheWatchScrollView->Add(IMEL); + IMEL->SetVisible(false); + // SystemAboutTheWatchScrollView->Add(IMEL); /* -------------------------------------------------------------------------- */ Config = { .left = TITLE_LABEL_X,