完善音乐来源视图:
author罗正yun <1732036298@qq.com>
Sat, 6 Jan 2024 03:32:48 +0000 (11:32 +0800)
committer罗正yun <1732036298@qq.com>
Sat, 6 Jan 2024 03:32:48 +0000 (11:32 +0800)
完成功能:
点击音乐来源视图中的radiobutton可在音乐播放器主界面显示播放模式.
如,点击手机音乐,主播放器视图音乐来源标签(MusciSourceLabel)内容被设置为"手机音乐",
音乐列表将被隐藏,音乐来源标签上方PhoneMusicConnectStatusLabel(手机音乐连接状态标签)设置为显示。
点击本地音乐radiobutton亦是如此。
待完善功能:
从音乐播放器界面跳转至其他界面,若刚刚为手机音乐模式,则在其他界面返回至音乐播放器界面乐来源标签(MusciSourceLabel)被还原成本地音乐
与逻辑相悖,需要保存点击手机音乐radiobutton状态。

code/sdk/application/wearable/nativeapp/nativeui/player/include/PlayersPresenter.h
code/sdk/application/wearable/nativeapp/nativeui/player/include/PlayersView.h
code/sdk/application/wearable/nativeapp/nativeui/player/src/BluetoothView.cpp
code/sdk/application/wearable/nativeapp/nativeui/player/src/PlayersPresenter.cpp
code/sdk/application/wearable/nativeapp/nativeui/player/src/PlayersView.cpp

index 52f1237..c981412 100755 (executable)
@@ -235,6 +235,10 @@ public:
     void OnClickConnFailBack(void);\r
     void OnClickFailBack(void);\r
     void SetTitleSetText(const char *text);\r
+    void SetMusicSourceSetText(const char *text);\r
+    void SetPhoneMusicConnectStatusSetText(const char *text);\r
+    void SetPhoneMusicConnectStatusLabelIsVisible(bool status);\r
+    void SetMusicListButtonIsVisible(bool status);\r
     void SetPlaybackProgress(int64_t value);\r
     void SetPlayerState(bool value);\r
     void PlayerbackReset(void);\r
index 314fb2c..14583b1 100755 (executable)
@@ -47,6 +47,12 @@ public:
     void ShowUpListView(void);\r
     void TitleSetText(const char *text);\r
     void PlayerModelButtonSetSrc(uint32_t playMode);\r
+    void CreateMusicSourceLabel(void);\r
+    void MusicSourceLabelSetText(const char *text);\r
+    void CreatePhoneMusicConnectStatusLabel(void);\r
+    void PhoneMusicConnectStatusLabelSetText(const char *text);\r
+    void PhoneMusicConnectStatusLabelIsSetVisible(bool status);\r
+    void MusicListButtonIsSetVisible(bool status);\r
     int16_t GetVolumeRank(void);\r
     void SetVolumeRank(int16_t value);\r
     void SetVolumeAddOne(void);\r
@@ -55,7 +61,10 @@ public:
     UIButton *GetOptionsButton(void);\r
     UIButton *GetPreButton(void);\r
     UIButton *GetNextButton(void);\r
+    UIButton *GetMusicListButton(void);\r
     UILabel *GetTitleLabel(void);\r
+    UILabel *GetMusicSourceLabel(void);\r
+    UILabel *GetPhoneMusicConnectStatusLabel(void);\r
     UICheckBox *GetPlayerButton(void);\r
     UIImageView *GetSoundButton(void);\r
     UIImageView *GetPlayerModelButton(void);\r
@@ -109,6 +118,8 @@ private:
     UILabel *musicListTitle{nullptr};           //歌单列表名\r
     int16_t volumeSet{0};                       //声音值的大小设置\r
     PlayerListDelSongView *p_PlayerListDelSongView{nullptr};\r
+    UILabel *MusciSourceLabel{nullptr};         //音乐来源标签\r
+    UILabel *PhoneMusicConnectStatusLabel{nullptr};//手机音乐连接状态标签\r
     UIScrollView *DelSongView{nullptr};\r
     UIList *list{nullptr};\r
     JumpView *jumpView{nullptr};\r
index d03e9e4..abd6427 100755 (executable)
@@ -125,14 +125,37 @@ public:
         UNUSED(event);\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BluetoothOnClickListener OnClick");\r
         BluetoothView *bluetoothView = BluetoothView::GetInstance();\r
+        PlayersPresenter *playersPresenter = PlayersPresenter::GetInstance();\r
         if (bluetoothView == nullptr) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bluetoothView is nullptr");\r
             return false;\r
         }\r
         if (view_ == (UIView *)bluetoothView->GetWatchButton()) {\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "watchButton OnClick");//手表音乐\r
+            playersPresenter->SetPhoneMusicConnectStatusLabelIsVisible(false);\r
+            playersPresenter->SetMusicListButtonIsVisible(true);\r
+            playersPresenter->SetMusicSourceSetText("本地音乐");\r
         } else if (view_ == (UIView *)bluetoothView->GetPhoneButton()) {\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "phoneButton OnClick");//手机音乐\r
+            playersPresenter->SetPhoneMusicConnectStatusLabelIsVisible(true);\r
+            playersPresenter->SetMusicListButtonIsVisible(false);\r
+            /* -------------------------------------------------------------------------- */\r
+            // 以后会用\r
+            // std::string phonemusic_connect_status_text = "";\r
+            // if(获取连接状态。。。)\r
+            // {\r
+            //     获取成功。。。\r
+            //     phonemusic_connect_status_text = "已连接";\r
+            // }\r
+            // else\r
+            // {\r
+            //     获取失败。。。\r
+            //     phonemusic_connect_status_text = "未连接";\r
+            // }\r
+            // playersPresenter->SetPhoneMusicConnectStatusSetText(phonemusic_connect_status_text.c_str());\r
+            /* -------------------------------------------------------------------------- */\r
+            playersPresenter->SetPhoneMusicConnectStatusSetText("未连接");\r
+            playersPresenter->SetMusicSourceSetText("手机音乐");//还有小bug,切换到其他界面时标签内容为“手机音乐”,会被还原成本地音乐\r
         } else if (view_ == (UIView *)bluetoothView->GetSettingButton()) {\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "settingButton OnClick");\r
             JumpView *jumpView = JumpView::GetInstance();\r
@@ -257,7 +280,7 @@ int BluetoothView::LoadLabel(void)
             return BLUETOOTH_ERROR;\r
         }\r
     }\r
-    phoneLabel->SetPosition(STEP_LABEL_X, STEP_LABEL_Y2, TEXT_WIDTH, TEXT_HEIGHT);\r
+    phoneLabel->SetPosition(STEP_LABEL_X, STEP_LABEL_Y, TEXT_WIDTH, TEXT_HEIGHT);\r
     phoneLabel->SetText("手机音乐");\r
     phoneLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_THIRTY_SIZE);\r
     /* -------------------------------------------------------------------------- */\r
@@ -268,8 +291,8 @@ int BluetoothView::LoadLabel(void)
             return BLUETOOTH_ERROR;\r
         }\r
     }\r
-    watchLabel->SetPosition(STEP_LABEL_X, STEP_LABEL_Y, TEXT_WIDTH, TEXT_HEIGHT);\r
-    watchLabel->SetText("æ\89\8b表音乐");\r
+    watchLabel->SetPosition(STEP_LABEL_X, STEP_LABEL_Y2, TEXT_WIDTH, TEXT_HEIGHT);\r
+    watchLabel->SetText("æ\9c¬å\9c°音乐");\r
     watchLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_THIRTY_SIZE);\r
     /* -------------------------------------------------------------------------- */\r
     if (bluetoothLabel == nullptr) {\r
@@ -320,6 +343,7 @@ int BluetoothView::LoadRadioButton(void)
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "listener2 new fail");\r
         return BLUETOOTH_ERROR;\r
     }\r
+    watchButton->SetState(UICheckBox::SELECTED);\r
     watchButton->SetPosition(BUTTON_X, BUTTON_Y2, WIDTH, HEIGHT);\r
     watchButton->SetImages(PNG_CHECKBOX_ON_IMAGE,PNG_CHECKBOX_OFF_IMAGE);\r
     watchButton->SetOnClickListener(listener2);\r
index 9819038..6940a6d 100755 (executable)
@@ -1358,6 +1358,70 @@ void PlayersPresenter::SetTitleSetText(const char *text)
     playersView->TitleSetText(text);\r
 }\r
 \r
+/// @brief 设置音乐来源标签内容\r
+/// @param text 文本内容\r
+void PlayersPresenter::SetMusicSourceSetText(const char *text)\r
+{\r
+    PlayersView *playersView = PlayersView::GetInstance();\r
+    if (playersView == nullptr) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetMusicSourceSetText playersView GetInstance fail");\r
+        return;\r
+    }\r
+    if (playersView->GetMusicSourceLabel() == nullptr) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetMusicSourceSetText MusciSourceLabel nullptr");\r
+        return;\r
+    }\r
+    playersView->MusicSourceLabelSetText(text);\r
+}\r
+\r
+/// @brief 设置手机音乐连接状态文本内容\r
+/// @param text 文本内容\r
+void PlayersPresenter::SetPhoneMusicConnectStatusSetText(const char *text)\r
+{\r
+    PlayersView *playersView = PlayersView::GetInstance();\r
+    if (playersView == nullptr) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetPhoneMusicConnectStatusSetText playersView GetInstance fail");\r
+        return;\r
+    }\r
+    if (playersView->GetPhoneMusicConnectStatusLabel() == nullptr) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetPhoneMusicConnectStatusSetText PhoneMusicConnectStatusLabel nullptr");\r
+        return;\r
+    }\r
+    playersView->PhoneMusicConnectStatusLabelSetText(text);\r
+}\r
+\r
+/// @brief 设置手机音乐连接状态标签是否可见\r
+/// @param status true 可见 false 阴藏\r
+void PlayersPresenter::SetPhoneMusicConnectStatusLabelIsVisible(bool status)\r
+{\r
+    PlayersView *playersView = PlayersView::GetInstance();\r
+    if (playersView == nullptr) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetPhoneMusicConnectStatusLabelIsVisible playersView GetInstance fail");\r
+        return;\r
+    }\r
+    if (playersView->GetPhoneMusicConnectStatusLabel() == nullptr) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetPhoneMusicConnectStatusLabelIsVisible PhoneMusicConnectStatusLabel nullptr");\r
+        return;\r
+    }\r
+    playersView->PhoneMusicConnectStatusLabelIsSetVisible(status);\r
+}\r
+\r
+/// @brief 设置音乐列表按钮是否可见\r
+/// @param status true 可见 false 阴藏\r
+void PlayersPresenter::SetMusicListButtonIsVisible(bool status)\r
+{\r
+    PlayersView *playersView = PlayersView::GetInstance();\r
+    if (playersView == nullptr) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetMusicListButtonIsVisible playersView GetInstance fail");\r
+        return;\r
+    }\r
+    if (playersView->GetMusicListButton() == nullptr) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SetMusicListButtonIsVisible music_list_button nullptr");\r
+        return;\r
+    }\r
+    playersView->MusicListButtonIsSetVisible(status);\r
+}\r
+\r
 void PlayersPresenter::SetPlaybackProgress(int64_t value)\r
 {\r
     PlayersView *playersView = PlayersView::GetInstance();\r
index dd0f386..7f49600 100755 (executable)
@@ -59,6 +59,18 @@ PlayersView::~PlayersView()
         delete backGround;\r
         delete titleLabel;\r
         delete subTitleLabel;\r
+        delete MusciSourceLabel;\r
+        MusciSourceLabel = nullptr;\r
+        if(music_list_button != nullptr)\r
+        {\r
+            delete music_list_button;\r
+            music_list_button = nullptr;\r
+        }\r
+        if(PhoneMusicConnectStatusLabel != nullptr)\r
+        {\r
+            delete PhoneMusicConnectStatusLabel;\r
+            PhoneMusicConnectStatusLabel = nullptr;\r
+        }\r
         backGround = nullptr;\r
         titleLabel = nullptr;\r
         subTitleLabel = nullptr;\r
@@ -124,11 +136,29 @@ UIButton *PlayersView::GetNextButton(void)
     return nextButton;\r
 }\r
 \r
+//获取音乐列表按钮\r
+UIButton *PlayersView::GetMusicListButton(void)\r
+{\r
+    return music_list_button;\r
+}\r
+\r
 UILabel *PlayersView::GetTitleLabel(void)\r
 {\r
     return titleLabel;\r
 }\r
 \r
+//获取音乐来源标签\r
+UILabel *PlayersView::GetMusicSourceLabel(void)\r
+{\r
+    return MusciSourceLabel;\r
+}\r
+\r
+//获手机音乐连接状态标签\r
+UILabel *PlayersView::GetPhoneMusicConnectStatusLabel(void)\r
+{\r
+    return PhoneMusicConnectStatusLabel;\r
+}\r
+\r
 UICheckBox *PlayersView::GetPlayerButton(void)\r
 {\r
     return playerButton;\r
@@ -677,6 +707,80 @@ bool PlayersView::OnDragEvent(const DragEvent& event)
     return false;\r
 }\r
 \r
+/// @brief 创建音乐来源标签\r
+/// @param  \r
+void PlayersView::CreateMusicSourceLabel(void)\r
+{\r
+    if (MusciSourceLabel == nullptr) {\r
+        MusciSourceLabel = new UILabel();\r
+        if (MusciSourceLabel == nullptr) {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusciSourceLabel new fail");\r
+            return;\r
+        }\r
+    }\r
+    MusciSourceLabel->SetPosition(163, 90, 140, 41);\r
+    MusciSourceLabel->SetText("本地音乐");\r
+    MusciSourceLabel->SetStyle(STYLE_TEXT_FONT, 35);\r
+    MusciSourceLabel->SetStyle(STYLE_LINE_HEIGHT, 41);\r
+    MusciSourceLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
+    MusciSourceLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+    MusciSourceLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 35);\r
+    Add(MusciSourceLabel);\r
+}\r
+\r
+/// @brief 设置音乐来源标签内容\r
+/// @param text 文本内容\r
+void PlayersView::MusicSourceLabelSetText(const char *text)\r
+{\r
+   MusciSourceLabel->SetText(text);\r
+   MusciSourceLabel->Invalidate();\r
+}\r
+\r
+/// @brief 创建手机音乐连接状态标签\r
+/// @param  \r
+void PlayersView::CreatePhoneMusicConnectStatusLabel(void)\r
+{\r
+    if (PhoneMusicConnectStatusLabel == nullptr) {\r
+        PhoneMusicConnectStatusLabel = new UILabel();\r
+        if (PhoneMusicConnectStatusLabel == nullptr) {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PhoneMusicConnectStatusLabel new fail");\r
+            return;\r
+        }\r
+    }\r
+    PhoneMusicConnectStatusLabel->SetPosition(188, 40, 90, 35);\r
+    PhoneMusicConnectStatusLabel->SetText("未连接");\r
+    PhoneMusicConnectStatusLabel->SetTextColor(Color::GetColorFromRGBA(0xff, 0x5a, 0x36, 0xff));\r
+    PhoneMusicConnectStatusLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
+    PhoneMusicConnectStatusLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
+    PhoneMusicConnectStatusLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
+    PhoneMusicConnectStatusLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+    PhoneMusicConnectStatusLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+    PhoneMusicConnectStatusLabel->SetVisible(false);\r
+    Add(PhoneMusicConnectStatusLabel);\r
+}\r
+\r
+/// @brief 设置手机音乐连接状态标签内容\r
+/// @param text 文本内容\r
+void PlayersView::PhoneMusicConnectStatusLabelSetText(const char *text)\r
+{\r
+    PhoneMusicConnectStatusLabel->SetText(text);\r
+    PhoneMusicConnectStatusLabel->Invalidate();\r
+}\r
+\r
+/// @brief 设置手机连接状态标签是否可见\r
+/// @param status \r
+void PlayersView::PhoneMusicConnectStatusLabelIsSetVisible(bool status)\r
+{\r
+    PhoneMusicConnectStatusLabel->SetVisible(status);\r
+}\r
+\r
+/// @brief 设置音乐列表按钮是否可见\r
+/// @param status \r
+void PlayersView::MusicListButtonIsSetVisible(bool status)\r
+{\r
+    music_list_button->SetVisible(status);\r
+}\r
+\r
 //初始化音乐播放器主视图\r
 bool PlayersView::InitView(void)\r
 {\r
@@ -688,6 +792,8 @@ bool PlayersView::InitView(void)
     }\r
 \r
     //CreatePlayerMusicName();\r
+    CreatePhoneMusicConnectStatusLabel();\r
+    CreateMusicSourceLabel();\r
     // changeView\r
     CreateJumpView();\r
     // OnClick\r