蓝牙耳机界面中“蓝牙耳机设备未找到视图”优化修改。

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsFailMessageView.h b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsFailMessageView.h
index b99dba6..000cc6b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsFailMessageView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsFailMessageView.h
@@ -1,31 +1,42 @@
 /*\r
- * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.\r
- * Description: TipsFailMessageView view\r
- * Author:\r
- * Create: 2021-10-13\r
+ * @Author: luozheng 1732036298@qq.com\r
+ * @Date: 2024-08-05 15:20:01\r
+ * @LastEditors: luozheng 1732036298@qq.com\r
+ * @LastEditTime: 2024-08-14 17:36:25\r
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/bluetooth/include/TipsFailMessageView.h\r
  */\r
+\r
 #ifndef TIPS_FAIL_MESSAGE_VIEW_H\r
 #define TIPS_FAIL_MESSAGE_VIEW_H\r
 \r
 #include "components/ui_view_group.h"\r
 #include "components/ui_label.h"\r
 #include "components/ui_label_ext.h"\r
-#include "components/ui_label_button.h"\r
+#include "components/ui_label_button_ext.h"\r
 #include "components/ui_image_view.h"\r
 \r
-namespace OHOS {\r
-class TipsFailMessageView {\r
-public:\r
-    TipsFailMessageView();\r
-    ~TipsFailMessageView();\r
-    static TipsFailMessageView *GetInstance();\r
-    UIViewGroup *ShowUpViewInit(void);\r
-private:\r
-    int ShowUpButtonBack(void);\r
-    UILabel *titleLabel{nullptr};\r
-    UILabelButton *backButton{nullptr};\r
-    UIImageView *tipImg{nullptr};\r
-    UIViewGroup *group{nullptr};\r
-};\r
+namespace OHOS\r
+{\r
+    /*蓝牙设备搜索不到视图*/\r
+    class TipsFailMessageView\r
+    {\r
+    public:\r
+        TipsFailMessageView();\r
+        ~TipsFailMessageView();\r
+        static TipsFailMessageView *GetInstance();\r
+        UIViewGroup *CreateTipsFailMessageView(void);\r
+\r
+    private:\r
+        bool CreateTipsFailMessageLabelView(void);\r
+        bool CreateTipsFailMessageLabelButton(void);\r
+        bool CreateTipsFailMessageImageView(void);\r
+\r
+        int ShowUpButtonBack(void);\r
+        UIViewGroup *group{nullptr};\r
+        UILabelExt *titleLabel{nullptr};             /*标题：蓝牙耳机 */\r
+        UIImageView *btIconImage{nullptr};           /*灰色的蓝牙图标*/\r
+        UILabelExt *btHeadsetNotFoundLabel{nullptr}; /*当前搜索不到耳机蓝牙设备*/\r
+        UILabelButtonExt *rescanButton{nullptr};     /*重新搜索按钮*/\r
+    };\r
 } // namespace OHOS\r
 #endif // TIPS_FAIL_MESSAGE_VIEW_H
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/MainBluetoothView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/MainBluetoothView.cpp
index 3c6aa8c..3c641a1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/MainBluetoothView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/MainBluetoothView.cpp
@@ -155,7 +155,7 @@ bool MainBluetoothView::ChangeTipsFailMessageView(int16_t hideView, int16_t this
             return false;\r
         }\r
         // init view\r
-        UIViewGroup *group = tipsFailMessageView->ShowUpViewInit();\r
+        UIViewGroup *group = tipsFailMessageView->CreateTipsFailMessageView();\r
         if (group == nullptr) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "group nullptr fail");\r
             return false;\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsFailMessageView.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsFailMessageView.cpp
index 4d732b8..56222c9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsFailMessageView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/TipsFailMessageView.cpp
@@ -8,120 +8,205 @@
 #include "BluetoothModel.h"\r
 #include "wearable_log.h"\r
 #include "UiConfig.h"\r
-#include "PlayersPresenter.h"\r
-#include "BluetoothPresenter.h"\r
+#include "player/include/PlayersPresenter.h"\r
+#include "player/include/PlayersView.h"\r
+#include "bluetooth/include/BluetoothPresenter.h"\r
+#include "ui_resource_string.h"\r
+#include "ui_resource_image.h"\r
 \r
-namespace OHOS {\r
-static TipsFailMessageView *g_pFailMessageView{nullptr};\r
-TipsFailMessageView::TipsFailMessageView()\r
+namespace OHOS\r
 {\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TipsFailMessageView::TipsFailMessageView");\r
-    g_pFailMessageView = this;\r
-}\r
+    static TipsFailMessageView *g_pFailMessageView{nullptr};\r
+    TipsFailMessageView::TipsFailMessageView()\r
+    {\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TipsFailMessageView::TipsFailMessageView");\r
+        g_pFailMessageView = this;\r
+    }\r
 \r
-TipsFailMessageView::~TipsFailMessageView()\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TipsFailMessageView::~TipsFailMessageView");\r
-    group->RemoveAll();\r
-    delete titleLabel;\r
-    titleLabel = nullptr;\r
-    delete backButton;\r
-    backButton = nullptr;\r
-    delete group;\r
-    group = nullptr;\r
-    delete tipImg;\r
-    tipImg = nullptr;\r
-    g_pFailMessageView = nullptr;\r
-}\r
+    TipsFailMessageView::~TipsFailMessageView()\r
+    {\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TipsFailMessageView::~TipsFailMessageView");\r
+        if (group != nullptr)\r
+        {\r
+            group->RemoveAll();\r
+            if (titleLabel)\r
+            {\r
+                delete titleLabel;\r
+                titleLabel = nullptr;\r
+            }\r
+            if (btIconImage)\r
+            {\r
+                delete btIconImage;\r
+                btIconImage = nullptr;\r
+                ImageCacheManager::GetInstance().UnloadOneInMultiRes(PLAYER_BLUETOOTH_GRAY, PLAYER_IAMGES);\r
+            }\r
+            if (btHeadsetNotFoundLabel)\r
+            {\r
+                delete btHeadsetNotFoundLabel;\r
+                btHeadsetNotFoundLabel = nullptr;\r
+            }\r
+            if (rescanButton)\r
+            {\r
+                delete rescanButton;\r
+                rescanButton = nullptr;\r
+            }\r
+            delete group;\r
+            group = nullptr;\r
+        }\r
+        g_pFailMessageView = nullptr;\r
+    }\r
 \r
-TipsFailMessageView *TipsFailMessageView::GetInstance()\r
-{\r
-    return g_pFailMessageView;\r
-}\r
+    TipsFailMessageView *TipsFailMessageView::GetInstance()\r
+    {\r
+        return g_pFailMessageView;\r
+    }\r
 \r
-int TipsFailMessageView::ShowUpButtonBack()\r
-{\r
-    if (backButton == nullptr) {\r
-        backButton = new UILabelButton();\r
-        if (backButton == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TipsFailMessageView backButton new fail");\r
-            return OHOS_FAILURE;\r
+    bool TipsFailMessageView::CreateTipsFailMessageLabelView(void)\r
+    {\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TipsFailMessageView::CreateTipsFailMessageLabelView");\r
+        /* ------------------------------- titleLabel ------------------------------- */\r
+        if (titleLabel == nullptr)\r
+        {\r
+            titleLabel = new UILabelExt();\r
+            if (titleLabel == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "titleLabel new fail");\r
+                return false;\r
+            }\r
         }\r
-        UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::PlayersPresenter::GetInstance();\r
-        UIView::OnClickListener *clickListener2 = (UIView::OnClickListener *)OHOS::BluetoothPresenter::GetInstance();\r
-        if ((clickListener == nullptr) && (clickListener2 == nullptr)) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "clickListener GetInstance fail");\r
-            return OHOS_FAILURE;\r
+        titleLabel->SetPosition(83, 50, 300, 35);\r
+        titleLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
+        titleLabel->SetStyle(STYLE_LINE_HEIGHT, 35);\r
+        titleLabel->SetTextId(STR_BLUETOOTH_HEADPHONES); /*蓝牙耳机*/\r
+        titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
+        titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+        titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        /* ------------------------- btHeadsetNotFoundLabel ------------------------- */\r
+        if (btHeadsetNotFoundLabel == nullptr)\r
+        {\r
+            btHeadsetNotFoundLabel = new UILabelExt();\r
+            if (btHeadsetNotFoundLabel == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "titleLabel new fail");\r
+                return false;\r
+            }\r
         }\r
-        backButton->SetPosition(65, 359, 324, 101); // 65:x, 359:y, 324:width 101:height\r
-        backButton->SetText("重试");\r
-        backButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 40); // 40：font data\r
-        backButton->SetImageSrc(PNG_NEW_DEVICE, PNG_NEW_DEVICE);\r
-        backButton->SetViewId(BLUETOOTH_FAIL_BACK_BUTTON);\r
-        if (BluetoothModel::GetInstance()->GetBluetoothCalleridStatus() == CALLERPLAYERS) {\r
-            backButton->SetTextColor(Color::Red());\r
-            backButton->SetOnClickListener(clickListener);\r
-        } else if (BluetoothModel::GetInstance()->GetBluetoothCalleridStatus() == CALLERSETTING) {\r
-            backButton->SetTextColor(Color::Blue());\r
-            backButton->SetOnClickListener(clickListener2);\r
+        btHeadsetNotFoundLabel->SetPosition(53, 305, 360, 30);\r
+        btHeadsetNotFoundLabel->SetStyle(STYLE_TEXT_FONT, 26);\r
+        btHeadsetNotFoundLabel->SetStyle(STYLE_LINE_HEIGHT, 30);\r
+        btHeadsetNotFoundLabel->SetTextId(STR_BT_HEADSET_NOFOND); /*当前搜索不到耳机蓝牙设备*/\r
+        btHeadsetNotFoundLabel->SetTextColor(Color::GetColorFromRGBA(0x99, 0x99, 0x99, 0xff));\r
+        btHeadsetNotFoundLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION);\r
+        btHeadsetNotFoundLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+        btHeadsetNotFoundLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 26);\r
+\r
+        return true;\r
+    }\r
+\r
+    bool TipsFailMessageView::CreateTipsFailMessageImageView(void)\r
+    {\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TipsFailMessageView::CreateTipsFailMessageImageView");\r
+        if (btIconImage == nullptr)\r
+        {\r
+            btIconImage = new UIImageView();\r
+            if (btIconImage == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "group new fail");\r
+                return false;\r
+            }\r
+            btIconImage->SetPosition(163, 126, 140, 140);\r
+            btIconImage->SetAutoEnable(false);\r
+            btIconImage->SetResizeMode(UIImageView::CENTER);\r
+            if (!PlayersView::LoadPlayerImage(btIconImage, PLAYER_BLUETOOTH_GRAY))\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "phoneImage LoadPlayerImage fail");\r
+                return false;\r
+            }\r
         }\r
-        group->Add(backButton);\r
+        return true;\r
     }\r
-    if (tipImg == nullptr) {\r
-        tipImg = new UIImageView();\r
-        if (tipImg == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TipsFailMessageView tipImg new fail");\r
-            return OHOS_FAILURE;\r
+\r
+    bool TipsFailMessageView::CreateTipsFailMessageLabelButton()\r
+    {\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TipsFailMessageView::CreateTipsFailMessageLabelButton");\r
+        if (rescanButton == nullptr)\r
+        {\r
+            rescanButton = new UILabelButtonExt();\r
+            if (rescanButton == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TipsFailMessageView rescanButton new fail");\r
+                return false;\r
+            }\r
+            UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::PlayersPresenter::GetInstance();\r
+            UIView::OnClickListener *clickListener2 = (UIView::OnClickListener *)OHOS::BluetoothPresenter::GetInstance();\r
+            if ((clickListener == nullptr) && (clickListener2 == nullptr))\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "clickListener GetInstance fail");\r
+                return false;\r
+            }\r
+            rescanButton->SetPosition(73, 350, 320, 100);\r
+            rescanButton->SetTextId(STR_BT_HEADSET_RESCAN); /*重新搜索*/\r
+            rescanButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffffffff);\r
+            rescanButton->SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
+            rescanButton->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+            rescanButton->SetViewId(BLUETOOTH_FAIL_BACK_BUTTON);\r
+            rescanButton->SetTextColor(Color::GetColorFromRGBA(0x35, 0x49, 0xff, 0xff));\r
+            rescanButton->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);\r
+            if (BluetoothModel::GetInstance()->GetBluetoothCalleridStatus() == CALLERPLAYERS)\r
+            {\r
+                rescanButton->SetOnClickListener(clickListener);\r
+            }\r
+            else if (BluetoothModel::GetInstance()->GetBluetoothCalleridStatus() == CALLERSETTING)\r
+            {\r
+                rescanButton->SetOnClickListener(clickListener2);\r
+            }\r
         }\r
-        tipImg->SetPosition(181, 111, 90, 90); // 181:x 111:y 90:width 90:height\r
-        tipImg->SetSrc(PNG_GANTAN);\r
-        group->Add(tipImg);\r
+        return true;\r
     }\r
-    return OHOS_SUCCESS;\r
-}\r
 \r
-UIViewGroup *TipsFailMessageView::ShowUpViewInit(void)\r
-{\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TipsFailMessageView::ShowUpViewInit");\r
-    if (group == nullptr) {\r
-        group = new UIViewGroup();\r
-        if (group == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "group new fail");\r
+    UIViewGroup *TipsFailMessageView::CreateTipsFailMessageView(void)\r
+    {\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TipsFailMessageView::CreateTipsFailMessageView");\r
+        if (group == nullptr)\r
+        {\r
+            group = new UIViewGroup();\r
+            if (group == nullptr)\r
+            {\r
+                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "group new fail");\r
+                return nullptr;\r
+            }\r
+            group->SetPosition(0, 0, 466, 466);\r
+        }\r
+        UIView::OnDragListener *tipsDragListener = (UIView::OnDragListener *)OHOS::PlayerOnDragListener::GetInstance();\r
+        UIView::OnDragListener *tipsDragListener2 = (UIView::OnDragListener *)OHOS::BluetoothPresenter::GetInstance();\r
+        if ((tipsDragListener == nullptr) && (tipsDragListener2 == nullptr))\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "tipsDragListener GetInstance fail");\r
             return nullptr;\r
         }\r
-        group->SetPosition(0, 0);\r
-        group->SetWidth(HORIZONTAL_RESOLUTION);\r
-        group->SetHeight(VERTICAL_RESOLUTION);\r
-    }\r
-    if (titleLabel == nullptr) {\r
-        titleLabel = new UILabel();\r
-        if (titleLabel == nullptr) {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TipsFailMessageView titleLabel new fail");\r
+        if (BluetoothModel::GetInstance()->GetBluetoothCalleridStatus() == CALLERPLAYERS)\r
+        {\r
+            group->SetOnDragListener(tipsDragListener);\r
+        }\r
+        else if (BluetoothModel::GetInstance()->GetBluetoothCalleridStatus() == CALLERSETTING)\r
+        {\r
+            group->SetOnDragListener(tipsDragListener2);\r
+        }\r
+        group->SetViewId(TIPS_FAIL_MESSAGE_VIEW);\r
+        group->SetDraggable(true);\r
+        group->SetTouchable(true);\r
+        /* -------------------------------------------------------------------------- */\r
+        if (!CreateTipsFailMessageLabelView() || !CreateTipsFailMessageImageView() || !CreateTipsFailMessageLabelButton())\r
+        {\r
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TipsFailMessageView::CreateTipsFailMessageView fail!!");\r
             return nullptr;\r
         }\r
-        titleLabel->SetPosition(0, 234, HORIZONTAL_RESOLUTION, 45); // 0:x 234:y 454:width 45:height\r
-        titleLabel->SetText("未发现蓝牙耳机");\r
-        titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 40); // 40：font data\r
-        titleLabel->SetStyle(STYLE_BACKGROUND_COLOR, OPA_OPAQUE);\r
-        titleLabel->SetAlign(UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER,\r
-                             UITextLanguageAlignment::TEXT_ALIGNMENT_CENTER);\r
+        /* ----------------------------------- Add ---------------------------------- */\r
         group->Add(titleLabel);\r
+        group->Add(btIconImage);\r
+        group->Add(btHeadsetNotFoundLabel);\r
+        group->Add(rescanButton);\r
+        /* -------------------------------------------------------------------------- */\r
+        return group;\r
     }\r
-    ShowUpButtonBack();\r
-    UIView::OnDragListener *tipsDragListener = (UIView::OnDragListener *)OHOS::PlayerOnDragListener::GetInstance();\r
-    UIView::OnDragListener *tipsDragListener2 = (UIView::OnDragListener *)OHOS::BluetoothPresenter::GetInstance();\r
-    if ((tipsDragListener == nullptr) && (tipsDragListener2 == nullptr)) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "tipsDragListener GetInstance fail");\r
-        return nullptr;\r
-    }\r
-    if (BluetoothModel::GetInstance()->GetBluetoothCalleridStatus() == CALLERPLAYERS) {\r
-        group->SetOnDragListener(tipsDragListener);\r
-    } else if (BluetoothModel::GetInstance()->GetBluetoothCalleridStatus() == CALLERSETTING) {\r
-        group->SetOnDragListener(tipsDragListener2);\r
-    }\r
-    group->SetViewId(TIPS_FAIL_MESSAGE_VIEW);\r
-    group->SetDraggable(true);\r
-    group->SetTouchable(true);\r
-    return group;\r
-}\r
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h
index 28bf93c..d8b5f97 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.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-13 16:11:48\r
+ * @LastEditTime: 2024-08-14 11:26:39\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h\r
  */\r
 \r
@@ -100,6 +100,7 @@ namespace OHOS
 \r
         void UpdatePlayerView(bool musicSourceType, bool phoneMusicConnectStatus);\r
         void UpdateMusicListStatus(void);\r
+        void OnClickBackKeyToMainMusicPlayerView(void);\r
 \r
         VolumeSettingView *GetVolumeSettingView();\r
         PlayerListDelSongView *GetPlayerListDelSongView();\r
@@ -113,6 +114,7 @@ namespace OHOS
         bool ChangeToMusicDeleteView(int16_t thisView);\r
         bool ChangeToMusicBluetoothDisConnectView(int16_t thisView);\r
         bool ChangeToMusicBluetoothConnectFailedView(int16_t thisView);\r
+        bool ChangeToMusicConnectingView(int16_t thisView);\r
 \r
     private:\r
         UIButton *PlayerViewButtonInit(ButtonConfig &buttonconfig);\r

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 b6ddbea..32fbe75 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp
@@ -338,7 +338,7 @@ bool JumpView::ChangeTipsFailMessageView(int16_t hideView, int16_t thisView)
             return false;\r
         }\r
         // init view\r
-        UIViewGroup *group = tipsFailMessageView->ShowUpViewInit();\r
+        UIViewGroup *group = tipsFailMessageView->CreateTipsFailMessageView();\r
         if (group == nullptr) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "group nullptr fail");\r
             return false;\r

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 443ba94..6cde8c3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
@@ -882,6 +882,34 @@ namespace OHOS
         }\r
     }\r
 \r
+    /*点击返回键回到音乐主视图*/\r
+    void PlayersView::OnClickBackKeyToMainMusicPlayerView(void)\r
+    {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::OnClickBackKeyToMainMusicPlayerView");\r
+        int index = 0;\r
+        for (int i = MAIN_MUSICPLAYER_VIEW; i < MUSICPLAYERJUMPVIEWID_MAX; i++)\r
+        {\r
+            if (group[i] != nullptr)\r
+            {\r
+                if (group[index]->IsVisible() == true)\r
+                {\r
+                    index = i;\r
+                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "group[%d] IsVisible ", index);\r
+                    break;\r
+                }\r
+            }\r
+            else\r
+            {\r
+                continue;\r
+            }\r
+        }\r
+        if (index == MAIN_MUSICPLAYER_VIEW) /*如果是音乐主视图是可见的不做ChangeView*/\r
+        {\r
+            return;\r
+        }\r
+        ChangeView(index, MAIN_MUSICPLAYER_VIEW);\r
+    }\r
+\r
     /*刷新播放器界面的组件状态*/\r
     void PlayersView::UpdatePlayerView(bool musicSourceType, bool phoneMusicConnectStatus)\r
     {\r
@@ -1407,4 +1435,28 @@ namespace OHOS
         }\r
         return true;\r
     }\r
+\r
+    /*切换到蓝牙未连接视图*/\r
+    bool PlayersView::ChangeToMusicConnectingView(int16_t thisView)\r
+    {\r
+        //  WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToMusicBluetoothConnectFailedView");\r
+        // if (group[thisView] == nullptr)\r
+        // {\r
+        //     musicPlayerBTConnectFailedView = new MusicPlayerBTConnectFailedView();\r
+        //     if (musicPlayerBTConnectFailedView == nullptr)\r
+        //     {\r
+        //         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "new playerListDelSongView fail");\r
+        //         return false;\r
+        //     }\r
+        //     UIViewGroup *groupview = musicPlayerBTConnectFailedView->CreateMusicPlayerBTConnectFailedView();\r
+        //     if (groupview == nullptr)\r
+        //     {\r
+        //         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "new group[%d] fail", thisView);\r
+        //         return false;\r
+        //     }\r
+        //     group[thisView] = groupview;\r
+        //     Add(group[thisView]);\r
+        // }\r
+        return true;\r
+    }\r
 }\r