From ece9c7715b8657cd25f61ff8ee08073eba4a5820 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Wed, 11 Sep 2024 19:25:51 +0800 Subject: [PATCH] =?utf8?q?6.=E5=A4=A9=E6=B0=94=E7=95=8C=E9=9D=A2UI?= =?utf8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=B8=8Efigma=E4=B8=8A=E8=AE=BE?= =?utf8?q?=E8=AE=A1=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../weather/src/WeatherReportView.cpp | 10 ++-- .../nativeui/weather/src/WeatherView.cpp | 52 ++++++++++--------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherReportView.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherReportView.cpp index 9405ffc28..a95e8bba9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherReportView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherReportView.cpp @@ -125,7 +125,7 @@ namespace OHOS label->SetText(labelconfig.text.c_str()); // 内容 label->SetLineBreakMode(labelconfig.lineBreakMode); // 断行模式。 label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, labelconfig.fontSize); + label->SetFont(GILROY_BOLD_FONT, labelconfig.fontSize); return label; } @@ -157,7 +157,7 @@ namespace OHOS .lineHeigh = 35, //.text = "气象报告", .textId = STR_WEATHER_REPORT, - .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, + .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION, }; title = SetUpLabelExt(labelconfig); if (title == nullptr) @@ -174,7 +174,7 @@ namespace OHOS .fontSize = 40, .lineHeigh = 50, .text = UVData.c_str(), // 紫外线强度 - .lineBreakMode = UILabel::LINE_BREAK_ELLIPSIS, + .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION, }; UV_Number = SetUpLabel(labelconfig); if (UV_Number == nullptr) @@ -207,11 +207,11 @@ namespace OHOS .top = 290, .width = 120, .height = 35, - .fontSize = 26, + .fontSize = 30, .lineHeigh = 35, //.text = "紫外线", .textId = STR_ULTRAVIOLET, - .lineBreakMode = UILabel::LINE_BREAK_MARQUEE, + .lineBreakMode = UILabel::LINE_BREAK_OSCILLATION, }; UV = SetUpLabelExt(labelconfig); if (UV == nullptr) diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp index fae96ec99..49a6c9012 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp @@ -2,13 +2,13 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-12 11:44:04 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-17 16:08:22 + * @LastEditTime: 2024-09-11 19:08:27 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp */ #include "weather/include/WeatherView.h" #include "ConfigModel.h" #include "weather/include/WeatherModel.h" -#include "common/image_cache_manager.h" +#include "graphic_config.h" /* 当至天气界面时，主动获取最新天气数据。 （此操作静默将进行，获取到则立刻更新显示，获取不到则重试 @@ -25,8 +25,8 @@ namespace OHOS static constexpr int16_t WEATHER_BACKGROUND_IMAGE_H = 466; /*天气图片*/ - static constexpr int16_t WEATHER_IMAGE_X = 77; - static constexpr int16_t WEATHER_IMAGE_Y = 124; + static constexpr int16_t WEATHER_IMAGE_X = 100; + static constexpr int16_t WEATHER_IMAGE_Y = 168; static constexpr int16_t WEATHER_IMAGE_W = 130; static constexpr int16_t WEATHER_IMAGE_H = 130; @@ -39,36 +39,36 @@ namespace OHOS static constexpr int16_t CURRENT_TIME_LABEL_LINE_HEIGHT = 47; /*温度标签*/ - static constexpr int16_t TEMPERATURE_LABEL_X = 211; - static constexpr int16_t TEMPERATURE_LABEL_Y = 126; + static constexpr int16_t TEMPERATURE_LABEL_X = 240; + static constexpr int16_t TEMPERATURE_LABEL_Y = 170; static constexpr int16_t TEMPERATURE_LABEL_W = 178; static constexpr int16_t TEMPERATURE_LABEL_H = 125; static constexpr int16_t TEMPERATURE_LABEL_TEXT_FONT = 100; static constexpr int16_t TEMPERATURE_LABEL_LINE_HEIGHT = 125; /*天气描述标签*/ - static constexpr int16_t WEATHER_DESCRIPTION_LABEL_X = 33; - static constexpr int16_t WEATHER_DESCRIPTION_LABEL_Y = 264; - static constexpr int16_t WEATHER_DESCRIPTION_LABEL_W = 400; - static constexpr int16_t WEATHER_DESCRIPTION_LABEL_H = 43; - static constexpr int16_t WEATHER_DESCRIPTION_LABEL_TEXT_FONT = 35; - static constexpr int16_t WEATHER_DESCRIPTION_LABEL_LINE_HEIGHT = 41; + static constexpr int16_t WEATHER_DESCRIPTION_LABEL_X = 53; + static constexpr int16_t WEATHER_DESCRIPTION_LABEL_Y = 316; + static constexpr int16_t WEATHER_DESCRIPTION_LABEL_W = 360; + static constexpr int16_t WEATHER_DESCRIPTION_LABEL_H = 35; + static constexpr int16_t WEATHER_DESCRIPTION_LABEL_TEXT_FONT = 30; + static constexpr int16_t WEATHER_DESCRIPTION_LABEL_LINE_HEIGHT = 35; /*天气地区标签*/ - static constexpr int16_t WEATHER_AREA_LABEL_X = 43; - static constexpr int16_t WEATHER_AREA_LABEL_Y = 330; - static constexpr int16_t WEATHER_AREA_LABEL_W = 380; - static constexpr int16_t WEATHER_AREA_LABEL_H = 33; - static constexpr int16_t WEATHER_AREA_LABEL_TEXT_FONT = 26; - static constexpr int16_t WEATHER_AREA_LABEL_LINE_HEIGHT = 30; + static constexpr int16_t WEATHER_AREA_LABEL_X = 53; + static constexpr int16_t WEATHER_AREA_LABEL_Y = 110; + static constexpr int16_t WEATHER_AREA_LABEL_W = 360; + static constexpr int16_t WEATHER_AREA_LABEL_H = 35; + static constexpr int16_t WEATHER_AREA_LABEL_TEXT_FONT = 30; + static constexpr int16_t WEATHER_AREA_LABEL_LINE_HEIGHT = 35; /*最高与最低气温标签*/ - static constexpr int16_t MAXANDMIN_TEMPERATURE_LABEL_X = 83; - static constexpr int16_t MAXANDMIN_TEMPERATURE_LABEL_Y = 368; - static constexpr int16_t MAXANDMIN_TEMPERATURE_LABEL_W = 300; - static constexpr int16_t MAXANDMIN_TEMPERATURE_LABEL_H = 33; - static constexpr int16_t MAXANDMIN_TEMPERATURE_LABEL_TEXT_FONT = 20; - static constexpr int16_t MAXANDMIN_TEMPERATURE_LABEL_LINE_HEIGHT = 23; + static constexpr int16_t MAXANDMIN_TEMPERATURE_LABEL_X = 53; + static constexpr int16_t MAXANDMIN_TEMPERATURE_LABEL_Y = 361; + static constexpr int16_t MAXANDMIN_TEMPERATURE_LABEL_W = 360; + static constexpr int16_t MAXANDMIN_TEMPERATURE_LABEL_H = 35; + static constexpr int16_t MAXANDMIN_TEMPERATURE_LABEL_TEXT_FONT = 30; + static constexpr int16_t MAXANDMIN_TEMPERATURE_LABEL_LINE_HEIGHT = 35; #if IS_USE_IMAGEANIMATOR static constexpr int16_t PULLUP_ANIMATOR_VIEW_X = 213; @@ -186,7 +186,7 @@ namespace OHOS label->SetStyle(STYLE_TEXT_FONT, textfont); label->SetStyle(STYLE_LINE_HEIGHT, lineheight); label->SetText(text); - label->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + label->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, textfont); return label; @@ -223,6 +223,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WeatherView::new showCurrentTimeLabel fail!"); return false; } + showCurrentTimeLabel->SetFont(GILROY_BOLD_FONT, CURRENT_TIME_LABEL_TEXT_FONT); /* -------------------------------------------------------------------------- */ showTemperatureLabel = InitLabelExt(TEMPERATURE_LABEL_X, TEMPERATURE_LABEL_Y, TEMPERATURE_LABEL_W, TEMPERATURE_LABEL_H, Temperature.c_str(), TEMPERATURE_LABEL_TEXT_FONT, TEMPERATURE_LABEL_LINE_HEIGHT); @@ -231,6 +232,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WeatherView::new showTemperatureLabel fail!"); return false; } + // showTemperatureLabel->SetFont(GILROY_REGULAR_FONT, TEMPERATURE_LABEL_TEXT_FONT); /* -------------------------------------------------------------------------- */ showWeatherDescriptionLabel = InitLabelExt(WEATHER_DESCRIPTION_LABEL_X, WEATHER_DESCRIPTION_LABEL_Y, WEATHER_DESCRIPTION_LABEL_W, WEATHER_DESCRIPTION_LABEL_H, WeatherDescription.c_str(), WEATHER_DESCRIPTION_LABEL_TEXT_FONT, WEATHER_DESCRIPTION_LABEL_LINE_HEIGHT); -- 2.17.1