Merge #1491 into sdk602patch0911 from refs/changes/1491/head

Code review from 罗正

* refs/changes/1491/head: (5 commits squashed)

  - 将主界面进入applist界面Power键触发由释放事件改为按下事件，1.加快界面进入速度；2,解决手表息屏状态下(主界面)按Power键概率性会进入applist界面（需要多台手表验证）

  - 修复了音乐播放器从本地音乐切到手机音乐后音乐播放按钮显示不正确问题

  - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

  - 解决音乐播放器界面进入音乐来源视图后在切换到音乐的调节音量视图旋转表冠不起作用问题

  - 解决绑定死机问题，待验证

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1491

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index 8390809..ab8b95e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@ -562,6 +562,7 @@ namespace OHOS
             TakephotosModel::GetInstance()->Init(); // 拍照消息订阅
             MessageModel::GetInstance().Init();     // 消息订阅监听
             AssistantModel::GetInstance()->Init();  // 语音助手消息订阅
+            GoalModel::GetInstance().GoalModelInitdata();
 
             // 初始化默认首页
             ScreenModels::GetInstance()->PreLoadAppimages();

diff --git a/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalmodel.cpp b/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalmodel.cpp
index 2d12c49..ed18d13 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalmodel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/goal/src/goalmodel.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-04-08 18:40:09
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-05-10 11:27:16
+ * @LastEditTime: 2024-12-04 16:28:23
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/weather/src/GoalModel.cpp
  */
 #include "goal/include/goalmodel.h"
@@ -18,7 +18,7 @@ namespace OHOS
  
    GoalModel::GoalModel()
    {
-      GoalModelInitdata();
+      // GoalModelInitdata();
       WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GoalModel::GoalModel");
    }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/MusicPlayerSourceView.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/MusicPlayerSourceView.h
index 1f35231..c69af6b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/include/MusicPlayerSourceView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/MusicPlayerSourceView.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-10 16:29:34\r
+ * @LastEditTime: 2024-12-04 14:35:07\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/include/MusicPlayerSourceView.h\r
  */\r
 \r
@@ -53,6 +53,7 @@ namespace OHOS
         UIViewGroup *CreateMusicPlayerSourceView(void);\r
         void UpdateBluetoothHeadSetViewIsVisible(void);\r
         void UpdateBluetoothHeadsetConnectLabel(void);\r
+        UIScrollView *GetMusicPlayerSourcescrollView(void);\r
 \r
     private:\r
         UILabelButton *MusicPlayerSourceViewLabelButtonInit(ButtonConfig &buttonconfig);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp
index 78cdfa0..031cf8f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp
@@ -531,4 +531,9 @@ namespace OHOS
             }\r
         }\r
     }\r
+\r
+    UIScrollView *MusicPlayerSourceView::GetMusicPlayerSourcescrollView(void)\r
+    {\r
+        return scrollView;\r
+    }\r
 }\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 1ed5587..3503e33 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp
@@ -867,7 +867,7 @@ namespace OHOS
         }\r
     }\r
 \r
-    /// @brief 设置音乐播放按钮是否可点击\r
+    /// @brief 设置é\9f³ä¹\90æ\92­æ\94¾æ¨¡å¼\8fæ\8c\89é\92®æ\98¯å\90¦å\8f¯ç\82¹å\87»\r
     /// @param musicSourceType 音乐来源类型 false：手表音乐 true 手机音乐\r
     /// @param phoneMusicConnectStatus 手机音乐连接状态\r
     void PlayersView::SetMusicPlayerButtonIsTouchable(bool musicSourceType)\r
@@ -879,7 +879,17 @@ namespace OHOS
             /* -------------------------------------------------------------------------- */\r
             if (musicSourceType) // 如果切換到手机音乐，且当前在放歌，就停止音乐\r
             {\r
-                bool value = PlayersModel::GetInstance()->get_player_state();\r
+                // bool value = PlayersModel::GetInstance()->get_player_state();\r
+                bool value = false;\r
+                if (PlayersModel::GetInstance()->get_avrcp_ct_or_tg_is_connected() && \r
+                    PlayersModel::GetInstance()->get_a2dp_sink_playing_state()) //若ct或tg端是已连接状态且当前a2dp_sink是已播放状态\r
+                {\r
+                    value = true;\r
+                }\r
+                else\r
+                {\r
+                    value = false;\r
+                }\r
                 SetPlayerButtonState(value ? UICheckBox::UICheckBoxState::SELECTED:UICheckBox::UICheckBoxState::UNSELECTED);\r
                 /*停止音乐*/\r
                 StopCurPlayingMusic();\r
@@ -1398,6 +1408,13 @@ namespace OHOS
             group[thisView] = musicPlayerSourceView->CreateMusicPlayerSourceView();\r
             Add(group[thisView]);\r
         }\r
+        if (musicPlayerSourceView != nullptr )\r
+        {\r
+            if(musicPlayerSourceView->GetMusicPlayerSourcescrollView() != nullptr)\r
+            {\r
+                musicPlayerSourceView->GetMusicPlayerSourcescrollView()->RequestFocus();\r
+            }\r
+        }\r
         return true;\r
     }\r
 \r
@@ -1421,6 +1438,13 @@ namespace OHOS
             group[thisView] = volumeSettingView;\r
             Add(group[thisView]);\r
         }\r
+        if(volumeSettingView)\r
+        {\r
+            if(volumeSettingView->GetProgress())\r
+            {\r
+                volumeSettingView->GetProgress()->RequestFocus();\r
+            }\r
+        }\r
         return true;\r
     }\r
 \r