主界面卡片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 9ff0d7c..7b14498 100644 (file)
--- 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 63e4db1..c9f4fb8 100644 (file)
--- 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);\r
             imageViewBottom->SetSrc(img);\r
             imageViewCoordinate->SetSrc(img);\r
-            ImageCacheManager::GetInstance().UnloadAllInMultiRes(HEART_IAMGES);\r
+            //ImageCacheManager::GetInstance().UnloadAllInMultiRes(HEART_IAMGES);\r
+            ImageCacheManager::GetInstance().UnloadOneInMultiRes(HEART_HEARTRATE_TOP,HEART_IAMGES);\r
+            ImageCacheManager::GetInstance().UnloadOneInMultiRes(HEART_HEARTRATE_BOTTOM,HEART_IAMGES);\r
+            ImageCacheManager::GetInstance().UnloadOneInMultiRes(HEART_HEARTRATECOOR,HEART_IAMGES);\r
             resLoadStatus = false;\r
         }\r
     }\r

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 eeb9120..544ca45 100644 (file)
--- 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 <list>
 #include "language/LanguageInit.h"
@@ -55,8 +54,6 @@ namespace OHOS
     private:
         std::list<Language> 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 2ff50ec..8569e6b 100644 (file)
--- 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 1ebdadb..5a64704 100644 (file)
--- 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 9286dcc..b2686de 100644 (file)
--- 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 914872c..d5b8940 100644 (file)
--- 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 f7c4e62..5611e5b 100644 (file)
--- 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,\r
                      UIView::OnClickListener *listener);\r
     bool LoadPlayerImage(UIImageView *View, uint32_t resId);\r
-    bool LoadPlayerImage(UIButton *button, uint32_t resId, uint32_t hlResId);\r
+    bool LoadPlayerButtonImage(UIButton *button, uint32_t resId);\r
 \r
     UIImageView *backGround{nullptr};           //音乐播放器背景\r
     UIImageView *elipse{nullptr};               //放复选框的绿色椭圆图片\r

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 b8798a6..0426fd9 100644 (file)
--- 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 526b2f2..e5d9f45 100644 (file)
--- 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
 {\r
     ImageInfo *imagePlaying = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PLAYING, PLAYER_IAMGES);\r
     P_PlayersCaseListAdapter->p_BtnOnClickListListener->m_label[index]->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff));\r
-    P_PlayersCaseListAdapter->p_BtnOnClickListListener->m_button[index]->SetImageSrc(imagePlaying,nullptr);\r
+    P_PlayersCaseListAdapter->p_BtnOnClickListListener->m_button[index]->SetImageSrc(imagePlaying,imagePlaying);\r
     //P_PlayersCaseListAdapter->p_BtnOnClickListListener->m_button[index]->SetViewId("playing");\r
     P_PlayersCaseListAdapter->p_BtnOnClickListListener->playOrDeleteStatus[index] = 1;\r
 }\r

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 f54088d..0fee696 100644 (file)
--- 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
         }\r
         playerButton->SetPosition(195, 195, 80, 80); // 140:x 139:y 172:width 172:height\r
         playerButton->SetOnClickListener(playerlistener);\r
-        ImagePlay = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PLAY, PLAYER_IAMGES);    // 播放图片\r
-        ImagerPause = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PAUSE, PLAYER_IAMGES); // 暂停图片\r
-        playerButton->SetImages(ImagePlay, ImagerPause);\r
+        // ImagePlay = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PLAY, PLAYER_IAMGES);    // 播放图片\r
+        // ImagerPause = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PAUSE, PLAYER_IAMGES); // 暂停图片\r
+        // playerButton->SetImages(ImagePlay, ImagerPause);\r
         Add(playerButton);\r
 \r
         soundlistener = new ButtonOnClickListener(reinterpret_cast<UIView *>(soundButton));\r
@@ -447,8 +447,8 @@ namespace OHOS
             return OHOS_FAILURE;\r
         }\r
         SetUpButton(nextButton, pointBtn, 60, 60, nextlistener); // 93：width 116：height\r
-        image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_NEXT, PLAYER_IAMGES);\r
-        nextButton->SetImageSrc(image, image);\r
+        // image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_NEXT, PLAYER_IAMGES);\r
+        // nextButton->SetImageSrc(image, image);\r
         nextButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);\r
         nextButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
         nextButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xfffbfbfb, UIButton::PRESSED);\r
@@ -463,8 +463,8 @@ namespace OHOS
             return OHOS_FAILURE;\r
         }\r
         SetUpButton(preButton, pointBtn, 60, 60, prelistener); // 86：width 116：height\r
-        image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_PROVE, PLAYER_IAMGES);\r
-        preButton->SetImageSrc(image, image);\r
+        // image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_PROVE, PLAYER_IAMGES);\r
+        // preButton->SetImageSrc(image, image);\r
         preButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);\r
         preButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
         preButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xfffbfbfb, UIButton::PRESSED);\r
@@ -604,8 +604,8 @@ namespace OHOS
             return OHOS_FAILURE;\r
         }\r
         SetUpButton(music_list_button, pointBtn, 60, 60, music_list_button_listener); // 75：width 76：height\r
-        ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_LIST, PLAYER_IAMGES);\r
-        music_list_button->SetImageSrc(image, image);\r
+        // ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_MUSIC_LIST, PLAYER_IAMGES);\r
+        // music_list_button->SetImageSrc(image, image);\r
         music_list_button->SetViewId("music_list_button");\r
         music_list_button->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);\r
         music_list_button->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
@@ -631,8 +631,8 @@ namespace OHOS
             return OHOS_FAILURE;\r
         }\r
         SetUpButton(optionsButton, pointBtn, 60, 60, optionslistener); // 75：width 76：height\r
-        ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_LOCAL_MUSIC_COLOR, PLAYER_IAMGES);\r
-        optionsButton->SetImageSrc(image, image);\r
+        // ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_LOCAL_MUSIC_COLOR, PLAYER_IAMGES);\r
+        // optionsButton->SetImageSrc(image, image);\r
         optionsButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);\r
         optionsButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
         optionsButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xfffbfbfb, UIButton::PRESSED);\r
@@ -953,6 +953,20 @@ namespace OHOS
         return true;\r
     }\r
 \r
+    bool PlayersView::LoadPlayerButtonImage(UIButton *button, uint32_t resId)\r
+    {\r
+        std::string file = PLAYER_IAMGES;\r
+        ImageInfo *image = ImageCacheManager::GetInstance().LoadOneInMultiRes(resId, file);\r
+        if (image == nullptr)\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::LoadPlayerImage %x fail", resId);\r
+            return false;\r
+        }\r
+        button->SetImageSrc(image,image);\r
+        return true;\r
+    }\r
+\r
+\r
     void PlayersView::playerResPreLoad(void)\r
     {\r
         if(!resLoadStatus)\r
@@ -962,10 +976,6 @@ namespace OHOS
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playerModelButton LoadPlayerImage fail");\r
                 return ;\r
             }\r
-            // if (ShowUpPlayerMode() == false)\r
-            // {\r
-            //     return;\r
-            // }\r
             if (LoadPlayerImage(backGround, PLAYER_BACKGROUND) == false)\r
             {\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "backGround LoadPlayerImage fail");\r
@@ -978,6 +988,42 @@ namespace OHOS
                 return ;\r
             }\r
 \r
+            if(!ShowUpPlayerMode())\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ShowUpPlayerMode fail");\r
+                return;\r
+            }\r
+\r
+            ImageInfo *ImagePlay;\r
+            ImageInfo *ImagerPause;\r
+            ImagePlay = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PLAY, PLAYER_IAMGES);    // 播放图片\r
+            ImagerPause = ImageCacheManager::GetInstance().LoadOneInMultiRes(PLAYER_PAUSE, PLAYER_IAMGES); // 暂停图片\r
+            playerButton->SetImages(ImagePlay, ImagerPause);\r
+\r
+            if(LoadPlayerButtonImage(nextButton,PLAYER_MUSIC_NEXT) == false)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "nextButton LoadPlayerImage fail");\r
+                return ;\r
+            }\r
+\r
+             if(LoadPlayerButtonImage(preButton,PLAYER_MUSIC_PROVE) == false)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "preButton LoadPlayerImage fail");\r
+                return ;\r
+            }\r
+\r
+            if(LoadPlayerButtonImage(music_list_button,PLAYER_MUSIC_LIST) == false)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "music_list_button LoadPlayerImage fail");\r
+                return ;\r
+            }\r
+\r
+            if(LoadPlayerButtonImage(optionsButton,PLAYER_LOCAL_MUSIC_COLOR) == false)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "optionsButton LoadPlayerImage fail");\r
+                return ;\r
+            }\r
+\r
             resLoadStatus = true;\r
         }\r
     }\r
@@ -988,12 +1034,24 @@ namespace OHOS
         {\r
             ImageInfo *image = nullptr;\r
             soundButton->SetSrc(image);\r
-            //playerModelButton->SetSrc(image);\r
             backGround->SetSrc(image);\r
             elipse->SetSrc(image);\r
+\r
+            playerButton->SetImages(image,image);\r
+            nextButton->SetImageSrc(image,image);\r
+            preButton->SetImageSrc(image,image);\r
+            music_list_button->SetImageSrc(image,image);\r
+            optionsButton->SetImageSrc(image,image);\r
             ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_MUSIC_VOICE,PLAYER_IAMGES);\r
             ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_BACKGROUND,PLAYER_IAMGES);\r
             ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_ELLIPSE,PLAYER_IAMGES);\r
+\r
+            ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_PLAY,PLAYER_IAMGES);\r
+            ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_PAUSE,PLAYER_IAMGES);\r
+            ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_MUSIC_NEXT,PLAYER_IAMGES);\r
+            ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_MUSIC_PROVE,PLAYER_IAMGES);\r
+            ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_MUSIC_LIST,PLAYER_IAMGES);\r
+            ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_LOCAL_MUSIC_COLOR,PLAYER_IAMGES);\r
             resLoadStatus = false;\r
         }\r
     }\r

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 1d2671d..fa0df2e 100644 (file)
--- 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 8055e1b..157d85c 100644 (file)
--- 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);\r
             Button3->SetImageSrc(img, img);\r
             ButtonMore->SetImageSrc(img, img);\r
-            ImageCacheManager::GetInstance().UnloadAllInMultiRes(TRAINING_IAMGES);\r
+            //ImageCacheManager::GetInstance().UnloadAllInMultiRes(TRAINING_IAMGES);\r
+            ImageCacheManager::GetInstance().UnloadOneInMultiRes(TRAINING_WALKING_BIG,TRAINING_IAMGES);\r
+            ImageCacheManager::GetInstance().UnloadOneInMultiRes(TRAINING_RIDING_BIG2,TRAINING_IAMGES);\r
+            ImageCacheManager::GetInstance().UnloadOneInMultiRes(TRAINING_RUNNING_BIG,TRAINING_IAMGES);\r
+            ImageCacheManager::GetInstance().UnloadOneInMultiRes(TRAINING_BUTTONGROUND2,TRAINING_IAMGES);\r
+            ImageCacheManager::GetInstance().UnloadOneInMultiRes(TRAINING_BOUTTONGROUND,TRAINING_IAMGES);\r
+            ImageCacheManager::GetInstance().UnloadOneInMultiRes(TRAINING_MORE,TRAINING_IAMGES);\r
             resLoadStatus = false;\r
         }\r
     }\r