From: 罗正 <1732036298@qq.com> Date: Tue, 18 Jun 2024 13:05:55 +0000 (+0000) Subject: Merge #312 into sdk602patch0521 from refs/changes/312/head X-Git-Tag: release_V1.2.70_20241020_135402~983^2~2^2~1^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=66e009e6449f6d0dd44316aeb13a0e9254261498;p=mirrors%2FFD230.git Merge #312 into sdk602patch0521 from refs/changes/312/head Code review from 罗正 * refs/changes/312/head: (7 commits squashed) - 解决显示方式和天气bug - 1.优化显示与亮度视图目前能够同步更新显示(除了亮屏时长视图不能考虑重构中) 2.优化ui_service, - Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521 - 修改使用ImageCacheManager后清除图片资源 - Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521 - 天气界面图片加载不用ImageCacheManager 采用直接读取路径 - Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521 Signed-off-by: 罗正 <1732036298@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/312 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalview.cpp b/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalview.cpp index 8313af38e..263c18df8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalview.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalview.cpp @@ -353,6 +353,7 @@ namespace OHOS { for (int i = 0; i < numImages; i++) { + ImageCacheManager::GetInstance().UnloadSingleRes(imagePaths[i]); delete imagePaths[i]; imagePaths[i] = nullptr; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListitemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListitemView.cpp index b9d82f906..9286dcccf 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListitemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListitemView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-28 14:28:03 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-13 15:54:59 + * @LastEditTime: 2024-06-18 19:47:31 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListitemView.cpp */ #include "language/include/LanguageSwitchListitemView.h" @@ -46,8 +46,8 @@ namespace OHOS m_LabelButtonExt.SetLabelPosition(47, 0); m_LabelButtonExt.SetImagePosition(290, 30); m_LabelButtonExt.SetTouchable(true); - ImageInfo *unSelectedImg = ImageCacheManager::GetInstance().LoadSingleRes(PNG_CHECKBOX_OFF_IMAGE); - m_LabelButtonExt.SetImageSrc(unSelectedImg, unSelectedImg); + //ImageInfo *unSelectedImg = ImageCacheManager::GetInstance().LoadSingleRes(PNG_CHECKBOX_OFF_IMAGE); + m_LabelButtonExt.SetImageSrc(PNG_CHECKBOX_OFF_IMAGE, PNG_CHECKBOX_OFF_IMAGE); } UILabelButtonExt *LanguageSwitchListitemView::GetUILabelButtonExt(void) diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp index 79c898e6b..cc060b91e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -580,7 +580,7 @@ namespace OHOS */ void MainPresenterSample::PullUpDown_StopTimer(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainPresenterSample::PullUpDown_StopTimer"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainPresenterSample::PullUpDown_StopTimer"); // 检查定时器是否存在 if (g_timer != NULL) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp index 05fd5e88a..97230ee8e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp @@ -171,7 +171,7 @@ namespace OHOS void PullUpDownView::ClearAll() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ClearAll"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ClearAll"); RemoveAll(); if (group[DROPDOWNVIEW] != nullptr) { @@ -278,7 +278,7 @@ namespace OHOS connectedStatusView = nullptr; group[CONNECTEDSTATUSVIEW] = nullptr; } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ClearAll end!!"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PullUpDownView::ClearAll end!!"); } /// @brief 初始化icon图标背景 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 14befa438..808eb32e0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherReportView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherReportView.cpp @@ -257,8 +257,8 @@ namespace OHOS } for (uint8_t i = 0; i < UV_IMAGE_ANIMATOR_VIEW_NUM_FRAMES; i++) { - UVimageAnimatorInfo[i].imageInfo = ImageCacheManager::GetInstance().LoadSingleRes(UVPathsArray[i]); - UVimageAnimatorInfo[i].imageType = IMG_SRC_IMAGE_INFO; + UVimageAnimatorInfo[i].imagePath = UVPathsArray[i]; + UVimageAnimatorInfo[i].imageType = IMG_SRC_FILE_PATH; UVimageAnimatorInfo[i].pos.x = UV_IMAGE_ANIMATOR_VIEW_X; UVimageAnimatorInfo[i].pos.y = UV_IMAGE_ANIMATOR_VIEW_Y; UVimageAnimatorInfo[i].width = UV_IMAGE_ANIMATOR_VIEW_W; @@ -283,8 +283,8 @@ namespace OHOS } for (uint8_t i = 0; i < WINDSPEED_IMAGE_ANIMATOR_VIEW_NUM_FRAMES; i++) { - WindSpeedimageAnimatorInfo[i].imageInfo = ImageCacheManager::GetInstance().LoadSingleRes(WindSpeedPathsArray[i]); - WindSpeedimageAnimatorInfo[i].imageType = IMG_SRC_IMAGE_INFO; + WindSpeedimageAnimatorInfo[i].imagePath = WindSpeedPathsArray[i]; + WindSpeedimageAnimatorInfo[i].imageType = IMG_SRC_FILE_PATH; WindSpeedimageAnimatorInfo[i].pos.x = WINDSPEED_IMAGE_ANIMATOR_VIEW_X; WindSpeedimageAnimatorInfo[i].pos.y = UV_IMAGE_ANIMATOR_VIEW_Y; WindSpeedimageAnimatorInfo[i].width = UV_IMAGE_ANIMATOR_VIEW_W; @@ -309,8 +309,8 @@ namespace OHOS } for (uint8_t i = 0; i < HUMIDITY_IMAGE_ANIMATOR_VIEW_NUM_FRAMES; i++) { - HumidityimageAnimatorInfo[i].imageInfo = ImageCacheManager::GetInstance().LoadSingleRes(HumidityPathsArray[i]); - HumidityimageAnimatorInfo[i].imageType = IMG_SRC_IMAGE_INFO; + HumidityimageAnimatorInfo[i].imagePath = HumidityPathsArray[i]; + HumidityimageAnimatorInfo[i].imageType = IMG_SRC_FILE_PATH; HumidityimageAnimatorInfo[i].pos.x = HUMIDITY_IMAGE_ANIMATOR_VIEW_X; HumidityimageAnimatorInfo[i].pos.y = UV_IMAGE_ANIMATOR_VIEW_Y; HumidityimageAnimatorInfo[i].width = UV_IMAGE_ANIMATOR_VIEW_W; @@ -447,7 +447,7 @@ namespace OHOS { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "WeatherView::UpdateWeatherViewData fail!!"); } - //DumpWeatherInfo(); + // DumpWeatherInfo(); return true; } 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 5c0f6e14f..3623d49c1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-12 11:44:04 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-15 16:31:45 + * @LastEditTime: 2024-06-18 20:04:39 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp */ #include "weather/include/WeatherView.h" @@ -187,7 +187,7 @@ namespace OHOS return false; } WeatherBackGroundImg->SetPosition(WEATHER_BACKGROUND_IMAGE_X, WEATHER_BACKGROUND_IMAGE_Y, WEATHER_BACKGROUND_IMAGE_W, WEATHER_BACKGROUND_IMAGE_H); - WeatherBackGroundImg->SetSrc(ImageCacheManager::GetInstance().LoadSingleRes(WeatherBackground)); + WeatherBackGroundImg->SetSrc(WeatherBackground); /* -------------------------------------------------------------------------- */ showWeatherImage = new UIImageView(); if (showWeatherImage == nullptr) @@ -198,7 +198,7 @@ namespace OHOS showWeatherImage->SetPosition(WEATHER_IMAGE_X, WEATHER_IMAGE_Y, WEATHER_IMAGE_W, WEATHER_IMAGE_W); showWeatherImage->SetAutoEnable(false); showWeatherImage->SetResizeMode(UIImageView::CONTAIN); - showWeatherImage->SetSrc(ImageCacheManager::GetInstance().LoadSingleRes(WeatherImag)); + showWeatherImage->SetSrc(WeatherImag.c_str()); /* -------------------------------------------------------------------------- */ showCurrentTimeLabel = InitLabelExt(CURRENT_TIME_LABEL_X, CURRENT_TIME_LABEL_Y, CURRENT_TIME_LABEL_W, CURRENT_TIME_LABEL_H, "", CURRENT_TIME_LABEL_TEXT_FONT, CURRENT_TIME_LABEL_LINE_HEIGHT); @@ -253,8 +253,8 @@ namespace OHOS } for (uint8_t i = 0; i < PULLUP_ANIMATOR_VIEW_NUM_FRAMES; i++) { - PullUpimageAnimatorInfo[i].imageInfo = ImageCacheManager::GetInstance().LoadSingleRes(PullUpPathsArray[i]); - PullUpimageAnimatorInfo[i].imageType = IMG_SRC_IMAGE_INFO; + PullUpimageAnimatorInfo[i].imagePath = PullUpPathsArray[i]; + PullUpimageAnimatorInfo[i].imageType = IMG_SRC_FILE_PATH; PullUpimageAnimatorInfo[i].pos.x = PULLUP_ANIMATOR_VIEW_X; PullUpimageAnimatorInfo[i].pos.y = PULLUP_ANIMATOR_VIEW_Y; PullUpimageAnimatorInfo[i].width = PULLUP_ANIMATOR_VIEW_W; @@ -338,7 +338,7 @@ namespace OHOS { if (image) { - image->SetSrc(ImageCacheManager::GetInstance().LoadSingleRes(source)); + image->SetSrc(source.c_str()); image->Invalidate(); return true; }