Merge #1109 into sdk602patch0626 from refs/changes/1109/head

Code review from 罗正

* refs/changes/1109/head: (4 commits squashed)

  - 修改音乐来源界面，蓝牙耳机连接状态错误显示

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

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

  - 解决恢复出厂设置后进入训练界面右滑退出进入语言界面

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1109

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 2f67c8d..b087205 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp
@@ -512,15 +512,8 @@ namespace OHOS
         if (bluetoothHeadsetConnectState)\r
         {\r
             bool state = SettingModel::GetInstance().GetEarPhoneConnectStatus();\r
-            List<BluetoothCaseInfo> &bluetoothCaseList = BluetoothModel::GetInstance()->GetConnedDevicesCase();\r
-            if (bluetoothCaseList.IsEmpty()) // 如果已连接设备列表为空,则显示未配对\r
-            {\r
-                bluetoothHeadsetConnectState->SetTextId(STR_NOT_PAIRED);\r
-            }\r
-            else // 否则则显示连接状态\r
-            {\r
-                bluetoothHeadsetConnectState->SetTextId(state ? STR_CONNECTED : STR_DISCONNECTED);\r
-            }\r
+            bluetoothHeadsetConnectState->SetTextId(state ? STR_CONNECTED : STR_DISCONNECTED);\r
+            bluetoothHeadsetConnectState->SetTextId(state ? STR_CONNECTED : STR_DISCONNECTED);\r
             bluetoothHeadsetConnectState->SetTextColor(state ? Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff) : Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f));\r
             bluetoothHeadsetConnectState->Invalidate();\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
index ea676e0..1964d68 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-07-18 14:55:27
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-10-03 20:04:53
+ * @LastEditTime: 2024-10-05 15:29:35
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
  */
 
@@ -53,8 +53,8 @@ namespace OHOS
         {
             uapi_set_screen_on_api();
             ConfigModel::GetInstance()->SetisFirstTimeStart(false);
-            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
             NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN);
+            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
         }
     }