From cc92103b11a5ec2d471ba39a5a9cc52d97056183 Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Mon, 19 Aug 2024 18:12:46 +0800
Subject: [PATCH] =?utf8?q?=E9=9F=B3=E4=B9=90=E5=88=97=E8=A1=A8=E5=88=B7?=
 =?utf8?q?=E6=96=B0=E6=9C=BA=E5=88=B6=E4=BC=98=E5=8C=96=E5=9C=A8=E6=AF=8F?=
 =?utf8?q?=E6=AC=A1=E5=88=87=E6=8D=A2=E5=88=B0=E9=9F=B3=E4=B9=90=E5=88=97?=
 =?utf8?q?=E8=A1=A8=E5=88=B7=E6=96=B0=E4=B8=80=E6=AC=A1=EF=BC=8Clist?=
 =?utf8?q?=E9=AB=98=E5=BA=A6=E4=BC=9A=E6=A0=B9=E6=8D=AE=E6=AD=8C=E6=9B=B2?=
 =?utf8?q?=E6=95=B0=E9=87=8F=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/player/src/PlayersModel.cpp      |  6 +-----
 .../nativeui/player/src/PlayersPresenter.cpp  | 10 ----------
 .../nativeui/player/src/PlayersView.cpp       | 20 +++++++++++++++----
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp
index 7205a9fcc..3e2aa2c79 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp
@@ -788,11 +788,7 @@ void PlayersModel::UpdateMusicPlayerList(void)
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OptionsButtonOnClick playersView nullptr err");
         return;
     }
-    if(playersView->GetMusicListList()) 
-    {
-        playersView->GetMusicListList()->RefreshList();
-        playersView->UpdateMusicListStatus();
-    }
+    playersView->UpdateMusicListStatus();
 }
 
 /*获取当前音乐是否是在播放中*/
diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp
index 0eafd368c..858364f59 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp
@@ -667,17 +667,7 @@ void ButtonOnClickListener::MusicListButtonOnClick()
 void ButtonOnClickListener::MusicDeleteButtonOnClick()
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ButtonOnClickListener::MusicDeleteButtonOnClick");
-    PlayersView *playersView = PlayersView::GetInstance();
-    if (playersView == nullptr) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OptionsButtonOnClick playersView nullptr err");
-        return;
-    }
     PlayersListGroup::GetInstance()->SetUpListCase();
-    if(playersView->GetMusicListList()) {
-        playersView->GetMusicListList()->RefreshList();
-        playersView->UpdateMusicListStatus();
-    }
-   
     return;
 }
 void ButtonOnClickListener::PlayerModelButtonOnClick()
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 6cde8c3ad..204cce835 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
@@ -327,13 +327,14 @@ namespace OHOS
                 return nullptr;
             }
             musicList->SetPosition(68, 120, 330, 320);
-            musicList->SetStartIndex(0);
+            musicList->SetStartIndex(PlayersModel::GetInstance()->GetCurrentIndex());
             musicList->SetThrowDrag(true);
             musicList->SetIntercept(true);
             musicList->SetMaxScrollDistance(1000);
             musicList->SetDragACCLevel(5);
             musicList->SetSwipeACCLevel(800); /*设置手指抬起屏幕后的补偿距离。*/
             musicList->SetReboundSize(35);
+            // musicList->SetScrollBlankSize(35);
             // 增加表冠控制
             musicList->SetRotateFactor(1.0);
             musicList->RequestFocus();
@@ -344,9 +345,6 @@ namespace OHOS
         musicListScrollView->Add(musicListIsEmptyLabel);
         musicListScrollView->Add(musicList);
         musicListGroupView->Add(musicListScrollView);
-        /* -------------------------------------------------------------------------- */
-        UpdateMusicListStatus(); // 音乐列表刷新
-        /* -------------------------------------------------------------------------- */
         return musicListGroupView;
     }
 
@@ -878,6 +876,19 @@ namespace OHOS
                 musicListIsEmptyImage->SetVisible(false);
                 musicListIsEmptyLabel->SetVisible(false);
                 musicList->SetVisible(true);
+                if (musicAdapter)
+                {
+                    int count = musicAdapter->GetCount();
+                    if (count > 4)
+                    {
+                        musicList->SetHeight(320);
+                    }
+                    else
+                    {
+                        musicList->SetHeight(count * 70);
+                    }
+                }
+                musicList->RefreshList();
             }
         }
     }
@@ -1361,6 +1372,7 @@ namespace OHOS
             group[thisView] = groupview;
             Add(group[thisView]);
         }
+        UpdateMusicListStatus();/*每次切换到音乐列表都将更新一次列表*/
         return true;
     }
 
-- 
2.17.1