解决#1270,ios app上传音乐到手表后，手表端部分音乐名称显示与app端不一致bug(安卓APP需要同步修改)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersCaseListAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersCaseListAdapter.h
index f9e4f1f..6839edc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersCaseListAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersCaseListAdapter.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com\r
  * @Date: 2024-08-05 15:20:03\r
  * @LastEditors: luozheng 1732036298@qq.com\r
- * @LastEditTime: 2024-08-09 16:46:56\r
+ * @LastEditTime: 2025-01-16 18:35:24\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersCaseListAdapter.h\r
  */\r
 \r
@@ -32,6 +32,7 @@ namespace OHOS
         uint16_t GetCount() override;\r
 \r
     private:\r
+        bool GetCurrentMusicIsPlaying(void);\r
         UIView::OnClickListener *listener{nullptr};\r
     };\r
 } // namespace OHOS\r

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 000e34d..84e0b2c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp
@@ -140,6 +140,16 @@ namespace OHOS
         return PlayersListGroup::GetInstance()->GetCase().Size();\r
     }\r
 \r
+    bool PlayersCaseListAdapter::GetCurrentMusicIsPlaying(void)\r
+    {\r
+        int state = PlayersModel::GetInstance()->GetPlayerState();\r
+        if (state == PlayerStates::PLAYER_STARTED || state == PlayerStates::PLAYER_PAUSED || state == PlayerStates::PLAYER_PLAYBACK_COMPLETE) {\r
+            return true;\r
+        } else {\r
+            return false;\r
+        }\r
+    }\r
+\r
     UIView *PlayersCaseListAdapter::GetView(UIView *inView, int16_t index)\r
     {\r
         List<PlayerCaseInfo> &playersCaseList = PlayersListGroup::GetInstance()->GetCase();\r
@@ -157,10 +167,10 @@ namespace OHOS
             node = node->next_;\r
         }\r
         /* -------------------------------------------------------------------------- */\r
-        // std::string strSongName = node->data_.sliceId;\r
+        //歌名：3033332ee585abe5baa6e7a9bae997b42de69c80e5908ee79a84e68898e5bdb9 033.八度空间-最后的战役\r
         std::string strSongName = PlayersModel::GetInstance()->getHexMusicNameFromMusicName(node->data_.sliceId);\r
-        std::string pureName = strSongName.substr(0, strSongName.rfind("."));\r
-        const char *songName = pureName.c_str(); // 获取纯净歌曲名\r
+        // std::string pureName = strSongName.substr(0, strSongName.rfind("."));\r
+        const char *songName = strSongName.c_str(); // 获取纯净歌曲名\r
         /* -------------------------------------------------------------------------- */\r
         PlayerListItemView *item = nullptr;\r
         PlayerListItem listitemData;\r
@@ -173,7 +183,7 @@ namespace OHOS
         {\r
             item = static_cast<PlayerListItemView *>(inView);\r
         }\r
-        if (PlayersModel::GetInstance()->getcurrentplayingmusicname() == node->data_.sliceId  && PlayersModel::GetInstance()->GetCurrentMusicIsPlaying())\r
+        if (PlayersModel::GetInstance()->getcurrentplayingmusicname() == node->data_.sliceId  && GetCurrentMusicIsPlaying())\r
         {\r
             item->UpdateItemViewStyle(true);\r
         }\r