From: luozheng <1732036298@qq.com> Date: Fri, 28 Jun 2024 09:52:33 +0000 (+0800) Subject: 网络与通话修改 X-Git-Tag: release_V1.2.70_20241020_135402~926^2~3 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=7ce4ccd8f2f9b07b38024e7e97d3ddb36415a6bd;p=mirrors%2FFD230.git 网络与通话修改 --- 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 9b3e1bcd8..39af501cc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/include/NetworkAndCallView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/include/NetworkAndCallView.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-23 09:57:53 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-04-23 16:24:32 + * @LastEditTime: 2024-06-28 17:27:04 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/networkandcall/include/NetworkAndCallView.h */ @@ -26,7 +26,7 @@ namespace OHOS MAX_NETWORKANDCALLVIEWID, } NETWORKANDCALLVIEWID; - static constexpr const uint8_t ITEM_NUM = 3; + static constexpr const uint8_t ITEM_NUM = 1; class NetworkAndCallPresenter; class NetworkAndCallView : public View @@ -63,7 +63,7 @@ namespace OHOS UILabelExt *NetworkAndCallLabel[ITEM_NUM]{nullptr}; UIToggleButton *VoLTE_toggleButton{nullptr}; // VoLTE通话开关 UIToggleButton *MobileData_toggleButton{nullptr}; // 移动数据开关 - UIImageView *NextImage{nullptr}; + //UIImageView *NextImage{nullptr}; }; } #endif \ No newline at end of file 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 c2d8214cc..06beebc5d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallView.cpp @@ -34,9 +34,12 @@ namespace OHOS { NetworkAndCallScrollView[NETWORKANDCALLVIEW]->RemoveAll(); - delete Title; - Title = nullptr; - + if (Title != nullptr) + { + delete Title; + Title = nullptr; + } + for (int i = 0; i < ITEM_NUM; i++) { delete NetworkAndCallImage[i]; @@ -46,14 +49,17 @@ namespace OHOS NetworkAndCallLabel[i] = nullptr; } - delete VoLTE_toggleButton; - VoLTE_toggleButton = nullptr; + // delete VoLTE_toggleButton; + // VoLTE_toggleButton = nullptr; - delete MobileData_toggleButton; - MobileData_toggleButton = nullptr; + if (MobileData_toggleButton != nullptr) + { + delete MobileData_toggleButton; + MobileData_toggleButton = nullptr; + } - delete NextImage; - NextImage = nullptr; + // delete NextImage; + // NextImage = nullptr; delete NetworkAndCallScrollView[NETWORKANDCALLVIEW]; NetworkAndCallScrollView[NETWORKANDCALLVIEW] = nullptr; @@ -78,8 +84,8 @@ namespace OHOS return; } NetworkAndCallScrollView[NETWORKANDCALLVIEW]->SetOnDragListener(draglistener); - NetworkAndCallScrollView[NETWORKANDCALLVIEW]->SetScrollBlankSize(50); - NetworkAndCallScrollView[NETWORKANDCALLVIEW]->SetReboundSize(35); + // NetworkAndCallScrollView[NETWORKANDCALLVIEW]->SetScrollBlankSize(50); + // NetworkAndCallScrollView[NETWORKANDCALLVIEW]->SetReboundSize(35); NetworkAndCallScrollView[NETWORKANDCALLVIEW]->SetHorizontalScrollState(false); NetworkAndCallScrollView[NETWORKANDCALLVIEW]->SetTouchable(true); NetworkAndCallScrollView[NETWORKANDCALLVIEW]->SetDraggable(true); @@ -93,15 +99,15 @@ namespace OHOS Title->SetPosition(83, 50, 300, 40); Title->SetStyle(STYLE_TEXT_FONT, 30); Title->SetStyle(STYLE_LINE_HEIGHT, 35); - //Title->SetText("网络与通话"); + // Title->SetText("网络与通话"); Title->SetTextId(STR_NETWORKANDCALL); Title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); Title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - //Title->SetRollSpeed(40); + // Title->SetRollSpeed(40); Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); /* -------------------------------------------------------------------------- */ int positionY_Img = 120; - //const char *text[] = {"4G能力", "VoLTE 通话", "移动数据选项"}; + // const char *text[] = {"4G能力", "VoLTE 通话", "移动数据选项"}; const UIResourceTextId textId[] = {STR_4G_CAPABILITY, STR_VOLTE_CALL, STR_MOBILE_DATA_OPTION}; for (int i = 0; i < ITEM_NUM; i++) { @@ -125,11 +131,11 @@ namespace OHOS NetworkAndCallLabel[i]->SetPosition(90, 153 + (i * 120), 180, 40); // Adjust Y position based on iteration NetworkAndCallLabel[i]->SetStyle(STYLE_TEXT_FONT, 30); NetworkAndCallLabel[i]->SetStyle(STYLE_LINE_HEIGHT, 35); - //NetworkAndCallLabel[i]->SetText(text[i]); + // NetworkAndCallLabel[i]->SetText(text[i]); NetworkAndCallLabel[i]->SetTextId(textId[i]); NetworkAndCallLabel[i]->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); // NetworkAndCallLabel[i]->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - //NetworkAndCallLabel[i]->SetRollSpeed(40); + // NetworkAndCallLabel[i]->SetRollSpeed(40); NetworkAndCallLabel[i]->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); } /* -------------------------------------------------------------------------- */ @@ -145,32 +151,37 @@ namespace OHOS const char *selectedImg = "/user/res/TOGGLEBUTTON_ON.bin"; const char *unSelectedImg = "/user/res/TOGGLEBUTTON_OFF.bin"; MobileData_toggleButton->SetImages(selectedImg, unSelectedImg); - /* -------------------------------------------------------------------------- */ - VoLTE_toggleButton = new UIToggleButton(); - if (VoLTE_toggleButton == nullptr) + UIView::OnClickListener *toggleButtonClick = static_cast(NetworkAndCallPresenter::GetInstance()); + if (toggleButtonClick == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LanguageSwitchView::VoLTE_toggleButton is nullptr!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "NetworkAndCallPresenter::GetInstance fail!!"); return; } - VoLTE_toggleButton->SetPosition(298, 265, 100, 50); - VoLTE_toggleButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00); - VoLTE_toggleButton->SetState(ConfigModel::GetInstance()->GetVoLTE_Call()); - VoLTE_toggleButton->SetImages(selectedImg, unSelectedImg); - /* ----------------------------- onclickListener ---------------------------- */ - UIView::OnClickListener *toggleButtonClick = static_cast(NetworkAndCallPresenter::GetInstance()); - VoLTE_toggleButton->SetOnClickListener(toggleButtonClick); MobileData_toggleButton->SetOnClickListener(toggleButtonClick); - NetworkAndCallImage[2]->SetTouchable(true); - NetworkAndCallImage[2]->SetOnClickListener(toggleButtonClick); /* -------------------------------------------------------------------------- */ - NextImage = new UIImageView(); - if (NextImage == nullptr) - { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LanguageSwitchView::NextImage is nullptr!"); - return; - } - NextImage->SetPosition(369, 397); - NextImage->SetSrc(PNG_SETTING_NEXT_IMAGE); + // VoLTE_toggleButton = new UIToggleButton(); + // if (VoLTE_toggleButton == nullptr) + // { + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LanguageSwitchView::VoLTE_toggleButton is nullptr!"); + // return; + // } + // VoLTE_toggleButton->SetPosition(298, 265, 100, 50); + // VoLTE_toggleButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00); + // VoLTE_toggleButton->SetState(ConfigModel::GetInstance()->GetVoLTE_Call()); + // VoLTE_toggleButton->SetImages(selectedImg, unSelectedImg); + // /* ----------------------------- onclickListener ---------------------------- */ + // VoLTE_toggleButton->SetOnClickListener(toggleButtonClick); + // NetworkAndCallImage[2]->SetTouchable(true); + // NetworkAndCallImage[2]->SetOnClickListener(toggleButtonClick); + /* -------------------------------------------------------------------------- */ + // NextImage = new UIImageView(); + // if (NextImage == nullptr) + // { + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LanguageSwitchView::NextImage is nullptr!"); + // return; + // } + // NextImage->SetPosition(369, 397); + // NextImage->SetSrc(PNG_SETTING_NEXT_IMAGE); } } @@ -192,9 +203,9 @@ namespace OHOS NetworkAndCallScrollView[NETWORKANDCALLVIEW]->Add(NetworkAndCallImage[i]); NetworkAndCallScrollView[NETWORKANDCALLVIEW]->Add(NetworkAndCallLabel[i]); } - NetworkAndCallScrollView[NETWORKANDCALLVIEW]->Add(VoLTE_toggleButton); + // NetworkAndCallScrollView[NETWORKANDCALLVIEW]->Add(VoLTE_toggleButton); NetworkAndCallScrollView[NETWORKANDCALLVIEW]->Add(MobileData_toggleButton); - NetworkAndCallScrollView[NETWORKANDCALLVIEW]->Add(NextImage); + // NetworkAndCallScrollView[NETWORKANDCALLVIEW]->Add(NextImage); RootView::GetInstance()->Add(NetworkAndCallScrollView[NETWORKANDCALLVIEW]); Draw(); }