diff --git a/resources/rk3568/pages/confirm.json b/resources/rk3568/pages/confirm.json index ba57504d43f5bf55d30fad5e714b900d0a78311c..4a68a8087d000a40dca2e1ad00c28b25bb43dd09 100644 --- a/resources/rk3568/pages/confirm.json +++ b/resources/rk3568/pages/confirm.json @@ -8,7 +8,8 @@ "UILabel": { "bgColor": "#f1f3f5ff", "fontColor": "#000000e6", - "align" : "center" + "align" : "center", + "style" : "normal" }, "UIImageView": { "imgCnt" : 1, diff --git a/resources/rk3568/pages/menu.json b/resources/rk3568/pages/menu.json index c6cbe847b329384a667f3c4d4aa9bd439fe501ad..d2b11fbae7e0605b818e62f2fba5eedab6a5f662 100644 --- a/resources/rk3568/pages/menu.json +++ b/resources/rk3568/pages/menu.json @@ -22,7 +22,8 @@ "UILabel": { "bgColor": "#f1f3f5ff", "fontColor": "#000000e6", - "align" : "center" + "align" : "center", + "style" : "normal" }, "UIImageView": { "imgCnt" : 1, diff --git a/resources/rk3568/pages/upd.json b/resources/rk3568/pages/upd.json index 6c07bd2eae5eefcfdd282a7310f37367eb3e13d0..ed27e99e804416f343db167b6936a0e0589c3dcc 100644 --- a/resources/rk3568/pages/upd.json +++ b/resources/rk3568/pages/upd.json @@ -86,7 +86,8 @@ "UILabel": { "bgColor": "#000000ff", "fontColor": "#ffffffe6", - "align" : "center" + "align" : "center", + "style" : "normal" }, "UIImageView": { "imgCnt" : 1, diff --git a/services/ui/include/updater_ui_const.h b/services/ui/include/updater_ui_const.h index 96a964d357484db864475ec61225e6ea09cbf0e9..570890de712cafc4ed77a2e2b26fa1272df2fe5a 100644 --- a/services/ui/include/updater_ui_const.h +++ b/services/ui/include/updater_ui_const.h @@ -18,6 +18,7 @@ namespace Updater { constexpr const char *DEFAULT_FONT_FILENAME = "HarmonyOS_Sans_SC_Regular_Small.ttf"; +constexpr const char *BOLD_FONT_FILENAME = "HarmonyOS_Sans_SC_Bold_Small.ttf"; constexpr const char *FB_DEV_PATH = "/dev/graphics/fb0"; constexpr const char *DRM_DEV_PATH = "/dev/dri/card0"; diff --git a/services/ui/updater_ui_traits.h b/services/ui/updater_ui_traits.h index 93f820e5c4eb40a1ce25d978acbb96653f56740e..3a971a350a08bf9d50bc46893f99ac06fb3b44ae 100644 --- a/services/ui/updater_ui_traits.h +++ b/services/ui/updater_ui_traits.h @@ -75,7 +75,8 @@ DEFINE_TRAIT(UxLabelInfo, TextLabelAdapter::COMPONENT_TYPE, (std::string, text), (std::string, align), (std::string, fontColor), - (std::string, bgColor) + (std::string, bgColor), + (std::string, style) ); DEFINE_TRAIT(UxImageInfo, ImgViewAdapter::COMPONENT_TYPE, diff --git a/services/ui/view/component/text_label_adapter.cpp b/services/ui/view/component/text_label_adapter.cpp index d7dee5933c66b7a817a5e7ad56b23ca2d4bb1f2e..88ea6068ab4acb9dd459f809df5a65dc69fa8bad 100644 --- a/services/ui/view/component/text_label_adapter.cpp +++ b/services/ui/view/component/text_label_adapter.cpp @@ -24,7 +24,7 @@ TextLabelAdapter::TextLabelAdapter(const UxViewInfo &info) SetViewCommonInfo(info.commonInfo); this->SetAlign(GetAlign(spec.align), OHOS::TEXT_ALIGNMENT_CENTER); this->SetText(TranslateText(spec.text).c_str()); - this->SetFont(DEFAULT_FONT_FILENAME, spec.fontSize); + this->SetFont((spec.style == "bold") ? BOLD_FONT_FILENAME : DEFAULT_FONT_FILENAME, spec.fontSize); this->SetStyle(OHOS::STYLE_LINE_HEIGHT, UPDATER_UI_FONT_HEIGHT_RATIO * spec.fontSize); auto fontColor = StrToColor(spec.fontColor); this->SetStyle(OHOS::STYLE_TEXT_COLOR, fontColor.full); diff --git a/services/ui/view/component/text_label_adapter.h b/services/ui/view/component/text_label_adapter.h index a0766c498fe0ab08a68a3487d9cadd61b63ff159..def8fe53f6089d8f58201a6ece61fbdd56b3df14 100644 --- a/services/ui/view/component/text_label_adapter.h +++ b/services/ui/view/component/text_label_adapter.h @@ -26,6 +26,7 @@ struct UxLabelInfo { std::string align; std::string fontColor; std::string bgColor; + std::string style; }; struct UxViewInfo; class TextLabelAdapter : public OHOS::UILabel, public ComponentCommon { diff --git a/test/unittest/test_data/ui/layout/all.json b/test/unittest/test_data/ui/layout/all.json index 1c7501c9980bc3c16b527c2baa31e3d1cbf1dcfc..ba9fd10c4b9a9655108a8056a262c793c596f680 100644 --- a/test/unittest/test_data/ui/layout/all.json +++ b/test/unittest/test_data/ui/layout/all.json @@ -14,7 +14,8 @@ "visible" : true, "fontSize" : 10, "bgColor" : "#ffffffff", - "fontColor" : "#ffffffff" + "fontColor" : "#ffffffff", + "style" : "normal" }, { "id" : "image_view", diff --git a/test/unittest/test_data/ui/layout/commonInvalid.json b/test/unittest/test_data/ui/layout/commonInvalid.json index eb20ba37bad4c995a38ee137db0f0d84137aa60a..18ec97e96326b95690da199d4c6b1cdc584108e8 100644 --- a/test/unittest/test_data/ui/layout/commonInvalid.json +++ b/test/unittest/test_data/ui/layout/commonInvalid.json @@ -8,7 +8,8 @@ "UILabel" : { "bgColor" : "#000000ff", "fontColor" : "#ffffffff", - "align" : "center" + "align" : "center", + "style" : "normal" } }, "coms" : [ diff --git a/test/unittest/test_data/ui/layout/label.json b/test/unittest/test_data/ui/layout/label.json index d8d97de0fa111016b4a0bf790dda59812a221170..c202a6b6175aadde3a94ef61460032c74714cbb4 100644 --- a/test/unittest/test_data/ui/layout/label.json +++ b/test/unittest/test_data/ui/layout/label.json @@ -15,7 +15,8 @@ "visible" : true, "fontSize" : 10, "bgColor" : "#ffffffff", - "fontColor" : "#ffffffff" + "fontColor" : "#ffffffff", + "style" : "normal" } ] } \ No newline at end of file diff --git a/test/unittest/test_data/ui/layout/menu.json b/test/unittest/test_data/ui/layout/menu.json index daac2cedaf17f8c528f28efe456b10d9b8b5559f..8fa63107b28283c98fc31388352bb091fbf821c5 100644 --- a/test/unittest/test_data/ui/layout/menu.json +++ b/test/unittest/test_data/ui/layout/menu.json @@ -8,7 +8,8 @@ "UILabel" : { "bgColor" : "#000000ff", "fontColor" : "#ffffffff", - "align" : "center" + "align" : "center", + "style" : "normal" } }, "coms" : [ diff --git a/test/unittest/test_data/ui/layout/typeInvalid.json b/test/unittest/test_data/ui/layout/typeInvalid.json index 18355c5b4a40fe0b95933697d6e940425ea8288c..0b0fe0e83f61858a3a82cbf43240d77c89aeab1e 100644 --- a/test/unittest/test_data/ui/layout/typeInvalid.json +++ b/test/unittest/test_data/ui/layout/typeInvalid.json @@ -8,7 +8,8 @@ "UILabel" : { "bgColor" : "#000000ff", "fontColor" : "#ffffffff", - "align" : "center" + "align" : "center", + "style" : "normal" } }, "coms" : [ diff --git a/test/unittest/updater_ui_test/view/ui_component_unittest.cpp b/test/unittest/updater_ui_test/view/ui_component_unittest.cpp index 2d98a8f1611c3f81aceea377325faab55450096b..20911d03281cadb21ea4747cf4cbd94538c3095e 100644 --- a/test/unittest/updater_ui_test/view/ui_component_unittest.cpp +++ b/test/unittest/updater_ui_test/view/ui_component_unittest.cpp @@ -310,9 +310,9 @@ HWTEST_F(UpdaterUiComponentUnitTest, test_label_btn_adapter_constructor, TestSiz HWTEST_F(UpdaterUiComponentUnitTest, test_label_btn_adapter_on_press, TestSize.Level0) { - LabelBtnAdapter labelBtn1 {UxViewInfo {{0, 0, 50, 50, "id", "UILabel", true}, + LabelBtnAdapter labelBtn1 {UxViewInfo {{0, 0, 50, 50, "id", "UILabelButton", true}, UxLabelBtnInfo {100, "", "#000000ff", "#ffffffff", "#ffffffff", "#000000ff", true}}}; - LabelBtnAdapter labelBtn2 {UxViewInfo {{100, 100, 50, 50, "id", "UILabel", true}, + LabelBtnAdapter labelBtn2 {UxViewInfo {{100, 100, 50, 50, "id", "UILabelButton", true}, UxLabelBtnInfo {100, "", "#000000ff", "#ffffffff", "#ffffffff", "#000000ff", true}}}; OHOS::FocusManager::GetInstance()->RequestFocus(&labelBtn2); labelBtn1.OnPressEvent(OHOS::PressEvent {OHOS::Point {}}); @@ -337,7 +337,7 @@ HWTEST_F(UpdaterUiComponentUnitTest, test_label_btn_adapter_is_valid, TestSize.L HWTEST_F(UpdaterUiComponentUnitTest, test_label_btn_adapter_set_text, TestSize.Level0) { - LabelBtnAdapter labelBtn {UxViewInfo {{0, 0, 0, 0, "id", "UILabel", false}, + LabelBtnAdapter labelBtn {UxViewInfo {{0, 0, 0, 0, "id", "UILabelButton", false}, UxLabelBtnInfo {100, "", "#000000ff", "#000000ff", "#000000ff", "#000000ff", false}}}; constexpr auto testString = "test text"; labelBtn.SetText(testString); @@ -360,7 +360,7 @@ HWTEST_F(UpdaterUiComponentUnitTest, test_text_label_adapter_is_info_valid, Test HWTEST_F(UpdaterUiComponentUnitTest, test_text_label_adapter_constructor, TestSize.Level0) { constexpr auto labelText = "hello"; - UxLabelInfo specInfo {100, "hello", "center", "#000000ff", "#000000ff"}; + UxLabelInfo specInfo {100, "hello", "center", "#000000ff", "#000000ff", "normal"}; UxViewCommonInfo commonInfo {0, 0, 0, 0, "id", "UILabel", false}; UxViewInfo info {commonInfo, specInfo}; TextLabelAdapter textLabel {info}; @@ -379,7 +379,7 @@ HWTEST_F(UpdaterUiComponentUnitTest, test_text_label_adapter_constructor, TestSi HWTEST_F(UpdaterUiComponentUnitTest, test_text_label_adapter_set_text, TestSize.Level0) { TextLabelAdapter textLabel {UxViewInfo {{0, 0, 0, 0, "id", "UILabel", false}, - UxLabelInfo {255, "", "", "#000000ff", "#000000ff"}}}; + UxLabelInfo {255, "", "", "#000000ff", "#000000ff", "normal"}}}; constexpr auto testString = "test text"; textLabel.SetText(testString); EXPECT_STREQ(textLabel.GetText(), testString); diff --git a/test/unittest/updater_ui_test/view/ui_layout_unittest.cpp b/test/unittest/updater_ui_test/view/ui_layout_unittest.cpp index 6ce6d92c3f3a6487ea1019d3de1b497250312145..5f7196964650399a8e236047002ff0e1139413e9 100644 --- a/test/unittest/updater_ui_test/view/ui_layout_unittest.cpp +++ b/test/unittest/updater_ui_test/view/ui_layout_unittest.cpp @@ -107,7 +107,8 @@ HWTEST_F(UpdaterUiLayoutParserUnitTest, test_label_parser, TestSize.Level0) "Reboot to normal system", "center", "#ffffffff", - "#ffffffff" + "#ffffffff", + "normal" } }; EXPECT_EQ(pageInfo.viewInfos[0], expectedLabel); } @@ -149,7 +150,8 @@ HWTEST_F(UpdaterUiLayoutParserUnitTest, test_all, TestSize.Level1) "Reboot to normal system", "center", "#ffffffff", - "#ffffffff" + "#ffffffff", + "normal" } }; EXPECT_EQ(pageInfo.viewInfos[0], expectedLabel); @@ -177,7 +179,8 @@ HWTEST_F(UpdaterUiLayoutParserUnitTest, test_all_default, TestSize.Level0) "Reboot to normal system", "center", "#ffffffff", - "#000000ff" + "#000000ff", + "normal" } }; expected.commonInfo.visible = false; EXPECT_EQ(expected.commonInfo, pageInfo.viewInfos[0].commonInfo); diff --git a/test/unittest/updater_ui_test/view/ui_page_manager_unittest.cpp b/test/unittest/updater_ui_test/view/ui_page_manager_unittest.cpp index 2d486506ad61b1a2341e728e590b704fbdfb480d..5466d49814f432da3891348b14a94f9ca3ce93ae 100644 --- a/test/unittest/updater_ui_test/view/ui_page_manager_unittest.cpp +++ b/test/unittest/updater_ui_test/view/ui_page_manager_unittest.cpp @@ -74,7 +74,7 @@ const std::vector UpdaterUiPageManagerUnitTest::pageInfos_ = { UxViewCommonInfo { 300, 400, 600, 200, "label_id_0", "UILabel", true}, UxLabelInfo { - 50, "this is page1", "center", "#ff0000ff", "#000000ff"}}, + 50, "this is page1", "center", "#ff0000ff", "#000000ff", "normal"}}, UxViewInfo { UxViewCommonInfo { 300, 700, 400, 400, "image_view", "UIImageView", false}, @@ -90,7 +90,7 @@ const std::vector UpdaterUiPageManagerUnitTest::pageInfos_ = { UxViewCommonInfo { 300, 400, 600, 200, "label_id_0", "UILabel", true}, UxLabelInfo { - 50, "this is page2", "center", "#00ff00ff", "#000000ff"}}, + 50, "this is page2", "center", "#00ff00ff", "#000000ff", "normal"}}, UxViewInfo { UxViewCommonInfo { 300, 700, 400, 400, "image_view", "UIImageView", false}, @@ -105,7 +105,7 @@ const std::vector UpdaterUiPageManagerUnitTest::pageInfos_ = { UxViewCommonInfo { 300, 400, 600, 200, "label_id_0", "UILabel", true}, UxLabelInfo { - 50, "this is page2", "center", "#0000ffff", "#000000ff"}}, + 50, "this is page2", "center", "#0000ffff", "#000000ff", "normal"}}, UxViewInfo { UxViewCommonInfo { 300, 700, 400, 400, "image_view", "UIImageView", false}, @@ -142,7 +142,7 @@ HWTEST_F(UpdaterUiPageManagerUnitTest, test_page_manager_init_failed, TestSize.L UxViewCommonInfo { 300, 400, 600, 200, "label_id_0", "UILabel", true}, UxLabelInfo { - 50, "this is page1", "center", "#ff0ff", "#0"}}}, {}} + 50, "this is page1", "center", "#ff0ff", "#0", "normal"}}}, {}} }; EXPECT_FALSE(GetInstance().Init(pageInfo, "page1")); } @@ -156,7 +156,7 @@ HWTEST_F(UpdaterUiPageManagerUnitTest, test_page_manager_init_failed, TestSize.L UxViewCommonInfo { 300, 400, 600, 200, "label_id_0", "UILabel", true}, UxLabelInfo { - 50, "this is page1", "center", "#000000ff", "#000000ff"}}}, + 50, "this is page1", "center", "#000000ff", "#000000ff", "normal"}}}, {{UxSubPageInfo {"", "#000000ff", {"label_id_0"}}}}}}; EXPECT_FALSE(GetInstance().Init(pageInfo, "page1"));