From: luozheng <1732036298@qq.com> Date: Fri, 28 Jun 2024 02:51:33 +0000 (+0800) Subject: 主界面卡片Unload与Load优化 X-Git-Tag: release_V1.2.70_20241020_135402~928^2~4 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=bc0a8e5f6b341133f55c8f20677142b33411f663;p=mirrors%2FFD230.git 主界面卡片Unload与Load优化 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalother.cpp b/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalother.cpp index 9ff0d7c60..7b14498d9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalother.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalother.cpp @@ -509,6 +509,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/heartrate/src/HeartRateView.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateView.cpp index 63e4db13d..c9f4fb830 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartRateView.cpp @@ -631,7 +631,10 @@ namespace OHOS imageViewTop->SetSrc(img); imageViewBottom->SetSrc(img); imageViewCoordinate->SetSrc(img); - ImageCacheManager::GetInstance().UnloadAllInMultiRes(HEART_IAMGES); + //ImageCacheManager::GetInstance().UnloadAllInMultiRes(HEART_IAMGES); + ImageCacheManager::GetInstance().UnloadOneInMultiRes(HEART_HEARTRATE_TOP,HEART_IAMGES); + ImageCacheManager::GetInstance().UnloadOneInMultiRes(HEART_HEARTRATE_BOTTOM,HEART_IAMGES); + ImageCacheManager::GetInstance().UnloadOneInMultiRes(HEART_HEARTRATECOOR,HEART_IAMGES); resLoadStatus = false; } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchListAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchListAdapter.h index eeb912009..544ca45e7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchListAdapter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchListAdapter.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-28 14:26:55 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-03-29 19:42:38 + * @LastEditTime: 2024-06-28 09:34:15 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchListAdapter.h */ #ifndef LANGUAGE_SWITCH_LIST_ADAPTER_H @@ -12,7 +12,6 @@ #include "components/ui_label_button_ext.h" #include "components/ui_list.h" #include "language/LanguageInit.h" -#include "common/image_cache_manager.h" #include "UiConfig.h" #include #include "language/LanguageInit.h" @@ -55,8 +54,6 @@ namespace OHOS private: std::list listData; UIView::OnClickListener *itemClickListener{nullptr}; - ImageInfo *NotSelectedImg; - ImageInfo *SelectedImg; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchPresenter.h index 2ff50ec6b..8569e6b92 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchPresenter.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-28 14:16:52 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-13 16:04:05 + * @LastEditTime: 2024-06-28 09:33:07 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/include/LanguageSwitchPresenter.h */ #ifndef LANGUAGE_SWITCH_PRESENTER_H @@ -40,8 +40,6 @@ namespace OHOS bool OnDragEnd(UIView &view, const DragEvent &event) override; bool OnKeyAct(UIView &view, const KeyEvent &event) override; // 增加按键事件 LanguageSwitchModel *p_LanguageSwitchModel{nullptr}; - ImageInfo *NotSelectedImg; - ImageInfo *SelectedImg; UILabelExt *m_labelext{nullptr}; bool X_DRAG_FLAG{false}; }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListAdapter.cpp index 1ebdadb29..5a647044b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListAdapter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListAdapter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-28 14:27:05 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-13 15:50:29 + * @LastEditTime: 2024-06-28 09:33:56 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListAdapter.cpp */ #include "language/include/LanguageSwitchListAdapter.h" @@ -19,8 +19,6 @@ namespace OHOS LanguageSwitchListAdapter::LanguageSwitchListAdapter() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "LanguageSwitchListAdapter::LanguageSwitchListAdapter"); - NotSelectedImg = ImageCacheManager::GetInstance().LoadSingleRes(PNG_CHECKBOX_OFF_IMAGE); - SelectedImg = ImageCacheManager::GetInstance().LoadSingleRes(PNG_CHECKBOX_ON_IMAGE); } LanguageSwitchListAdapter::~LanguageSwitchListAdapter() @@ -100,12 +98,12 @@ namespace OHOS if (strcmp(LanguageSwitchModel::GetInstance().GetCurLanguageCode(), view_languageid) == 0) { // 设置选中 - item->GetUILabelButtonExt()->SetImageSrc(SelectedImg, SelectedImg); + item->GetUILabelButtonExt()->SetImageSrc(PNG_CHECKBOX_ON_IMAGE, PNG_CHECKBOX_ON_IMAGE); } else { // 设置未选中 - item->GetUILabelButtonExt()->SetImageSrc(NotSelectedImg, NotSelectedImg); + item->GetUILabelButtonExt()->SetImageSrc(PNG_CHECKBOX_OFF_IMAGE, PNG_CHECKBOX_OFF_IMAGE); } item->GetUILabelButtonExt()->Invalidate(); } 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 9286dcccf..b2686deff 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-18 19:47:31 + * @LastEditTime: 2024-06-28 09:34:06 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchListitemView.cpp */ #include "language/include/LanguageSwitchListitemView.h" @@ -46,7 +46,6 @@ 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(PNG_CHECKBOX_OFF_IMAGE, PNG_CHECKBOX_OFF_IMAGE); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp index 914872ca2..d5b894033 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-28 14:17:43 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-13 18:02:08 + * @LastEditTime: 2024-06-28 09:32:58 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp */ #include "AppViewIDs.h" @@ -25,15 +25,11 @@ namespace OHOS { p_LanguageSwitchModel = &LanguageSwitchModel::GetInstance(); g_pLanguageSwitchPresenter = this; - NotSelectedImg = ImageCacheManager::GetInstance().LoadSingleRes(PNG_CHECKBOX_OFF_IMAGE); - SelectedImg = ImageCacheManager::GetInstance().LoadSingleRes(PNG_CHECKBOX_ON_IMAGE); } LanguageSwitchPresenter::~LanguageSwitchPresenter() { g_pLanguageSwitchPresenter = nullptr; - ImageCacheManager::GetInstance().UnloadSingleRes(PNG_CHECKBOX_OFF_IMAGE); - ImageCacheManager::GetInstance().UnloadSingleRes(PNG_CHECKBOX_ON_IMAGE); } LanguageSwitchPresenter *LanguageSwitchPresenter::GetInstance() @@ -127,7 +123,7 @@ namespace OHOS m_labelext->SetTextId(STR_LANGUAGE_SELECTION); m_labelext->ForceResetText(); // 强制刷新 - p_UILabelButtonExt->SetImageSrc(SelectedImg, SelectedImg); + p_UILabelButtonExt->SetImageSrc(PNG_CHECKBOX_ON_IMAGE, PNG_CHECKBOX_ON_IMAGE); p_UILabelButtonExt->Invalidate(); LanguageSwitchView::GetInstance()->GetLanguageList()->RefreshList(); // 更新上一个语言ID diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h index f7c4e627c..5611e5b71 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h @@ -103,7 +103,7 @@ private: void SetUpButton(UIButton *btn, const Point& point, int16_t width, int16_t height, UIView::OnClickListener *listener); bool LoadPlayerImage(UIImageView *View, uint32_t resId); - bool LoadPlayerImage(UIButton *button, uint32_t resId, uint32_t hlResId); + bool LoadPlayerButtonImage(UIButton *button, uint32_t resId); UIImageView *backGround{nullptr}; //音乐播放器背景 UIImageView *elipse{nullptr}; //放复选框的绿色椭圆图片 diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListitemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListitemView.cpp index b8798a64e..0426fd9d4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListitemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListitemView.cpp @@ -1,3 +1,10 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-06-12 14:15:45 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-06-28 09:47:26 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListitemView.cpp + */ #include "PlayerListitemView.h" #include "ui_resource_image.h" #include "common/image_cache_manager.h" @@ -44,7 +51,7 @@ namespace OHOS sButton.SetStyle(STYLE_BACKGROUND_OPA, 0x00); sButton.SetStyle(STYLE_BORDER_RADIUS, 0); ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_DELETE, PLAYER_IAMGES); - sButton.SetImageSrc(image, nullptr); + sButton.SetImageSrc(image, image); sButton.SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff4fc34c, UIButton::PRESSED); sButton.SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); sButton.SetStyleForState(STYLE_BORDER_RADIUS, 0, UIButton::PRESSED); diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp index 526b2f2d1..e5d9f454e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp @@ -56,7 +56,7 @@ void BtnOnClickListListener::SongClick(PlayersCaseListAdapter *P_PlayersCaseList { ImageInfo *imagePlaying = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PLAYING, PLAYER_IAMGES); P_PlayersCaseListAdapter->p_BtnOnClickListListener->m_label[index]->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff)); - P_PlayersCaseListAdapter->p_BtnOnClickListListener->m_button[index]->SetImageSrc(imagePlaying,nullptr); + P_PlayersCaseListAdapter->p_BtnOnClickListListener->m_button[index]->SetImageSrc(imagePlaying,imagePlaying); //P_PlayersCaseListAdapter->p_BtnOnClickListListener->m_button[index]->SetViewId("playing"); P_PlayersCaseListAdapter->p_BtnOnClickListListener->playOrDeleteStatus[index] = 1; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp index f54088d30..0fee6962d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp @@ -411,9 +411,9 @@ namespace OHOS } playerButton->SetPosition(195, 195, 80, 80); // 140:x 139:y 172:width 172:height playerButton->SetOnClickListener(playerlistener); - ImagePlay = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PLAY, PLAYER_IAMGES); // 播放图片 - ImagerPause = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PAUSE, PLAYER_IAMGES); // 暂停图片 - playerButton->SetImages(ImagePlay, ImagerPause); + // ImagePlay = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PLAY, PLAYER_IAMGES); // 播放图片 + // ImagerPause = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PAUSE, PLAYER_IAMGES); // 暂停图片 + // playerButton->SetImages(ImagePlay, ImagerPause); Add(playerButton); soundlistener = new ButtonOnClickListener(reinterpret_cast(soundButton)); @@ -447,8 +447,8 @@ namespace OHOS return OHOS_FAILURE; } SetUpButton(nextButton, pointBtn, 60, 60, nextlistener); // 93:width 116:height - image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_NEXT, PLAYER_IAMGES); - nextButton->SetImageSrc(image, image); + // image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_NEXT, PLAYER_IAMGES); + // nextButton->SetImageSrc(image, image); nextButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); nextButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00); nextButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xfffbfbfb, UIButton::PRESSED); @@ -463,8 +463,8 @@ namespace OHOS return OHOS_FAILURE; } SetUpButton(preButton, pointBtn, 60, 60, prelistener); // 86:width 116:height - image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_PROVE, PLAYER_IAMGES); - preButton->SetImageSrc(image, image); + // image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_PROVE, PLAYER_IAMGES); + // preButton->SetImageSrc(image, image); preButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); preButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00); preButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xfffbfbfb, UIButton::PRESSED); @@ -604,8 +604,8 @@ namespace OHOS return OHOS_FAILURE; } SetUpButton(music_list_button, pointBtn, 60, 60, music_list_button_listener); // 75:width 76:height - ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_LIST, PLAYER_IAMGES); - music_list_button->SetImageSrc(image, image); + // ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_LIST, PLAYER_IAMGES); + // music_list_button->SetImageSrc(image, image); music_list_button->SetViewId("music_list_button"); music_list_button->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); music_list_button->SetStyle(STYLE_BACKGROUND_OPA, 0x00); @@ -631,8 +631,8 @@ namespace OHOS return OHOS_FAILURE; } SetUpButton(optionsButton, pointBtn, 60, 60, optionslistener); // 75:width 76:height - ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_LOCAL_MUSIC_COLOR, PLAYER_IAMGES); - optionsButton->SetImageSrc(image, image); + // ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_LOCAL_MUSIC_COLOR, PLAYER_IAMGES); + // optionsButton->SetImageSrc(image, image); optionsButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff); optionsButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00); optionsButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xfffbfbfb, UIButton::PRESSED); @@ -953,6 +953,20 @@ namespace OHOS return true; } + bool PlayersView::LoadPlayerButtonImage(UIButton *button, uint32_t resId) + { + std::string file = PLAYER_IAMGES; + ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, file); + if (image == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::LoadPlayerImage %x fail", resId); + return false; + } + button->SetImageSrc(image,image); + return true; + } + + void PlayersView::playerResPreLoad(void) { if(!resLoadStatus) @@ -962,10 +976,6 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerModelButton LoadPlayerImage fail"); return ; } - // if (ShowUpPlayerMode() == false) - // { - // return; - // } if (LoadPlayerImage(backGround, PLAYER_BACKGROUND) == false) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "backGround LoadPlayerImage fail"); @@ -978,6 +988,42 @@ namespace OHOS return ; } + if(!ShowUpPlayerMode()) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowUpPlayerMode fail"); + return; + } + + ImageInfo *ImagePlay; + ImageInfo *ImagerPause; + ImagePlay = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PLAY, PLAYER_IAMGES); // 播放图片 + ImagerPause = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PAUSE, PLAYER_IAMGES); // 暂停图片 + playerButton->SetImages(ImagePlay, ImagerPause); + + if(LoadPlayerButtonImage(nextButton,PLAYER_MUSIC_NEXT) == false) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "nextButton LoadPlayerImage fail"); + return ; + } + + if(LoadPlayerButtonImage(preButton,PLAYER_MUSIC_PROVE) == false) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "preButton LoadPlayerImage fail"); + return ; + } + + if(LoadPlayerButtonImage(music_list_button,PLAYER_MUSIC_LIST) == false) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "music_list_button LoadPlayerImage fail"); + return ; + } + + if(LoadPlayerButtonImage(optionsButton,PLAYER_LOCAL_MUSIC_COLOR) == false) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "optionsButton LoadPlayerImage fail"); + return ; + } + resLoadStatus = true; } } @@ -988,12 +1034,24 @@ namespace OHOS { ImageInfo *image = nullptr; soundButton->SetSrc(image); - //playerModelButton->SetSrc(image); backGround->SetSrc(image); elipse->SetSrc(image); + + playerButton->SetImages(image,image); + nextButton->SetImageSrc(image,image); + preButton->SetImageSrc(image,image); + music_list_button->SetImageSrc(image,image); + optionsButton->SetImageSrc(image,image); ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_MUSIC_VOICE,PLAYER_IAMGES); ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_BACKGROUND,PLAYER_IAMGES); ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_ELLIPSE,PLAYER_IAMGES); + + ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_PLAY,PLAYER_IAMGES); + ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_PAUSE,PLAYER_IAMGES); + ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_MUSIC_NEXT,PLAYER_IAMGES); + ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_MUSIC_PROVE,PLAYER_IAMGES); + ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_MUSIC_LIST,PLAYER_IAMGES); + ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_LOCAL_MUSIC_COLOR,PLAYER_IAMGES); resLoadStatus = false; } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp index 1d2671d0f..fa0df2e11 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp @@ -2,13 +2,12 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-27 19:48:49 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-05-07 20:03:34 + * @LastEditTime: 2024-06-28 09:49:17 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp */ #include "wearable_log.h" #include "SettingItemView.h" -#include "common/image_cache_manager.h" #include "systemupdate/include/SystemUpdateModel.h" namespace OHOS { @@ -88,8 +87,7 @@ namespace OHOS settingLabelButtonExt.SetLabelPosition(115, 0); settingLabelButtonExt.SetImagePosition(326, 37); settingLabelButtonExt.SetTouchable(false); - ImageInfo *img = ImageCacheManager::GetInstance().LoadSingleRes(PNG_SETTING_NEXT_IMAGE); - settingLabelButtonExt.SetImageSrc(img, img); + settingLabelButtonExt.SetImageSrc(PNG_SETTING_NEXT_IMAGE, PNG_SETTING_NEXT_IMAGE); } AppViewId SettingItemView::GetViewId() diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp index 8055e1b8f..157d85cfd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp @@ -283,7 +283,13 @@ namespace OHOS Button2->SetImageSrc(img, img); Button3->SetImageSrc(img, img); ButtonMore->SetImageSrc(img, img); - ImageCacheManager::GetInstance().UnloadAllInMultiRes(TRAINING_IAMGES); + //ImageCacheManager::GetInstance().UnloadAllInMultiRes(TRAINING_IAMGES); + ImageCacheManager::GetInstance().UnloadOneInMultiRes(TRAINING_WALKING_BIG,TRAINING_IAMGES); + ImageCacheManager::GetInstance().UnloadOneInMultiRes(TRAINING_RIDING_BIG2,TRAINING_IAMGES); + ImageCacheManager::GetInstance().UnloadOneInMultiRes(TRAINING_RUNNING_BIG,TRAINING_IAMGES); + ImageCacheManager::GetInstance().UnloadOneInMultiRes(TRAINING_BUTTONGROUND2,TRAINING_IAMGES); + ImageCacheManager::GetInstance().UnloadOneInMultiRes(TRAINING_BOUTTONGROUND,TRAINING_IAMGES); + ImageCacheManager::GetInstance().UnloadOneInMultiRes(TRAINING_MORE,TRAINING_IAMGES); resLoadStatus = false; } }