From c186ffe82c72794dc38575bd82be4ded55cea504 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Tue, 18 Jun 2024 19:50:29 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E4=BD=BF=E7=94=A8ImageCacheMa?= =?utf8?q?nager=E5=90=8E=E6=B8=85=E9=99=A4=E5=9B=BE=E7=89=87=E8=B5=84?= =?utf8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../wearable/fd230app/nativeui/goal/src/goalview.cpp | 1 + .../nativeui/language/src/LanguageSwitchListitemView.cpp | 6 +++--- .../fd230app/nativeui/weather/src/WeatherReportView.cpp | 3 ++- .../fd230app/nativeui/weather/src/WeatherView.cpp | 9 +++++---- 4 files changed, 11 insertions(+), 8 deletions(-) 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 387ddd721..598f86b2e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalview.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalview.cpp @@ -351,6 +351,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/weather/src/WeatherReportView.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherReportView.cpp index 14befa438..b1d1557dd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherReportView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherReportView.cpp @@ -379,6 +379,7 @@ namespace OHOS { for (int i = 0; i < numImages; i++) { + ImageCacheManager::GetInstance().UnloadSingleRes(imagePaths[i]); delete imagePaths[i]; imagePaths[i] = nullptr; } @@ -447,7 +448,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..a986f1e97 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 19:35:18 * @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); @@ -316,6 +316,7 @@ namespace OHOS { for (int i = 0; i < numImages; i++) { + ImageCacheManager::GetInstance().UnloadSingleRes(imagePaths[i]); delete imagePaths[i]; imagePaths[i] = nullptr; } @@ -338,7 +339,7 @@ namespace OHOS { if (image) { - image->SetSrc(ImageCacheManager::GetInstance().LoadSingleRes(source)); + image->SetSrc(source.c_str()); image->Invalidate(); return true; } -- 2.17.1