From 0198b25e9253a7a4287e756b679a3e5c47251712 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E7=BD=97=E6=AD=A3?= <1732036298@qq.com> Date: Sat, 5 Oct 2024 10:26:37 +0000 Subject: [PATCH] Merge #1116 into sdk602patch0626 from refs/changes/1116/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1116 --- .../nativeui/aivoice/src/AiVoiceConnectingView.cpp | 6 +----- .../languagecode/src/LanguageSwitchListitemView.cpp | 10 +++++++++- .../nativeui/languagecode/src/LanguageSwitchView.cpp | 2 +- .../nativeui/player/src/MusicPlayerSourceView.cpp | 11 +++++++++-- 4 files changed, 20 insertions(+), 9 deletions(-) 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 bba87193d..4d1a3666c 100644 --- 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 f59ca5de5..a8ed4faae 100644 --- 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 7f47c625a..f06d93986 100644 --- 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 b08720589..2f67c8d68 100644 --- 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) { bool state = SettingModel::GetInstance().GetEarPhoneConnectStatus(); - bluetoothHeadsetConnectState->SetTextId(state ? STR_CONNECTED : STR_DISCONNECTED); - bluetoothHeadsetConnectState->SetTextId(state ? STR_CONNECTED : STR_DISCONNECTED); + List &bluetoothCaseList = BluetoothModel::GetInstance()->GetConnedDevicesCase(); + if (bluetoothCaseList.IsEmpty()) // 如果已连接设备列表为空,则显示未配对 + { + bluetoothHeadsetConnectState->SetTextId(STR_NOT_PAIRED); + } + else // 否则则显示连接状态 + { + bluetoothHeadsetConnectState->SetTextId(state ? STR_CONNECTED : STR_DISCONNECTED); + } bluetoothHeadsetConnectState->SetTextColor(state ? Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff) : Color::GetColorFromRGBA(0xff, 0xff, 0xff, 0x7f)); bluetoothHeadsetConnectState->Invalidate(); } -- 2.17.1