From 3b9ca11da17d550381ca3f6ffabb7bbfe72ddc89 Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Wed, 12 Jun 2024 15:12:04 +0800
Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3=E4=B8=BB=E7=95=8C=E9=9D=A2?=
 =?utf8?q?=E9=9F=B3=E4=B9=90=E5=8D=A1=E7=89=87=E6=AD=BB=E6=9C=BA=E9=97=AE?=
 =?utf8?q?=E9=A2=98=EF=BC=8C=E8=A7=A3=E5=86=B3=E8=AE=AD=E7=BB=83=E5=8D=A1?=
 =?utf8?q?=E7=89=87=E7=82=B9=E5=87=BB=E9=9F=B3=E4=B9=90=E5=88=97=E8=A1=A8?=
 =?utf8?q?=E4=BC=9A=E6=AD=BB=E6=9C=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/player/src/PlayersPresenter.cpp  |  2 +-
 .../nativeui/player/src/PlayersView.cpp       | 39 ++++++++++++-------
 2 files changed, 26 insertions(+), 15 deletions(-)

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 f1ef2012f..1191eb5b5 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp
@@ -666,7 +666,7 @@ bool ButtonOnClickListener::OnClick(UIView& view, const ClickEvent& event)
     }
     if(strcmp(view.GetViewId(),"music_list_button") == 0)
     {
-        //PlayersPresenter::GetInstance()->ShowPlayerListGroup();
+        PlayersPresenter::GetInstance()->ShowPlayerListGroup();
     }
     else if(strcmp(view.GetViewId(),"Delbutton") == 0)
     {
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 1effc9d51..dd9acce0a 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
@@ -210,16 +210,21 @@ namespace OHOS
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView listGroup is NULL");
             return;
         }
-        UIView *vew = MainViewSample::GetInstance()->GetMainViewGroup();
-        if (vew != nullptr)
+        if (MainViewSample::GetInstance() != nullptr)
         {
-            vew->SetVisible(!status);
+            UIView *vew = MainViewSample::GetInstance()->GetMainViewGroup();
+            if (vew != nullptr)
+            {
+                vew->SetVisible(!status);
+            }
         }
-        /*增加训练卡片控制*/
-        UIView *cardview = TraingCardView::GetInstance()->GetTraingCrad();
-        if (cardview != nullptr)
+        if (TraingCardView::GetInstance() != nullptr)
         {
-            cardview->SetVisible(!status);
+            UIView *cardview = TraingCardView::GetInstance()->GetTraingCrad();
+            if (cardview != nullptr)
+            {
+                cardview->SetVisible(!status);
+            }
         }
         listGroup->SetVisible(status);
         return;
@@ -234,16 +239,22 @@ namespace OHOS
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersView DelSongView is NULL");
             return;
         }
-        UIView *vew = MainViewSample::GetInstance()->GetMainViewGroup();
-        if (vew != nullptr)
+        if (MainViewSample::GetInstance() != nullptr)
         {
-            vew->SetVisible(!status);
+            UIView *vew = MainViewSample::GetInstance()->GetMainViewGroup();
+            if (vew != nullptr)
+            {
+                vew->SetVisible(!status);
+            }
         }
-        /*增加训练卡片控制*/
-        UIView *cardview = TraingCardView::GetInstance()->GetTraingCrad();
-        if (cardview != nullptr)
+        // /*增加训练卡片控制*/
+        if (TraingCardView::GetInstance() != nullptr)
         {
-            cardview->SetVisible(!status);
+            UIView *cardview = TraingCardView::GetInstance()->GetTraingCrad();
+            if (cardview != nullptr)
+            {
+                cardview->SetVisible(!status);
+            }
         }
         DelSongView->SetVisible(status);
         RootView::GetInstance()->Invalidate();
-- 
2.17.1