From 5ffb52b46ca74fdafb72e16099d18d7bd806acc4 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Fri, 4 Jul 2025 11:15:23 +0800 Subject: [PATCH] =?utf8?q?applist=E5=8E=BB=E6=8E=89=E8=9C=82=E7=AA=9D?= =?utf8?q?=EF=BC=9B=E5=A2=9E=E5=8A=A0=E7=9B=B4=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/applist/src/ApplistView.cpp | 2 +- .../themestyle/src/ThemeStyleView.cpp | 24 ++++++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp index b228896d2..9060eea73 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistView.cpp @@ -19,7 +19,7 @@ namespace OHOS { static constexpr int16 NUM_2 = 2; static constexpr int16 MAX_SCROLL_DIS = 1000; -static constexpr int16 ROTATE_FACTOR_2 = 2.0; +static constexpr int16 ROTATE_FACTOR_2 = 5.0; #define ARC_SCALE_LIST_SCALE_FACTOR (400)//(400) #define ARC_SCALE_LIST_X (25) diff --git a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp index 5da20e551..ade80865b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleView.cpp @@ -74,7 +74,7 @@ namespace OHOS delete ExitLabel; ExitLabel = nullptr; } - if(temp) + if (temp) { delete temp; temp = nullptr; @@ -131,7 +131,7 @@ namespace OHOS label->SetPosition(labelconfig.left, labelconfig.top, labelconfig.width, labelconfig.height); label->SetStyle(STYLE_TEXT_FONT, labelconfig.fontSize); label->SetStyle(STYLE_LINE_HEIGHT, labelconfig.lineHeigh); - label->SetTextId(labelconfig.textId);//TODO::多国语言 + label->SetTextId(labelconfig.textId); // TODO::多国语言 label->SetLineBreakMode(labelconfig.lineBreakMode); label->SetAlign(TEXT_ALIGNMENT_LEFT, TEXT_ALIGNMENT_CENTER); label->SetRollSpeed(23); @@ -183,9 +183,13 @@ namespace OHOS titleText->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); titleText->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); scrollView->Add(titleText); - /* -------------------------------------------------------------------------- */ - // int16_t textId[] = {STR_LIST_DISPLAY, STR_CELLULAR_DISPLAY, STR_ARC_SCALE_LIST_DISPLAY,STR_DIAL_PLATE}; +/* -------------------------------------------------------------------------- */ +// int16_t textId[] = {STR_LIST_DISPLAY, STR_CELLULAR_DISPLAY, STR_ARC_SCALE_LIST_DISPLAY,STR_DIAL_PLATE}; +#if defined(BOARD_N9) + int16_t textId[] = {STR_ARC_SCALE_LIST_DISPLAY, STR_LIST_DISPLAY, STR_DIAL_PLATE}; +#else int16_t textId[] = {STR_ARC_SCALE_LIST_DISPLAY, STR_CELLULAR_DISPLAY,STR_DIAL_PLATE}; +#endif LabelConfig labelConfig = { .left = 143, .top = 153, @@ -237,8 +241,12 @@ namespace OHOS .viewId = THEME_STYLE_LIST, }; - // const char *viewId[] = {THEME_STYLE_LIST, THEME_STYLE_HEXAGONS, THEME_STYLE_ARC_LIST,THEME_STYLE_CIRCLE_LIST}; +// const char *viewId[] = {THEME_STYLE_LIST, THEME_STYLE_HEXAGONS, THEME_STYLE_ARC_LIST,THEME_STYLE_CIRCLE_LIST}; +#if defined(BOARD_N9) + const char *viewId[] = {THEME_STYLE_ARC_LIST, THEME_STYLE_LIST, THEME_STYLE_CIRCLE_LIST}; +#else const char *viewId[] = {THEME_STYLE_ARC_LIST, THEME_STYLE_HEXAGONS,THEME_STYLE_CIRCLE_LIST}; +#endif for (int i = 0; i < sizeof(viewId) / sizeof(viewId[0]); i++) { labelbuttonconfig.top = 120 + 120 * i; @@ -279,8 +287,12 @@ namespace OHOS .src = THEMESTYLE_LIST_IMAGEPATH, }; int y = 150; - // const char *src[MAX_STYLE] = {THEMESTYLE_LIST_IMAGEPATH, THEMESTYLE_HEXAGONS_IMAGEPATH, THEMESTYLE_ARCLIST_IMAGEPATH,THEMESTYLE_CIRCLELIST_IMAGEPATH}; +// const char *src[MAX_STYLE] = {THEMESTYLE_LIST_IMAGEPATH, THEMESTYLE_HEXAGONS_IMAGEPATH, THEMESTYLE_ARCLIST_IMAGEPATH,THEMESTYLE_CIRCLELIST_IMAGEPATH}; +#if defined(BOARD_N9) + const char *src[] = {THEMESTYLE_ARCLIST_IMAGEPATH, THEMESTYLE_LIST_IMAGEPATH, THEMESTYLE_CIRCLELIST_IMAGEPATH}; +#else const char *src[] = {THEMESTYLE_ARCLIST_IMAGEPATH, THEMESTYLE_HEXAGONS_IMAGEPATH,THEMESTYLE_CIRCLELIST_IMAGEPATH}; +#endif for (int i = 0; i < sizeof(src) / sizeof(src[0]); i++) { imageconfig.y = y + 120 * i; -- 2.17.1