修改音乐播放器函数名英文错误拼写

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index 11505e5..4fa5527 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
@@ -66,7 +66,7 @@ namespace OHOS
 
 #define APP_RES_PATH "/user/res"
 #ifdef  SINGLE_USER_PARTITION
-#define APP_MUSIC_PATH "/user/musci/user_music"
+#define APP_MUSIC_PATH "/user/music/user_music"
 #else
 #define APP_MUSIC_PATH "/user/userdata/music"
 #endif

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp
index e2a4387..5fe741d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-06-20 15:11:17
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-10-19 17:39:07
+ * @LastEditTime: 2024-10-21 18:04:32
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp
  */
 #include "AppViewIDs.h"
@@ -309,7 +309,7 @@ namespace OHOS
         }
         else if (viewId == AIVOICE_START_CHAT_BUTTON_VIEW_ID) // 如果点击的是开始对话按钮
         {
-            PlayersModel::GetInstance()->HandPausePhoneMusci(); // 暂停手机音乐
+            PlayersModel::GetInstance()->HandPausePhoneMusic(); // 暂停手机音乐
             /*
              * 进入对话流程:
              *   1.当手表4G网络正常+与app连接正常 -> 通过4G调用大模型
@@ -360,7 +360,7 @@ namespace OHOS
             {
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CancelCurAIChat");
                 AiVoiceModel::GetInstance().CancelCurAIChat();
-                PlayersModel::GetInstance()->HandPausePhoneMusci(); // 暂停手机音乐
+                PlayersModel::GetInstance()->HandPausePhoneMusic(); // 暂停手机音乐
             }
             ChangeViewAndLogicOperator(it->second.first, it->second.second);
             return true;

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 793e13b..5565d96 100644 (file)
--- 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-10-18 10:55:54
+ * @LastEditTime: 2024-10-21 18:17:23
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModel.h
  */
 
@@ -111,9 +111,9 @@ public:
     void get_avrcp_ct_get_element_attributes(void);
     void set_player_state(bool value);
     bool get_player_state();
-    bool get_a2dp_sink_connect_state(void);
-    void HandPausePhoneMusci(void);
-    void HandPlayPhoneMusci(void);
+    bool get_a2dp_sink_playing_state(void);
+    void HandPausePhoneMusic(void);
+    void HandPlayPhoneMusic(void);
     // /* -------------------------------------------------------------------------- */
     std::unordered_map<uint16_t, std::pair<std::string,std::string>> &getIdToMusicNameMap(void);
     std::string getRealMusicNameById(int id);

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 88e70fe..748f812 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp
@@ -49,7 +49,7 @@ namespace OHOS
         }\r
         /* -------------------------------------------------------------------------- */\r
         if (PlayersModel::GetInstance()->get_avrcp_ct_or_tg_is_connected() && \r
-                PlayersModel::GetInstance()->get_a2dp_sink_connect_state()) //若ct或tg端是已连接状态且当前a2dp_sink是已连接状态\r
+                PlayersModel::GetInstance()->get_a2dp_sink_playing_state()) //若ct或tg端是已连接状态且当前a2dp_sink是已播放状态\r
         {\r
             return false;\r
         }\r

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 1a6a266..64f2806 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp
@@ -998,7 +998,7 @@ bool PlayersModel::GetCurrentMusicIsPlaying(void)
     }
 
     // 获取手机音乐播放状态
-    bool PlayersModel::get_a2dp_sink_connect_state(void)
+    bool PlayersModel::get_a2dp_sink_playing_state(void)
     {
         bd_addr_t active_bd_addr = a2dp_snk_get_active_device();
         int state = a2dp_snk_get_playing_state(&active_bd_addr);
@@ -1012,9 +1012,9 @@ bool PlayersModel::GetCurrentMusicIsPlaying(void)
 
 
     //暂停播放手机音乐
-    void PlayersModel::HandPausePhoneMusci(void)
+    void PlayersModel::HandPausePhoneMusic(void)
     {
-        if (get_avrcp_ct_or_tg_is_connected() && get_a2dp_sink_connect_state())
+        if (get_avrcp_ct_or_tg_is_connected() && get_a2dp_sink_playing_state())
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AVRCP_KEY_PAUSE");
             set_phone_music_play_state(AVRCP_KEY_PAUSE); // 控制手机音乐暂停
@@ -1022,9 +1022,9 @@ bool PlayersModel::GetCurrentMusicIsPlaying(void)
     }
 
     //播放手机音乐
-    void PlayersModel::HandPlayPhoneMusci(void)
+    void PlayersModel::HandPlayPhoneMusic(void)
     {
-        if (get_avrcp_ct_or_tg_is_connected() && get_a2dp_sink_connect_state())
+        if (get_avrcp_ct_or_tg_is_connected() && get_a2dp_sink_playing_state())
         {
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AVRCP_KEY_PLAY");
             set_phone_music_play_state(AVRCP_KEY_PLAY); // 控制手机音乐暂停

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 1d4106c..9aeb21b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp
@@ -644,7 +644,7 @@ void ButtonOnClickListener::PlayerButtonOnClick()
         else //若当前歌曲列表不为空且为本地音乐\r
         {\r
             if (PlayersModel::GetInstance()->get_avrcp_ct_or_tg_is_connected() && \r
-                PlayersModel::GetInstance()->get_a2dp_sink_connect_state()) //若ct或tg端是已连接状态且当前a2dp_sink是已连接状态\r
+                PlayersModel::GetInstance()->get_a2dp_sink_playing_state()) //若ct或tg端是已连接状态且当前a2dp_sink是已播放状态\r
             {\r
                 playersView->ChangeView(PlayersView::MAIN_MUSICPLAYER_VIEW, PlayersView::MUSIC_PLAYER_TIP_VIEW); // 跳转到提示界面\r
             } else {\r
@@ -696,7 +696,7 @@ void ButtonOnClickListener::NextButtonOnClick()
             return;\r
         }\r
         if (PlayersModel::GetInstance()->get_avrcp_ct_or_tg_is_connected() && \r
-                PlayersModel::GetInstance()->get_a2dp_sink_connect_state()) //若ct或tg端是已连接状态且当前a2dp_sink是已连接状态\r
+                PlayersModel::GetInstance()->get_a2dp_sink_playing_state()) //若ct或tg端是已连接状态且当前a2dp_sink是已播放状态\r
         {\r
             playersView->ChangeView(PlayersView::MAIN_MUSICPLAYER_VIEW, PlayersView::MUSIC_PLAYER_TIP_VIEW); // 跳转到提示界面\r
             return;\r
@@ -725,7 +725,7 @@ void ButtonOnClickListener::PreButtonOnClick()
             return;\r
         }\r
         if (PlayersModel::GetInstance()->get_avrcp_ct_or_tg_is_connected() && \r
-                PlayersModel::GetInstance()->get_a2dp_sink_connect_state()) //若ct或tg端是已连接状态且当前a2dp_sink是已连接状态\r
+                PlayersModel::GetInstance()->get_a2dp_sink_playing_state()) //若ct或tg端是已连接状态且当前a2dp_sink是已播放状态\r
         {\r
             playersView->ChangeView(PlayersView::MAIN_MUSICPLAYER_VIEW, PlayersView::MUSIC_PLAYER_TIP_VIEW); // 跳转到提示界面\r
             return;\r
@@ -748,7 +748,7 @@ void ButtonOnClickListener::SoundButtonOnClick()
     }\r
     /* -------------------------------------------------------------------------- */\r
     if (PlayersModel::GetInstance()->get_avrcp_ct_or_tg_is_connected() && \r
-                PlayersModel::GetInstance()->get_a2dp_sink_connect_state()) //若ct或tg端是已连接状态且当前a2dp_sink是已连接状态\r
+                PlayersModel::GetInstance()->get_a2dp_sink_playing_state()) //若ct或tg端是已连接状态且当前a2dp_sink是已播放状态\r
     {\r
         playersView->ChangeView(PlayersView::MAIN_MUSICPLAYER_VIEW, PlayersView::MUSIC_PLAYER_TIP_VIEW); // 跳转到提示界面\r
         return;\r
@@ -819,7 +819,7 @@ void ButtonOnClickListener::PlayerModelButtonOnClick()
     }\r
     /* -------------------------------------------------------------------------- */\r
     if (PlayersModel::GetInstance()->get_avrcp_ct_or_tg_is_connected() && \r
-                PlayersModel::GetInstance()->get_a2dp_sink_connect_state()) //若ct或tg端是已连接状态且当前a2dp_sink是已连接状态\r
+                PlayersModel::GetInstance()->get_a2dp_sink_playing_state()) //若ct或tg端是已连接状态且当前a2dp_sink是已播放状态\r
     {\r
         playersView->ChangeView(PlayersView::MAIN_MUSICPLAYER_VIEW, PlayersView::MUSIC_PLAYER_TIP_VIEW); // 跳转到提示界面\r
         return;\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLogModel.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLogModel.h
index ec766e8..57cddc5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLogModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLogModel.h
@@ -8,7 +8,7 @@
 #include <memory>  
 
 #define TOTAL_MUSIC_SPACE (10 * 1024 * 1024) // 10M
-#define TOTAL_MUSIC_SPACE_PATH "/user/music/user_musci"
+#define TOTAL_MUSIC_SPACE_PATH "/user/music/user_music"
 
 #define TOTAL_RECORDING_SPACE (10 * 1024 * 1024) // 10M
 #define TOTAL_RECORDING_SPACE_PATH "/user/music/recording"