From 7f84103993e7b178d46c2b0b51b0db734044fe40 Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Tue, 24 Sep 2024 17:41:08 +0800
Subject: [PATCH] =?utf8?q?=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AEid=E8=8E=B7?=
 =?utf8?q?=E5=8F=96=E7=9C=9F=E5=AE=9E=E9=9F=B3=E4=B9=90=E5=90=8D=E5=92=8C?=
 =?utf8?q?=E6=98=BE=E7=A4=BA=E6=96=87=E4=BB=B6=E5=90=8D=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/player/include/PlayersModel.h    |  5 +++--
 .../nativeui/player/src/PlayersModel.cpp      | 19 ++++++++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModel.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModel.h
index 931bae687..f0394660e 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModel.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-08-05 15:20:03
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-09-24 14:25:27
+ * @LastEditTime: 2024-09-24 17:38:29
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModel.h
  */
 
@@ -111,7 +111,8 @@ public:
     void set_player_state(bool value);
     // /* -------------------------------------------------------------------------- */
     std::unordered_map<uint16_t, std::pair<std::string,std::string>> &getIdToMusicNameMap(void);
-    std::string getMusicNameById(int id);
+    std::string getRealMusicNameById(int id);
+    std::string getShowMusicNameById(int id);
     uint16_t getIdFromMusicName(const std::string &musicName);
     std::string getHexMusicNameFromMusicName(const std::string &musicName);
     int getIdToMusicNameMapNumber(void);
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 5dcf570ef..6293bdb9e 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp
@@ -1034,14 +1034,27 @@ bool PlayersModel::GetCurrentMusicIsPlaying(void)
         return idToMusicNameMap;
     }
 
-    //根据id获取名字
-    std::string PlayersModel::getMusicNameById(int id)
+    //根据id获取真实的音乐名字
+    std::string PlayersModel::getRealMusicNameById(int id)
     {
         for (const auto &entry : idToMusicNameMap)
         {
             if (entry.first == id)
             {
-                return entry.second.first; // 返回对应音乐名
+                return entry.second.first; // 返回对应真实音乐名
+            }
+        }
+        return "";
+    }
+
+    //根据id获取显示的音乐名字
+    std::string PlayersModel::getShowMusicNameById(int id)
+    {
+        for (const auto &entry : idToMusicNameMap)
+        {
+            if (entry.first == id)
+            {
+                return entry.second.second; // 返回对应显示音乐名
             }
         }
         return "";
-- 
2.17.1