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

Code review from 罗正

* refs/changes/1116/head: (10 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

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

  - 屏蔽连接动画界面的title

  - 优化语言列表，解决语言列表最后一项被遮挡住bug

  - 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/1116

diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp
index bba8719..4d1a366 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-08-03 11:10:08
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-09-25 10:42:10
+ * @LastEditTime: 2024-10-05 16:38:12
  * @FilePath: /xts_origin/FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceConnectingView.cpp
  */
 #include "aivoice/include/AiVoiceConnectingView.h"
@@ -389,10 +389,6 @@ namespace OHOS
         }
         else
         {
-            if (title)
-            {
-                scrollView->Add(title);
-            }
             if (connectingAnimatorView)
             {
                 connectingAnimatorView->SetPosition(183, 183);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListitemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListitemView.cpp
index f59ca5d..a8ed4fa 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListitemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListitemView.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-03-28 14:28:03
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-09-27 15:35:26
+ * @LastEditTime: 2024-10-05 17:39:04
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchListitemView.cpp
  */
 #include "languagecode/include/LanguageSwitchListitemView.h"
@@ -39,6 +39,14 @@ namespace OHOS
         m_LabelButtonExt.SetFont(itemInfo.fontname, 30);
         languae_Image.SetSrc(itemInfo.path);
         //m_LabelButtonExt
+        if(strcmp(itemInfo.code,"az") == 0)
+        {
+            SetHeight(160);
+        }
+        else
+        {
+            SetHeight(120);
+        }
     }
 
     void LanguageSwitchListitemView::SetUpChild()

diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp
index 7f47c62..f06d939 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchView.cpp
@@ -176,7 +176,7 @@ namespace OHOS
         LanguageList->SetThrowDrag(true);         // 设置手指抬起屏幕后是否继续滚动。
         LanguageList->SetMaxScrollDistance(1000); // 设置手指抬起屏幕后的最大滚动距离。
         LanguageList->SetSwipeACCLevel(800);      /*设置手指抬起屏幕后的补偿距离。*/
-        LanguageList->SetSelectPosition(346/2);
+        LanguageList->SetSelectPosition(346);
         LanguageList->SetReboundSize(30);
         LanguageList->SetScrollBlankSize(20);
         LanguageList->SetStartIndex(0);

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 b087205..2f67c8d 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,8 +512,15 @@ namespace OHOS
         if (bluetoothHeadsetConnectState)\r
         {\r
             bool state = SettingModel::GetInstance().GetEarPhoneConnectStatus();\r
-            bluetoothHeadsetConnectState->SetTextId(state ? STR_CONNECTED : STR_DISCONNECTED);\r
-            bluetoothHeadsetConnectState->SetTextId(state ? STR_CONNECTED : STR_DISCONNECTED);\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->SetTextColor(state ? Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff) : Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f));\r
             bluetoothHeadsetConnectState->Invalidate();\r
         }\r