From: luozheng <1732036298@qq.com> Date: Mon, 12 Aug 2024 11:21:41 +0000 (+0800) Subject: 1.音乐的蓝牙未连接视图添加，多国语言资源添加 X-Git-Tag: release_V1.2.70_20241020_135402~671^2~6 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=7088ae1c93ba67135e61733fb96ca17028245a34;p=mirrors%2FFD230.git 1.音乐的蓝牙未连接视图添加，多国语言资源添加 2.删除"/user/music/"下的音乐，并移动到"/user/userdata/music"目录下 3.音乐Model新增判断音乐路径是否存在函数 4.修复进入音乐删除视图后在音乐播放器界面点击任意一个按钮错误进入音乐删除视图 --- diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt index fd9e95485..f5d2e1fc5 100644 --- a/code/sdk/application/wearable/fd230app/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt @@ -244,6 +244,7 @@ set(SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/main/src/VolumeSettingPresenter.cpp #音乐 ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/player/src/MusicPlayerBTConnectFailedView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/player/src/MusicPlayerSourceView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/player/src/PlayersView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/player/src/PlayersPresenter.cpp diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h index 36407b34f..d609c3fc5 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h @@ -64,7 +64,7 @@ namespace OHOS #define DOUBLES 2 #define APP_RES_PATH "/user/res" -#define APP_MUSIC_PATH "/user/music" +#define APP_MUSIC_PATH "/user/userdata/music" #define APP_VIDEO_PATH "/user/video" #define APP_DEFAULT_DIAL_PATH "/user/dial" /*默认表盘安装路径*/ #define APP_DOWNLOAD_DIAL_PATH "/user/userdata/dial" /*表盘市场安装路径*/ diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h index a501aad31..353e3f2f2 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h @@ -441,80 +441,82 @@ enum UIResourceTextId : uint16_t { STR_CONNECTION_ERROR = 428, STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 429, STR_ENABLE_BLUETOOTH_CALL = 430, - STR_ENABLE_BLUETOOTH_CALL_NOTE_IPHONE = 431, - STR_ENABLE_BLUETOOTH_CALL_NOTE_ANDRODIR = 432, - STR_ENABLE_BLUETOOTH_CALL_NOTE = 433, - STR_SIM_CARD_ERROR = 434, - STR_CHECK_SIM_CARD_INSERTION = 435, - STR_WEATHER_REPORT = 436, - STR_ULTRAVIOLET = 437, - STR_WIND_SPEED = 438, - STR_HUMIDITY = 439, - STR_NEXT_7_DAYS = 440, - STR_GET_WEATHER_ERROR = 441, - STR_MUSIC_SOURCE = 442, - STR_MOBILE_MUSIC = 443, - STR_WATCH_MUSIC = 444, - STR_MUSIC_LIST = 445, - STR_BLUETOOTH_CONNECTION_FAILED = 446, - STR_SCANNING_BINDING = 447, - STR_DEVICE_BINDING = 448, - STR_DEVICE_BINDING_NOTE = 449, - STR_EQUIPMENT_UNTYING = 450, - STR_EQUIPMENT_UNTYING_NOTE = 451, - STR_DRINK_WATER_REMINDER = 452, - STR_DRINK_WATER_REMINDER_NOTE = 453, - STR_SEDENTARY_REMINDER = 454, - STR_SEDENTARY_REMINDER_NOTE = 455, - STR_SYSTEM_UPGRADING = 456, - STR_NEWDEVICE_BIND_REMIND_NOTE = 457, - STR_AI_VOICE = 458, - STR_AI_INTELLIGENT_ASSISTANT = 459, - STR_START_CHAT = 460, - STR_BOOT_FAILED = 461, - STR_ENABLE_MOBILE_DATA_FIRST = 462, - STR_ENABLE_BLUETOOTH_FIRST = 463, - STR_LISTENING = 464, - STR_FINISH_SPEAKING = 465, - STR_THINKING = 466, - STR_CANCEL = 467, - STR_CONNECT_TIMEOUT = 468, - STR_PLEASE_RESTART_CHAT = 469, - STR_CONTINUE_CHAT = 470, - STR_AIMODELS_DOUBAO = 471, - STR_AIMODES_WENXINYIYAN = 472, - STR_AIMODES_KIMI = 473, - STR_AIMODES_CHATGPT = 474, - STR_SLIDE_TO_SHUTDOWN = 475, - STR_SLIDE_TO_REBOOT = 476, - STR_AI_FAMILY_MEALS = 477, - STR_CHAT = 478, - STR_PCY4GC_OR_AS = 479, - STR_API_KEYS = 480, - STR_PGTTAF = 481, - STR_DAFBS = 482, - STR_OPENAI_API_KEYS = 483, - STR_KHBB = 484, - STR_GTAS = 485, - STR_DYWTDAK = 486, - STR_CONNECTING = 487, - STR_CONNECTION_FAIL = 488, - STR_PTALORTM = 489, - STR_MOTION_DETECTION_NOTE = 490, - STR_PE4GC = 491, - STR_OBU_MESSAGE = 492, - STR_DELETE = 493, - STR_CHARGE = 494, - STR_CHARGE_NOTE = 495, - STR_STEP_FREQUENCY = 496, - STR_STEP_LENGTH = 497, - STR_AVG_PACE = 498, - STR_TONGYI_QIANWEN = 499, - STR_IFLYTEK_SPARK = 500, - STR_DISTURBNOTE_OFF = 501, - STR_4G_NOTE = 502, - STR_MUSIC_PLAYER_SOURCE_NOTE = 503, - STR_MAX_ID = 504, + STR_SOLUTION = 431, + STR_IPHONE = 432, + STR_ANDROID = 433, + STR_ENABLE_BLUETOOTH_CALL_NOTE_IPHONE = 434, + STR_ENABLE_BLUETOOTH_CALL_NOTE_ANDROID = 435, + STR_SIM_CARD_ERROR = 436, + STR_CHECK_SIM_CARD_INSERTION = 437, + STR_WEATHER_REPORT = 438, + STR_ULTRAVIOLET = 439, + STR_WIND_SPEED = 440, + STR_HUMIDITY = 441, + STR_NEXT_7_DAYS = 442, + STR_GET_WEATHER_ERROR = 443, + STR_MUSIC_SOURCE = 444, + STR_MOBILE_MUSIC = 445, + STR_WATCH_MUSIC = 446, + STR_MUSIC_LIST = 447, + STR_BLUETOOTH_CONNECTION_FAILED = 448, + STR_SCANNING_BINDING = 449, + STR_DEVICE_BINDING = 450, + STR_DEVICE_BINDING_NOTE = 451, + STR_EQUIPMENT_UNTYING = 452, + STR_EQUIPMENT_UNTYING_NOTE = 453, + STR_DRINK_WATER_REMINDER = 454, + STR_DRINK_WATER_REMINDER_NOTE = 455, + STR_SEDENTARY_REMINDER = 456, + STR_SEDENTARY_REMINDER_NOTE = 457, + STR_SYSTEM_UPGRADING = 458, + STR_NEWDEVICE_BIND_REMIND_NOTE = 459, + STR_AI_VOICE = 460, + STR_AI_INTELLIGENT_ASSISTANT = 461, + STR_START_CHAT = 462, + STR_BOOT_FAILED = 463, + STR_ENABLE_MOBILE_DATA_FIRST = 464, + STR_ENABLE_BLUETOOTH_FIRST = 465, + STR_LISTENING = 466, + STR_FINISH_SPEAKING = 467, + STR_THINKING = 468, + STR_CANCEL = 469, + STR_CONNECT_TIMEOUT = 470, + STR_PLEASE_RESTART_CHAT = 471, + STR_CONTINUE_CHAT = 472, + STR_AIMODELS_DOUBAO = 473, + STR_AIMODES_WENXINYIYAN = 474, + STR_AIMODES_KIMI = 475, + STR_AIMODES_CHATGPT = 476, + STR_SLIDE_TO_SHUTDOWN = 477, + STR_SLIDE_TO_REBOOT = 478, + STR_AI_FAMILY_MEALS = 479, + STR_CHAT = 480, + STR_PCY4GC_OR_AS = 481, + STR_API_KEYS = 482, + STR_PGTTAF = 483, + STR_DAFBS = 484, + STR_OPENAI_API_KEYS = 485, + STR_KHBB = 486, + STR_GTAS = 487, + STR_DYWTDAK = 488, + STR_CONNECTING = 489, + STR_CONNECTION_FAIL = 490, + STR_PTALORTM = 491, + STR_MOTION_DETECTION_NOTE = 492, + STR_PE4GC = 493, + STR_OBU_MESSAGE = 494, + STR_DELETE = 495, + STR_CHARGE = 496, + STR_CHARGE_NOTE = 497, + STR_STEP_FREQUENCY = 498, + STR_STEP_LENGTH = 499, + STR_AVG_PACE = 500, + STR_TONGYI_QIANWEN = 501, + STR_IFLYTEK_SPARK = 502, + STR_DISTURBNOTE_OFF = 503, + STR_4G_NOTE = 504, + STR_MUSIC_PLAYER_SOURCE_NOTE = 505, + STR_MAX_ID = 506, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/MusicPlayerBTConnectFailedView.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/MusicPlayerBTConnectFailedView.h new file mode 100644 index 000000000..9615c6d42 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/MusicPlayerBTConnectFailedView.h @@ -0,0 +1,42 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-08-12 11:31:35 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-08-12 17:08:31 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/include/MusicPlayerBTConnectFailedView.cpp + */ +#ifndef MUSIC_PLAYER_BTCONNECTFAILED_VIEW_H +#define MUSIC_PLAYER_BTCONNECTFAILED_VIEW_H +#include "components/ui_label_ext.h" +#include "components/ui_view_group.h" +#include "components/ui_scroll_view.h" +#include "components/ui_button.h" +namespace OHOS +{ + class MusicPlayerBTConnectFailedView : public UIView::OnClickListener + { + public: + MusicPlayerBTConnectFailedView(); + ~MusicPlayerBTConnectFailedView(); + UIViewGroup *CreateMusicPlayerBTConnectFailedView(void); + bool OnClick(UIView &view, const ClickEvent &event) override; + + private: + bool CreateMusicPlayerBTConnectFailedViewLabel(); + bool CreateMusicPlayerBTConnectFailedViewButton(); + void ClearAll(); + UIViewGroup *group{nullptr}; + UIScrollView *scrollView{nullptr}; + UILabelExt *titleLabel{nullptr}; // 标题 + UILabelExt *IPoneLabel{nullptr}; + UILabelExt *AndroidLabel{nullptr}; + UILabelExt *BTNoteLabel1{nullptr}; + UILabelExt *BTNoteLabel2{nullptr}; + UILabelExt *BTNoteLabel3{nullptr}; + UILabelExt *CloseLabel{nullptr}; + UIButton *CloseButton{nullptr}; + UIView::OnDragListener *dragListener{nullptr}; + }; + +} +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayerListDelSongView.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayerListDelSongView.h index 2108562cf..e01aa52f5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayerListDelSongView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayerListDelSongView.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-08-05 15:20:03 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-09 18:23:38 + * @LastEditTime: 2024-08-12 18:24:31 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayerListDelSongView.h */ @@ -44,7 +44,7 @@ namespace OHOS virtual ~PlayerListDelSongView(); static PlayerListDelSongView *GetInstance(void); UIViewGroup *CreatePlayerListDelSongView(); - void SetTheSongLabelStyle(const char *songName); + void SetTheDelSongLabelStyle(const char *songName); void DeleteSongNameFile(void); UIButton *GetEnsureDeleteButton(void); UIButton *GetCancelDeleteButton(void); diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModel.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModel.h index ed11ebf21..060ed8053 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModel.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-08-05 15:20:03 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-09 18:31:29 + * @LastEditTime: 2024-08-12 17:59:14 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersModel.h */ @@ -95,6 +95,7 @@ public: void ClearActivateAudioInterrupt(void); void GetDuration(int64_t &duration); public: + bool CreateMusicPlayDirectory(const char* path = APP_MUSIC_PATH); std::string GetMusicPlayPath(void); bool GetMusicSource(); void SetMusicSource(bool value); diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersPresenter.h index 9e1a75c68..a9e449afa 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersPresenter.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-08-05 15:20:03 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-10 17:54:49 + * @LastEditTime: 2024-08-12 14:54:57 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersPresenter.h */ @@ -56,7 +56,8 @@ class VolumeSettingView; #define MUSIC_PLAYER_LIST_VIEW "MusicPlayerListView" //音乐列表的滑动监听 #define MUSIC_PLAYER_DELETE_VIEW "MusicPlayerDeleteView" //音乐删除视图的滑动监听 #define MUSIC_PLAYER_DELETE_VIEW "MusicPlayerDeleteView" //音乐删除视图的滑动监听 -#define MUISC_PLAYER_BLUETOOTH_DISCONN_VIEW "MusicPlayerBluetoothDisConView" +#define MUISC_PLAYER_BLUETOOTH_DISCONN_VIEW "MusicPlayerBluetoothDisConView" //蓝牙未连接视图的滑动监听 +#define MUISC_PLAYER_BLUETOOTH_CONNECTFAILED_VIEW "MusicPlayerBluetoothConncetFailedView" //蓝牙连接失败视图的滑动监听 #define TIPS_SUCC_MESSAGE_VIEW "TipsSuccMessageView" #define TIPS_FAIL_MESSAGE_VIEW "TipsFailMessageView" #define TIPS_CONN_FAIL_MESSAGE_VIEW "TipsConnFailMessageView" @@ -167,6 +168,8 @@ private: void OnDragChangMusicPlayerSourceView(const DragEvent& event); void OnDragChangMusicPlayerListView(const DragEvent& event); void OnDragChangMusicPlayerDeleteView(const DragEvent& event); + void OnDragChangMusicPlayerBTDisConnectView(const DragEvent& event); + void OnDragChangMusicPlayerBTConnectFailedView(const DragEvent& event); void DropEarPhoneView(const DragEvent& event); void DropEarListView(const DragEvent& event); void CorrespondingJump(const DragEvent& event, int16_t hideView); 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 d2c4c4023..feb3f0949 100644 --- 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 * @Date: 2024-08-05 15:20:03 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-10 18:09:09 + * @LastEditTime: 2024-08-12 14:57:23 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h */ @@ -33,6 +33,7 @@ #include "VolumeSettingView.h" #include "player/include/MusicPlayerSourceView.h" #include "player/include/MusicPlayerBluetoothDisConView.h" +#include "player/include/MusicPlayerBTConnectFailedView.h" namespace OHOS { #define PLAY_PROGRESS_MIN 0 @@ -60,6 +61,7 @@ namespace OHOS MUSIC_LIST_VIEW, // 音乐列表视图 MUSIC_DELETE_VIEW, // 音乐删除视图 MUSIC_BLUETOOTH_DISCONN_VIEW, // 音乐蓝牙未连接视图 + MUSIC_BT_CONNECTFAILED_VIEW, // 音乐蓝牙连接失败视图 MUISC_CONNECTING, // 连接动画视图 MUISC_BLUETOOTH_HEADSET_LIST_VIEW, // 蓝牙耳机列表视图 MUSIC_CONNECTED_BLUETOOTH_HEADSET_VIEW, // 已连接的蓝牙耳机设备视图 @@ -109,6 +111,7 @@ namespace OHOS bool ChangeToMusicListView(int16_t thisView); bool ChangeToMusicDeleteView(int16_t thisView); bool ChangeToMusicBluetoothDisConnectView(int16_t thisView); + bool ChangeToMusicBluetoothConnectFailedView(int16_t thisView); private: UIButton *PlayerViewButtonInit(ButtonConfig &buttonconfig); @@ -137,7 +140,7 @@ namespace OHOS void PhoneMusicConnectStatusLabelIsSetVisible(bool status); void PhoneMusicConnectStatusLabelColor(bool state); void OptionsButtonSetImageStyle(ImageInfo *image); - void SetMusicPlayerButtonIsTouchable(bool musicSourceType, bool phoneMusicConnectStatus); + void SetMusicPlayerButtonIsTouchable(bool musicSourceType); private: VolumeSettingView *volumeSettingView{nullptr}; // 声音设置 @@ -145,6 +148,7 @@ namespace OHOS PlayerListDelSongView *playerListDelSongView{nullptr}; // 音乐删除视图 UIViewGroup *musicListGroupView{nullptr}; // 音乐列表视图 MusicPlayerBluetoothDisConView *musicPlayerBluetoothDisConView{nullptr}; // 蓝牙未连接视图 + MusicPlayerBTConnectFailedView *musicPlayerBTConnectFailedView{nullptr}; // 蓝牙连接失败视图 private: UIView::OnClickListener *clickListener{nullptr}; diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBTConnectFailedView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBTConnectFailedView.cpp new file mode 100644 index 000000000..e889d663c --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBTConnectFailedView.cpp @@ -0,0 +1,305 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-08-12 11:31:43 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-08-12 17:19:23 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBTConnectFailedView.cpp + */ +#include "player/include/MusicPlayerBTConnectFailedView.h" +#include "player/include/PlayersPresenter.h" +#include "player/include/PlayersView.h" +#include "wearable_log.h" +#include "ui_resource_string.h" + +namespace OHOS +{ + static constexpr const char *CLOSEBUTTON_VIEWID = "CLOSEButton"; + MusicPlayerBTConnectFailedView::MusicPlayerBTConnectFailedView(/* args */) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerBTConnectFailedView::MusicPlayerBTConnectFailedView"); + } + + MusicPlayerBTConnectFailedView::~MusicPlayerBTConnectFailedView() + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerBTConnectFailedView::~MusicPlayerBTConnectFailedView"); + ClearAll(); + } + + bool MusicPlayerBTConnectFailedView::OnClick(UIView &view, const ClickEvent &event) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerBluetoothDisConView::OnClick"); + PlayersView *playersView = PlayersView::GetInstance(); + if (!playersView) + { + return false; + } + if (strcmp(view.GetViewId(), CLOSEBUTTON_VIEWID) == 0) + { + playersView->ChangeView(PlayersView::MUSIC_BT_CONNECTFAILED_VIEW, PlayersView::MAIN_MUSICPLAYER_VIEW); + } + return true; + } + + void MusicPlayerBTConnectFailedView::ClearAll() + { + if (group != nullptr) + { + group->RemoveAll(); + + if (scrollView != nullptr) + { + scrollView->RemoveAll(); + if (titleLabel != nullptr) + { + delete titleLabel; + titleLabel = nullptr; + } + if (IPoneLabel != nullptr) + { + delete IPoneLabel; + IPoneLabel = nullptr; + } + if (AndroidLabel != nullptr) + { + delete AndroidLabel; + AndroidLabel = nullptr; + } + if (BTNoteLabel1 != nullptr) + { + delete BTNoteLabel1; + BTNoteLabel1 = nullptr; + } + if (BTNoteLabel2 != nullptr) + { + delete BTNoteLabel2; + BTNoteLabel2 = nullptr; + } + if (BTNoteLabel3 != nullptr) + { + delete BTNoteLabel3; + BTNoteLabel3 = nullptr; + } + if (CloseLabel != nullptr) + { + delete CloseLabel; + CloseLabel = nullptr; + } + if (CloseButton != nullptr) + { + delete CloseButton; + CloseButton = nullptr; + } + delete scrollView; + scrollView = nullptr; + } + + delete group; + group = nullptr; + } + } + + bool MusicPlayerBTConnectFailedView::CreateMusicPlayerBTConnectFailedViewLabel() + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerBTConnectFailedView::CreateMusicPlayerBTConnectFailedViewLabel"); + /* ------------------------------- titleLabel ------------------------------- */ + if (titleLabel == nullptr) + { + titleLabel = new UILabelExt(); + if (titleLabel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "titleLabel new fail"); + return false; + } + } + titleLabel->SetPosition(83, 50, 300, 35); + titleLabel->SetStyle(STYLE_TEXT_FONT, 30); + titleLabel->SetStyle(STYLE_LINE_HEIGHT, 35); + titleLabel->SetTextId(STR_BLUETOOTH_CONNECTION_FAILED); // 蓝牙连接失败 + titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + /* ------------------------------- BTNoteLabel1 ------------------------------ */ + if (BTNoteLabel1 == nullptr) + { + BTNoteLabel1 = new UILabelExt(); + if (BTNoteLabel1 == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BTNoteLabel1 new fail"); + return false; + } + } + BTNoteLabel1->SetPosition(53, 140, 360, 35); + BTNoteLabel1->SetStyle(STYLE_TEXT_FONT, 30); + BTNoteLabel1->SetStyle(STYLE_LINE_HEIGHT, 35); + BTNoteLabel1->SetTextId(STR_SOLUTION); + BTNoteLabel1->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + BTNoteLabel1->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + /* ------------------------------- IPoneLabel ------------------------------- */ + if (IPoneLabel == nullptr) + { + IPoneLabel = new UILabelExt(); + if (IPoneLabel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "IPoneLabel new fail"); + return false; + } + } + IPoneLabel->SetPosition(53, BTNoteLabel1->GetY() + BTNoteLabel1->GetTextHeight(), 360, 35); + IPoneLabel->SetStyle(STYLE_TEXT_FONT, 30); + IPoneLabel->SetStyle(STYLE_LINE_HEIGHT, 35); + IPoneLabel->SetTextId(STR_IPHONE); + IPoneLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + IPoneLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + /* ------------------------------ BTNoteLabel2 ------------------------------ */ + if (BTNoteLabel2 == nullptr) + { + BTNoteLabel2 = new UILabelExt(); + if (BTNoteLabel2 == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BTNoteLabel2 new fail"); + return false; + } + } + BTNoteLabel2->SetPosition(53, IPoneLabel->GetY() + IPoneLabel->GetTextHeight(), 360, 455); + BTNoteLabel2->SetStyle(STYLE_TEXT_FONT, 30); + BTNoteLabel2->SetStyle(STYLE_LINE_HEIGHT, 35); + BTNoteLabel2->SetTextId(STR_ENABLE_BLUETOOTH_CALL_NOTE_IPHONE); + BTNoteLabel2->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); + BTNoteLabel2->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + /* ------------------------------- AndroidLabel ------------------------------- */ + if (AndroidLabel == nullptr) + { + AndroidLabel = new UILabelExt(); + if (AndroidLabel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AndroidLabel new fail"); + return false; + } + } + AndroidLabel->SetPosition(53, BTNoteLabel2->GetY() + BTNoteLabel2->GetTextHeight() + 40, 360, 35); + AndroidLabel->SetStyle(STYLE_TEXT_FONT, 30); + AndroidLabel->SetStyle(STYLE_LINE_HEIGHT, 35); + AndroidLabel->SetTextId(STR_IPHONE); + AndroidLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + AndroidLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + /* ------------------------------ BTNoteLabel3 ------------------------------ */ + if (BTNoteLabel3 == nullptr) + { + BTNoteLabel3 = new UILabelExt(); + if (BTNoteLabel3 == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BTNoteLabel2 new fail"); + return false; + } + } + BTNoteLabel3->SetPosition(53, AndroidLabel->GetY() + AndroidLabel->GetTextHeight(), 360, 455); + BTNoteLabel3->SetStyle(STYLE_TEXT_FONT, 30); + BTNoteLabel3->SetStyle(STYLE_LINE_HEIGHT, 35); + BTNoteLabel3->SetTextId(STR_ENABLE_BLUETOOTH_CALL_NOTE_ANDROID); + BTNoteLabel3->SetLineBreakMode(UILabel::LINE_BREAK_WRAP); + BTNoteLabel3->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + /* ------------------------------- CloseLabel ------------------------------- */ + if (CloseLabel == nullptr) + { + CloseLabel = new UILabelExt(); + if (CloseLabel == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CloseLabel new fail"); + return false; + } + } + CloseLabel->SetPosition(83, BTNoteLabel3->GetY() + BTNoteLabel3->GetTextHeight() + 40 + 29, 300, 35); + CloseLabel->SetStyle(STYLE_TEXT_FONT, 30); + CloseLabel->SetStyle(STYLE_LINE_HEIGHT, 35); + CloseLabel->SetTextId(STR_CLOSE); // 关闭 + CloseLabel->SetLineBreakMode(UILabel::LINE_BREAK_OSCILLATION); + CloseLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + CloseLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + + return true; + } + + bool MusicPlayerBTConnectFailedView::CreateMusicPlayerBTConnectFailedViewButton() + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerBTConnectFailedView::CreateMusicPlayerBTConnectFailedViewButton"); + if (CloseButton == nullptr) + { + CloseButton = new UIButton(); + if (CloseButton == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CloseButton new fail!!"); + return false; + } + } + CloseButton->SetPosition(43, BTNoteLabel3->GetY() + BTNoteLabel3->GetTextHeight() + 40, 380, 100); + CloseButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); + CloseButton->SetViewId(CLOSEBUTTON_VIEWID); + CloseButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff383838, UIButton::PRESSED); + CloseButton->SetOnClickListener(this); + + return true; + } + + UIViewGroup *MusicPlayerBTConnectFailedView::CreateMusicPlayerBTConnectFailedView(void) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerBluetoothDisConView::CreateMusicPlayerBluetoothDisConView"); + if (group == nullptr) + { + group = new UIViewGroup(); + if (group == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "group new fail"); + return nullptr; + } + } + group->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); + group->SetStyle(STYLE_BACKGROUND_OPA, 0); + group->SetTouchable(true); + group->SetDraggable(true); + group->SetIntercept(true); + group->SetViewId(MUISC_PLAYER_BLUETOOTH_CONNECTFAILED_VIEW); + if (dragListener == nullptr) + { + dragListener = static_cast(new PlayerOnDragListener()); + if (dragListener == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "dragListener new fail"); + return nullptr; + } + } + group->SetOnDragListener(dragListener); + /* -------------------------------------------------------------------------- */ + if (scrollView == nullptr) + { + scrollView = new UIScrollView(); + if (scrollView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "scrollView new fail"); + return nullptr; + } + } + scrollView->SetPosition(0, 0, 466, 466); + scrollView->SetScrollBlankSize(50); + scrollView->SetReboundSize(35); + scrollView->SetThrowDrag(true); + scrollView->SetMaxScrollDistance(1000); + scrollView->SetDirection(UIScrollView::VERTICAL); + + if (!CreateMusicPlayerBTConnectFailedViewLabel() || !CreateMusicPlayerBTConnectFailedViewButton()) + { + return nullptr; + } + scrollView->Add(titleLabel); + scrollView->Add(BTNoteLabel1); + scrollView->Add(IPoneLabel); + scrollView->Add(AndroidLabel); + scrollView->Add(BTNoteLabel2); + scrollView->Add(BTNoteLabel3); + scrollView->Add(CloseButton); + scrollView->Add(CloseLabel); + + group->Add(scrollView); + return group; + } + +} \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp index bf0b7bbc8..3ee33f84e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-08-10 16:23:46 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-10 19:11:52 + * @LastEditTime: 2024-08-12 12:01:13 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerBluetoothDisConView.cpp */ #include "player/include/MusicPlayerBluetoothDisConView.h" @@ -11,8 +11,10 @@ #include "player/include/PlayersPresenter.h" #include "player/include/PlayersView.h" #include "ui_resource_image.h" +#include "string.h" namespace OHOS { + static constexpr const char *OKBUTTON_VIEWID = "OkButton"; MusicPlayerBluetoothDisConView::MusicPlayerBluetoothDisConView() { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerBluetoothDisConView::MusicPlayerBluetoothDisConView"); @@ -27,17 +29,12 @@ namespace OHOS bool MusicPlayerBluetoothDisConView::OnClick(UIView &view, const ClickEvent &event) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerBluetoothDisConView::OnClick"); - UILabelButton *button = dynamic_cast(&view); - if (!button) - { - return false; - } PlayersView *playersView = PlayersView::GetInstance(); if (!playersView) { return false; } - if (button == OkButton) + if (strcmp(view.GetViewId(), OKBUTTON_VIEWID) == 0) { playersView->ChangeView(PlayersView::MUSIC_BLUETOOTH_DISCONN_VIEW, PlayersView::MAIN_MUSICPLAYER_VIEW); } @@ -77,19 +74,20 @@ namespace OHOS delete noteLabel; noteLabel = nullptr; } + if (OkButton != nullptr) + { + delete OkButton; + OkButton = nullptr; + } + if (OkLabel != nullptr) + { + delete OkLabel; + OkLabel = nullptr; + } delete scrollView; scrollView = nullptr; } - if (OkButton != nullptr) - { - delete OkButton; - OkButton = nullptr; - } - if (OkLabel != nullptr) - { - delete OkLabel; - OkLabel = nullptr; - } + delete group; group = nullptr; } @@ -115,7 +113,7 @@ namespace OHOS bool MusicPlayerBluetoothDisConView::CreateMusicPlayerBluetoothDisConViewLabel(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerBluetoothDisConView::CreateMusicPlayerBluetoothDisConViewLabel"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerBluetoothDisConView::CreateMusicPlayerBluetoothDisConViewLabel"); LabelConfig labelConfig = { .left = 83, .top = 50, @@ -132,7 +130,6 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "titleLabel new fail!!"); return false; } - scrollView->Add(titleLabel); /* -------------------------------------------------------------------------- */ labelConfig = { .left = 53, @@ -150,7 +147,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "noteLabel new fail!!"); return false; } - scrollView->Add(noteLabel); + /* -------------------------------------------------------------------------- */ int16_t y = noteLabel->GetY() + noteLabel->GetTextHeight() + 30 + 33; labelConfig = { @@ -169,13 +166,13 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OkLabel new fail!!"); return false; } - scrollView->Add(OkLabel); + return true; } bool MusicPlayerBluetoothDisConView::CreateMusicPlayerBluetoothDisConViewImage(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerBluetoothDisConView::CreateMusicPlayerBluetoothDisConViewImage"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerBluetoothDisConView::CreateMusicPlayerBluetoothDisConViewImage"); if (bluetoothImage == nullptr) { bluetoothImage = new UIImageView(); @@ -191,7 +188,7 @@ namespace OHOS return false; } } - scrollView->Add(bluetoothImage); + /* -------------------------------------------------------------------------- */ if (image66 == nullptr) { @@ -207,8 +204,10 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "phoneImage LoadPlayerImage fail"); return false; } + image66->SetAutoEnable(false); + image66->SetResizeMode(UIImageView::CENTER); } - scrollView->Add(image66); + if (image99 == nullptr) { image99 = new UIImageView(); @@ -217,21 +216,22 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "group new fail"); return false; } - image99->SetPosition(344, 296, 74, 52); + image99->SetPosition(344, noteLabel->GetY() + noteLabel->GetTextHeight() - 35, 74, 52); if (!PlayersView::LoadPlayerImage(image99, PLAYER_DOWM_66)) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "phoneImage LoadPlayerImage fail"); return false; } + image99->SetAutoEnable(false); + image99->SetResizeMode(UIImageView::CENTER); } - scrollView->Add(image99); return true; } bool MusicPlayerBluetoothDisConView::CreateMusicPlayerBluetoothDisConViewButton(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerBluetoothDisConView::CreateMusicPlayerBluetoothDisConViewButton"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerBluetoothDisConView::CreateMusicPlayerBluetoothDisConViewButton"); if (OkButton == nullptr) { OkButton = new UIButton(); @@ -243,17 +243,16 @@ namespace OHOS } OkButton->SetPosition(0, noteLabel->GetY() + noteLabel->GetTextHeight() + 30, 466, 100); OkButton->SetImageSrc(PNG_BUTTON_466x100_IMAGE, PNG_BUTTON_466x100_IMAGE); + OkButton->SetViewId(OKBUTTON_VIEWID); OkButton->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff383838, UIButton::PRESSED); OkButton->SetOnClickListener(this); - scrollView->Add(OkButton); - return true; } UIViewGroup *MusicPlayerBluetoothDisConView::CreateMusicPlayerBluetoothDisConView(void) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MusicPlayerBluetoothDisConView::CreateMusicPlayerBluetoothDisConView"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MusicPlayerBluetoothDisConView::CreateMusicPlayerBluetoothDisConView"); if (group == nullptr) { group = new UIViewGroup(); @@ -263,7 +262,7 @@ namespace OHOS return nullptr; } } - group->SetPosition(0, 0, 466, 466); + group->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight()); group->SetStyle(STYLE_BACKGROUND_OPA, 0); group->SetTouchable(true); group->SetDraggable(true); @@ -290,7 +289,7 @@ namespace OHOS } } scrollView->SetPosition(0, 0, 466, 466); - scrollView->SetScrollBlankSize(35); + scrollView->SetScrollBlankSize(50); scrollView->SetReboundSize(35); scrollView->SetDirection(UIScrollView::VERTICAL); @@ -298,7 +297,13 @@ namespace OHOS { return nullptr; } - + scrollView->Add(titleLabel); + scrollView->Add(bluetoothImage); + scrollView->Add(image66); + scrollView->Add(image99); + scrollView->Add(noteLabel); + scrollView->Add(OkButton); + scrollView->Add(OkLabel); group->Add(scrollView); return group; } 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 5151ab568..bb47b64d4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/MusicPlayerSourceView.cpp @@ -13,6 +13,9 @@ #include "ui_resource_string.h" #include "settings/include/SettingModel.h" #include "ui_resource_string.h" +#include "AppViewIDs.h" +#include "NativeAbility.h" +#include "main/include/MainModel.h" namespace OHOS { static MusicPlayerSourceView *g_bluetoothView{nullptr}; @@ -72,9 +75,11 @@ namespace OHOS } else if (phonebluetoothcon && !a2dp) { + playersView->ChangeView(PlayersView::MUSIC_SOURCE_VIEW, PlayersView::MUSIC_BT_CONNECTFAILED_VIEW); } else if (phonebluetoothcon && a2dp) { + playersView->ChangeView(PlayersView::MUSIC_SOURCE_VIEW, PlayersView::MAIN_MUSICPLAYER_VIEW); } } else if (button == watchLableButton) // 若点击的是手表音乐按钮 @@ -88,6 +93,10 @@ namespace OHOS else if (button == bluetoothHeadsetLableButton) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OnClick bluetoothHeadsetLableButton"); + NativeAbility::GetInstance().EnterSlice(VIEW_BLUETOOTH_EARPHONE); + // 配置主界面回退界面 + MainModel::GetInstance().SetFromSetCardView(true); + MainModel::GetInstance().SetFromCardId(MUSIC_PLAYER); } return true; diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListDelSongView.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListDelSongView.cpp index d857da0f6..352c669f3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListDelSongView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayerListDelSongView.cpp @@ -1,5 +1,6 @@ #include "player/include/PlayerListDelSongView.h" #include "player/include/PlayersPresenter.h" +#include "player/include/PlayersModel.h" #include "wearable_log.h" #include "ui_resource_string.h" #include "UiConfig.h" @@ -84,18 +85,21 @@ namespace OHOS /// @brief 设置歌曲名标签样式 /// @param songName 歌曲名 - void PlayerListDelSongView::SetTheSongLabelStyle(const char *songName) + void PlayerListDelSongView::SetTheDelSongLabelStyle(const char *songName) { delSongName = songName; - songNameLabel->SetText(songName); - songNameLabel->Invalidate(); + if (songNameLabel != nullptr) + { + songNameLabel->SetText(songName); + songNameLabel->Invalidate(); + } } // 删除歌曲文件 void PlayerListDelSongView::DeleteSongNameFile(void) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " whill Deleted file:", delSongName.c_str()); - std::string path = "/user/music/" + delSongName; + std::string path = PlayersModel::GetInstance()->GetMusicPlayPath() + delSongName; if (uapi_delete_files(path.c_str())) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp index bbeb2e56d..9d9df4dda 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersCaseListAdapter.cpp @@ -53,7 +53,11 @@ namespace OHOS { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GetViewType = %d", view.GetViewType()); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "index = %d ,uri = %s.", view.GetViewIndex(), musicPlayName); - playersView->ChangeView(PlayersView::MUSIC_LIST_VIEW,PlayersView::MUSIC_DELETE_VIEW); + playersView->ChangeView(PlayersView::MUSIC_LIST_VIEW, PlayersView::MUSIC_DELETE_VIEW); + if (playersView->GetPlayerListDelSongView()) + { + playersView->GetPlayerListDelSongView()->SetTheDelSongLabelStyle(musicPlayName); + } return true; } /* -------------------------------------------------------------------------- */ diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp index 4d7b87bad..777d7498f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp @@ -12,7 +12,8 @@ #include "bts_avrcp_target.h" #include "bts_a2dp_source.h" #include "bluetooth/include/BluetoothModel.h" - +#include +#include namespace OHOS { static constexpr int VOLUME_MAXIMUM = 100; @@ -745,9 +746,24 @@ void PlayersModel::GetDuration(int64_t &duration) duration = duration_; } +/*创建音乐播放路径*/ +bool PlayersModel::CreateMusicPlayDirectory(const char* path) +{ + if (access(path, F_OK) == -1) { // 如果路径不存在 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Directory %s not exist, creating directory\n", path); + if (mkdir(path, 0777)!= 0) { // 尝试创建目录，如果创建失败 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Create directory %s failed\n", path); + return false; + } + } else { // 如果路径存在 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Directory %s already exists\n", path); + } + return true; +} /*获取音乐播放路径*/ std::string PlayersModel::GetMusicPlayPath(void) { + CreateMusicPlayDirectory(); return musicPlayPath; } 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 1aabce4b6..cd6a2f43e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersPresenter.cpp @@ -424,6 +424,10 @@ void PlayersListGroup::SetUpListCase() } } playersCaseList_->Clear(); + if(!PlayersModel::GetInstance()->CreateMusicPlayDirectory()) + { + return; + } ret = GetAllFiles(playersCaseList_); if (ret == OHOS_FAILURE) { return; @@ -645,14 +649,14 @@ bool ButtonOnClickListener::OnClick(UIView& view, const ClickEvent& event) }else if(&view == (UIView *)playersView->GetMusicListButton()) { MusicListButtonOnClick(); } - if(playersView->GetPlayerListDelSongView()!=nullptr && playersView->GetPlayerListDelSongView()->GetEnsureDeleteButton()!=nullptr) + if(playersView->GetPlayerListDelSongView()!=nullptr && &view == playersView->GetPlayerListDelSongView()->GetEnsureDeleteButton()) { //删除音乐回到音乐列表 playersView->GetPlayerListDelSongView()->DeleteSongNameFile(); - PlayersListGroup::GetInstance()->SetUpListCase(); + // PlayersListGroup::GetInstance()->SetUpListCase(); playersView->ChangeView(PlayersView::MUSIC_DELETE_VIEW,PlayersView::MUSIC_LIST_VIEW); } - else if(playersView->GetPlayerListDelSongView()!=nullptr && playersView->GetPlayerListDelSongView()->GetCancelDeleteButton()!=nullptr) + else if(playersView->GetPlayerListDelSongView()!=nullptr && &view == playersView->GetPlayerListDelSongView()->GetCancelDeleteButton()) { //不删除音乐回到音乐列表 playersView->ChangeView(PlayersView::MUSIC_DELETE_VIEW,PlayersView::MUSIC_LIST_VIEW); @@ -982,6 +986,34 @@ void PlayerOnDragListener::OnDragChangMusicPlayerDeleteView(const DragEvent& eve X_DRAG_FLAG = true; } } +/*从蓝牙未连接视图回到音乐主视图*/ +void PlayerOnDragListener::OnDragChangMusicPlayerBTDisConnectView(const DragEvent& event) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnDragChangMusicPlayerBTDisConnectView"); + if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && X_DRAG_FLAG) { + PlayersView *playersView = PlayersView::GetInstance(); + if (playersView == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playersView GetInstance fail"); + return; + } + playersView->ChangeView(PlayersView::MUSIC_BLUETOOTH_DISCONN_VIEW,PlayersView::MAIN_MUSICPLAYER_VIEW); + X_DRAG_FLAG = true; + } +} +/*从蓝牙连接失败视图回到音乐主视图*/ +void PlayerOnDragListener::OnDragChangMusicPlayerBTConnectFailedView(const DragEvent& event) +{ + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "OnDragChangMusicPlayerBTConnectFailedView"); + if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && X_DRAG_FLAG) { + PlayersView *playersView = PlayersView::GetInstance(); + if (playersView == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "playersView GetInstance fail"); + return; + } + playersView->ChangeView(PlayersView::MUSIC_BT_CONNECTFAILED_VIEW,PlayersView::MAIN_MUSICPLAYER_VIEW); + X_DRAG_FLAG = true; + } +} void PlayerOnDragListener::DropEarPhoneView(const DragEvent& event) { bool ret = BluetoothModel::GetInstance()->IsTagReturnToDeviceListView(); @@ -1071,6 +1103,14 @@ bool PlayerOnDragListener::OnDragEnd(UIView& view, const DragEvent& event) OnDragChangMusicPlayerDeleteView(event); return false; } + else if (strcmp(view.GetViewId(), MUISC_PLAYER_BLUETOOTH_DISCONN_VIEW) == 0) { + OnDragChangMusicPlayerBTDisConnectView(event); + return false; + } + else if (strcmp(view.GetViewId(), MUISC_PLAYER_BLUETOOTH_CONNECTFAILED_VIEW) == 0) { + OnDragChangMusicPlayerBTConnectFailedView(event); + return false; + } return true; } 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 d701a6748..500767dc2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersView.cpp @@ -429,6 +429,11 @@ namespace OHOS delete musicPlayerBluetoothDisConView; musicPlayerBluetoothDisConView = nullptr; } + if (musicPlayerBTConnectFailedView != nullptr) + { + delete musicPlayerBTConnectFailedView; + musicPlayerBTConnectFailedView = nullptr; + } for (int i = MAIN_MUSICPLAYER_VIEW; i < MUSICPLAYERJUMPVIEWID_MAX; i++) { @@ -753,18 +758,24 @@ namespace OHOS /// @brief 设置音乐播放按钮是否可点击 /// @param musicSourceType 音乐来源类型 false：手表音乐 true 手机音乐 /// @param phoneMusicConnectStatus 手机音乐连接状态 - void PlayersView::SetMusicPlayerButtonIsTouchable(bool musicSourceType, bool phoneMusicConnectStatus) + void PlayersView::SetMusicPlayerButtonIsTouchable(bool musicSourceType) { // 1.如果为手机音乐且手机音乐已连接那么上一首，下一首，播放或暂停，声音等按钮设置为可点击. // 2.如果不为手机音乐按钮就可点击 /* -------------------------------------------------------------------------- */ - bool touchableState = (musicSourceType && phoneMusicConnectStatus) || !musicSourceType; + bool touchableState = !musicSourceType; play_or_pause_Button->SetTouchable(touchableState); preMusicButton->SetTouchable(touchableState); nextMusicButton->SetTouchable(touchableState); - soundButton->SetTouchable(touchableState); - /* ------------------------- 如果音乐来源为手机音乐,播放顺序按钮就不可用 ------------------------- */ - playerModelButton->SetTouchable(!musicSourceType); + playerModelButton->SetTouchable(touchableState); // 如果音乐来源为手机音乐,播放顺序按钮就不可用 + /* -------------------------------------------------------------------------- */ + /*暂停音乐*/ + uint8_t state = GetPlayerButtonState(); + int32_t playerState; /*获取Player的状态*/ + if (state == UICheckBox::UICheckBoxState::SELECTED) + { + PlayersModel::GetInstance()->PlayerStop(); + } /* -------------------------------------------------------------------------- */ PreLoadPlayerModeImageRes(); } @@ -801,7 +812,7 @@ namespace OHOS MusicSourceLabelSetText(STR_MOBILE_MUSIC); // 手机音乐 PhoneMusicConnectStatusLabelColor(false); } - SetMusicPlayerButtonIsTouchable(musicSourceType, phoneMusicConnectStatus); + SetMusicPlayerButtonIsTouchable(musicSourceType); } else { @@ -815,7 +826,7 @@ namespace OHOS PhoneMusicConnectStatusLabelIsSetVisible(false); MusicListButtonIsSetVisible(true); MusicSourceLabelSetText(STR_WATCH_MUSIC); /*手表音乐*/ - SetMusicPlayerButtonIsTouchable(musicSourceType, phoneMusicConnectStatus); + SetMusicPlayerButtonIsTouchable(musicSourceType); } } @@ -1083,6 +1094,7 @@ namespace OHOS {PlayersView::MUSIC_LIST_VIEW, &PlayersView::ChangeToMusicListView}, {PlayersView::MUSIC_DELETE_VIEW, &PlayersView::ChangeToMusicDeleteView}, {PlayersView::MUSIC_BLUETOOTH_DISCONN_VIEW, &PlayersView::ChangeToMusicBluetoothDisConnectView}, + {PlayersView::MUSIC_BT_CONNECTFAILED_VIEW, &PlayersView::ChangeToMusicBluetoothConnectFailedView}, }; /*根据传入的 interface 值，在 ViewMapper 数组中查找匹配的 viewId*/ @@ -1267,4 +1279,28 @@ namespace OHOS } return true; } + + /*切换到蓝牙未连接视图*/ + bool PlayersView::ChangeToMusicBluetoothConnectFailedView(int16_t thisView) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "PlayersView::ChangeToMusicBluetoothConnectFailedView"); + if (group[thisView] == nullptr) + { + musicPlayerBTConnectFailedView = new MusicPlayerBTConnectFailedView(); + if (musicPlayerBTConnectFailedView == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "new playerListDelSongView fail"); + return false; + } + UIViewGroup *groupview = musicPlayerBTConnectFailedView->CreateMusicPlayerBTConnectFailedView(); + if (groupview == nullptr) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "new group[%d] fail", thisView); + return false; + } + group[thisView] = groupview; + Add(group[thisView]); + } + return true; + } } diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang index f2c9f8ae9..cfcbd0982 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h index dc7dd217e..c2a32b0be 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h @@ -441,80 +441,82 @@ enum UIResourceTextId : uint16_t { STR_CONNECTION_ERROR = 428, STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 429, STR_ENABLE_BLUETOOTH_CALL = 430, - STR_ENABLE_BLUETOOTH_CALL_NOTE_IPHONE = 431, - STR_ENABLE_BLUETOOTH_CALL_NOTE_ANDRODIR = 432, - STR_ENABLE_BLUETOOTH_CALL_NOTE = 433, - STR_SIM_CARD_ERROR = 434, - STR_CHECK_SIM_CARD_INSERTION = 435, - STR_WEATHER_REPORT = 436, - STR_ULTRAVIOLET = 437, - STR_WIND_SPEED = 438, - STR_HUMIDITY = 439, - STR_NEXT_7_DAYS = 440, - STR_GET_WEATHER_ERROR = 441, - STR_MUSIC_SOURCE = 442, - STR_MOBILE_MUSIC = 443, - STR_WATCH_MUSIC = 444, - STR_MUSIC_LIST = 445, - STR_BLUETOOTH_CONNECTION_FAILED = 446, - STR_SCANNING_BINDING = 447, - STR_DEVICE_BINDING = 448, - STR_DEVICE_BINDING_NOTE = 449, - STR_EQUIPMENT_UNTYING = 450, - STR_EQUIPMENT_UNTYING_NOTE = 451, - STR_DRINK_WATER_REMINDER = 452, - STR_DRINK_WATER_REMINDER_NOTE = 453, - STR_SEDENTARY_REMINDER = 454, - STR_SEDENTARY_REMINDER_NOTE = 455, - STR_SYSTEM_UPGRADING = 456, - STR_NEWDEVICE_BIND_REMIND_NOTE = 457, - STR_AI_VOICE = 458, - STR_AI_INTELLIGENT_ASSISTANT = 459, - STR_START_CHAT = 460, - STR_BOOT_FAILED = 461, - STR_ENABLE_MOBILE_DATA_FIRST = 462, - STR_ENABLE_BLUETOOTH_FIRST = 463, - STR_LISTENING = 464, - STR_FINISH_SPEAKING = 465, - STR_THINKING = 466, - STR_CANCEL = 467, - STR_CONNECT_TIMEOUT = 468, - STR_PLEASE_RESTART_CHAT = 469, - STR_CONTINUE_CHAT = 470, - STR_AIMODELS_DOUBAO = 471, - STR_AIMODES_WENXINYIYAN = 472, - STR_AIMODES_KIMI = 473, - STR_AIMODES_CHATGPT = 474, - STR_SLIDE_TO_SHUTDOWN = 475, - STR_SLIDE_TO_REBOOT = 476, - STR_AI_FAMILY_MEALS = 477, - STR_CHAT = 478, - STR_PCY4GC_OR_AS = 479, - STR_API_KEYS = 480, - STR_PGTTAF = 481, - STR_DAFBS = 482, - STR_OPENAI_API_KEYS = 483, - STR_KHBB = 484, - STR_GTAS = 485, - STR_DYWTDAK = 486, - STR_CONNECTING = 487, - STR_CONNECTION_FAIL = 488, - STR_PTALORTM = 489, - STR_MOTION_DETECTION_NOTE = 490, - STR_PE4GC = 491, - STR_OBU_MESSAGE = 492, - STR_DELETE = 493, - STR_CHARGE = 494, - STR_CHARGE_NOTE = 495, - STR_STEP_FREQUENCY = 496, - STR_STEP_LENGTH = 497, - STR_AVG_PACE = 498, - STR_TONGYI_QIANWEN = 499, - STR_IFLYTEK_SPARK = 500, - STR_DISTURBNOTE_OFF = 501, - STR_4G_NOTE = 502, - STR_MUSIC_PLAYER_SOURCE_NOTE = 503, - STR_MAX_ID = 504, + STR_SOLUTION = 431, + STR_IPHONE = 432, + STR_ANDROID = 433, + STR_ENABLE_BLUETOOTH_CALL_NOTE_IPHONE = 434, + STR_ENABLE_BLUETOOTH_CALL_NOTE_ANDROID = 435, + STR_SIM_CARD_ERROR = 436, + STR_CHECK_SIM_CARD_INSERTION = 437, + STR_WEATHER_REPORT = 438, + STR_ULTRAVIOLET = 439, + STR_WIND_SPEED = 440, + STR_HUMIDITY = 441, + STR_NEXT_7_DAYS = 442, + STR_GET_WEATHER_ERROR = 443, + STR_MUSIC_SOURCE = 444, + STR_MOBILE_MUSIC = 445, + STR_WATCH_MUSIC = 446, + STR_MUSIC_LIST = 447, + STR_BLUETOOTH_CONNECTION_FAILED = 448, + STR_SCANNING_BINDING = 449, + STR_DEVICE_BINDING = 450, + STR_DEVICE_BINDING_NOTE = 451, + STR_EQUIPMENT_UNTYING = 452, + STR_EQUIPMENT_UNTYING_NOTE = 453, + STR_DRINK_WATER_REMINDER = 454, + STR_DRINK_WATER_REMINDER_NOTE = 455, + STR_SEDENTARY_REMINDER = 456, + STR_SEDENTARY_REMINDER_NOTE = 457, + STR_SYSTEM_UPGRADING = 458, + STR_NEWDEVICE_BIND_REMIND_NOTE = 459, + STR_AI_VOICE = 460, + STR_AI_INTELLIGENT_ASSISTANT = 461, + STR_START_CHAT = 462, + STR_BOOT_FAILED = 463, + STR_ENABLE_MOBILE_DATA_FIRST = 464, + STR_ENABLE_BLUETOOTH_FIRST = 465, + STR_LISTENING = 466, + STR_FINISH_SPEAKING = 467, + STR_THINKING = 468, + STR_CANCEL = 469, + STR_CONNECT_TIMEOUT = 470, + STR_PLEASE_RESTART_CHAT = 471, + STR_CONTINUE_CHAT = 472, + STR_AIMODELS_DOUBAO = 473, + STR_AIMODES_WENXINYIYAN = 474, + STR_AIMODES_KIMI = 475, + STR_AIMODES_CHATGPT = 476, + STR_SLIDE_TO_SHUTDOWN = 477, + STR_SLIDE_TO_REBOOT = 478, + STR_AI_FAMILY_MEALS = 479, + STR_CHAT = 480, + STR_PCY4GC_OR_AS = 481, + STR_API_KEYS = 482, + STR_PGTTAF = 483, + STR_DAFBS = 484, + STR_OPENAI_API_KEYS = 485, + STR_KHBB = 486, + STR_GTAS = 487, + STR_DYWTDAK = 488, + STR_CONNECTING = 489, + STR_CONNECTION_FAIL = 490, + STR_PTALORTM = 491, + STR_MOTION_DETECTION_NOTE = 492, + STR_PE4GC = 493, + STR_OBU_MESSAGE = 494, + STR_DELETE = 495, + STR_CHARGE = 496, + STR_CHARGE_NOTE = 497, + STR_STEP_FREQUENCY = 498, + STR_STEP_LENGTH = 499, + STR_AVG_PACE = 500, + STR_TONGYI_QIANWEN = 501, + STR_IFLYTEK_SPARK = 502, + STR_DISTURBNOTE_OFF = 503, + STR_4G_NOTE = 504, + STR_MUSIC_PLAYER_SOURCE_NOTE = 505, + STR_MAX_ID = 506, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang index 558c19bfe..a5c590b3c 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/Lemon.mp3 b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/music/Lemon.mp3 similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/Lemon.mp3 rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/music/Lemon.mp3 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/alarm.mp3 b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/music/alarm.mp3 similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/alarm.mp3 rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/music/alarm.mp3 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/chun_feng_chu.mp3 b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/music/chun_feng_chu.mp3 similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/chun_feng_chu.mp3 rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/music/chun_feng_chu.mp3 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/lan_jing.mp3 b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/music/lan_jing.mp3 similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/lan_jing.mp3 rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/music/lan_jing.mp3 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/mp3_48k_caiqing.mp3 b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/music/mp3_48k_caiqing.mp3 similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/mp3_48k_caiqing.mp3 rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/music/mp3_48k_caiqing.mp3 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/music/music.txt b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/music/music.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/one.mp3 b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/music/one.mp3 similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/one.mp3 rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/userdata/music/one.mp3 diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c index 9dd2f4735..fddc5699a 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils.c @@ -1920,7 +1920,6 @@ void uapi_restore_factory_setting(void) char *filebuf[] = {"/system/ConfigModel.json", "/user/userdata", "/system/kvstore", - "/user/music" }; for(int i = 0; i < (sizeof(filebuf)/sizeof(filebuf[0])); i++) uapi_delete_files(filebuf[i]); diff --git a/tools/language_tool/Language_xml/input_list_en.txt b/tools/language_tool/Language_xml/input_list_en.txt index b5f0d6e43..cae25832b 100644 --- a/tools/language_tool/Language_xml/input_list_en.txt +++ b/tools/language_tool/Language_xml/input_list_en.txt @@ -429,9 +429,11 @@ STR_UNPAIR$Unpair STR_CONNECTION_ERROR$Connection Error STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE$Insert watch SIM or connect phone to make calls STR_ENABLE_BLUETOOTH_CALL$Enable Bluetooth Call -STR_ENABLE_BLUETOOTH_CALL_NOTE_IPHONE$The solution:1. IPhone Please go to the phone "Settings" → "Bluetooth" list to find “KUMI_XX” Click and try again -STR_ENABLE_BLUETOOTH_CALL_NOTE_ANDRODIR$2. Android phones Please go to the phone "Settings" → "Bluetooth" list to find “KUMI_XX” -STR_ENABLE_BLUETOOTH_CALL_NOTE$Click the icon on the right to enter Bluetooth Settings Enable the call and media functions and try again +STR_SOLUTION$The solution: +STR_IPHONE$1.IPhone +STR_ANDROID$2.Android phone +STR_ENABLE_BLUETOOTH_CALL_NOTE_IPHONE$Please go to the phone "Settings" → "Bluetooth" list to find XX Click and try again +STR_ENABLE_BLUETOOTH_CALL_NOTE_ANDROID$Please go to the phone "Settings" → "Bluetooth" list to find XX Click the icon on the right to enter Bluetooth Settings Enable the call and media functions and try again STR_SIM_CARD_ERROR$SIM Card Error STR_CHECK_SIM_CARD_INSERTION$Check if the watch’s SIM card is properly inserted STR_WEATHER_REPORT$Weather report diff --git a/tools/language_tool/Language_xml/input_list_zh.txt b/tools/language_tool/Language_xml/input_list_zh.txt index 00f2f7857..dec60985f 100644 --- a/tools/language_tool/Language_xml/input_list_zh.txt +++ b/tools/language_tool/Language_xml/input_list_zh.txt @@ -429,9 +429,11 @@ STR_UNPAIR$取消配对 STR_CONNECTION_ERROR$连接异常 STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE$请插入手表SIM卡或连接手机并确认开启蓝牙通话后再进行拨号 STR_ENABLE_BLUETOOTH_CALL$开启蓝牙通话 -STR_ENABLE_BLUETOOTH_CALL_NOTE_IPHONE$解决方法：1.苹果手机 请前往手机“设置”→“蓝牙”列表找到“KUMI_XX”并点击后重试 -STR_ENABLE_BLUETOOTH_CALL_NOTE_ANDRODIR$2.安卓手机 请前往手机“设置”→“蓝牙”列表找到 “KUMI_XX” -STR_ENABLE_BLUETOOTH_CALL_NOTE$点击右侧图标进入蓝牙设置 +STR_SOLUTION$解决方法： +STR_IPHONE$1.苹果手机 +STR_ANDROID$2.安卓手机 +STR_ENABLE_BLUETOOTH_CALL_NOTE_IPHONE$请前往手机“设置”→“蓝牙”列表找到“XX”并点击后重试 +STR_ENABLE_BLUETOOTH_CALL_NOTE_ANDROID$请前往手机“设置”→“蓝牙”列表找到 “XX”点击右侧图标进入蓝牙设置 STR_SIM_CARD_ERROR$Sim卡异常 STR_CHECK_SIM_CARD_INSERTION$SIM卡拨号异常，请检查手表SIM卡是否正确插入 STR_WEATHER_REPORT$气象报告 diff --git a/tools/language_tool/Language_xml/language_en.xml b/tools/language_tool/Language_xml/language_en.xml index 8011621f7..99d5eb62d 100644 --- a/tools/language_tool/Language_xml/language_en.xml +++ b/tools/language_tool/Language_xml/language_en.xml @@ -430,9 +430,11 @@ - - - + + + + + diff --git a/tools/language_tool/Language_xml/language_zh.xml b/tools/language_tool/Language_xml/language_zh.xml index 8171c7a32..70a0eba7d 100644 --- a/tools/language_tool/Language_xml/language_zh.xml +++ b/tools/language_tool/Language_xml/language_zh.xml @@ -430,9 +430,11 @@ - - - + + + + + diff --git a/tools/language_tool/font/en.lang b/tools/language_tool/font/en.lang index f2c9f8ae9..cfcbd0982 100644 Binary files a/tools/language_tool/font/en.lang and b/tools/language_tool/font/en.lang differ diff --git a/tools/language_tool/font/ui_resource_string.h b/tools/language_tool/font/ui_resource_string.h index dc7dd217e..c2a32b0be 100644 --- a/tools/language_tool/font/ui_resource_string.h +++ b/tools/language_tool/font/ui_resource_string.h @@ -441,80 +441,82 @@ enum UIResourceTextId : uint16_t { STR_CONNECTION_ERROR = 428, STR_INSERT_WATCH_SIM_OR_CONNECT_PHONE = 429, STR_ENABLE_BLUETOOTH_CALL = 430, - STR_ENABLE_BLUETOOTH_CALL_NOTE_IPHONE = 431, - STR_ENABLE_BLUETOOTH_CALL_NOTE_ANDRODIR = 432, - STR_ENABLE_BLUETOOTH_CALL_NOTE = 433, - STR_SIM_CARD_ERROR = 434, - STR_CHECK_SIM_CARD_INSERTION = 435, - STR_WEATHER_REPORT = 436, - STR_ULTRAVIOLET = 437, - STR_WIND_SPEED = 438, - STR_HUMIDITY = 439, - STR_NEXT_7_DAYS = 440, - STR_GET_WEATHER_ERROR = 441, - STR_MUSIC_SOURCE = 442, - STR_MOBILE_MUSIC = 443, - STR_WATCH_MUSIC = 444, - STR_MUSIC_LIST = 445, - STR_BLUETOOTH_CONNECTION_FAILED = 446, - STR_SCANNING_BINDING = 447, - STR_DEVICE_BINDING = 448, - STR_DEVICE_BINDING_NOTE = 449, - STR_EQUIPMENT_UNTYING = 450, - STR_EQUIPMENT_UNTYING_NOTE = 451, - STR_DRINK_WATER_REMINDER = 452, - STR_DRINK_WATER_REMINDER_NOTE = 453, - STR_SEDENTARY_REMINDER = 454, - STR_SEDENTARY_REMINDER_NOTE = 455, - STR_SYSTEM_UPGRADING = 456, - STR_NEWDEVICE_BIND_REMIND_NOTE = 457, - STR_AI_VOICE = 458, - STR_AI_INTELLIGENT_ASSISTANT = 459, - STR_START_CHAT = 460, - STR_BOOT_FAILED = 461, - STR_ENABLE_MOBILE_DATA_FIRST = 462, - STR_ENABLE_BLUETOOTH_FIRST = 463, - STR_LISTENING = 464, - STR_FINISH_SPEAKING = 465, - STR_THINKING = 466, - STR_CANCEL = 467, - STR_CONNECT_TIMEOUT = 468, - STR_PLEASE_RESTART_CHAT = 469, - STR_CONTINUE_CHAT = 470, - STR_AIMODELS_DOUBAO = 471, - STR_AIMODES_WENXINYIYAN = 472, - STR_AIMODES_KIMI = 473, - STR_AIMODES_CHATGPT = 474, - STR_SLIDE_TO_SHUTDOWN = 475, - STR_SLIDE_TO_REBOOT = 476, - STR_AI_FAMILY_MEALS = 477, - STR_CHAT = 478, - STR_PCY4GC_OR_AS = 479, - STR_API_KEYS = 480, - STR_PGTTAF = 481, - STR_DAFBS = 482, - STR_OPENAI_API_KEYS = 483, - STR_KHBB = 484, - STR_GTAS = 485, - STR_DYWTDAK = 486, - STR_CONNECTING = 487, - STR_CONNECTION_FAIL = 488, - STR_PTALORTM = 489, - STR_MOTION_DETECTION_NOTE = 490, - STR_PE4GC = 491, - STR_OBU_MESSAGE = 492, - STR_DELETE = 493, - STR_CHARGE = 494, - STR_CHARGE_NOTE = 495, - STR_STEP_FREQUENCY = 496, - STR_STEP_LENGTH = 497, - STR_AVG_PACE = 498, - STR_TONGYI_QIANWEN = 499, - STR_IFLYTEK_SPARK = 500, - STR_DISTURBNOTE_OFF = 501, - STR_4G_NOTE = 502, - STR_MUSIC_PLAYER_SOURCE_NOTE = 503, - STR_MAX_ID = 504, + STR_SOLUTION = 431, + STR_IPHONE = 432, + STR_ANDROID = 433, + STR_ENABLE_BLUETOOTH_CALL_NOTE_IPHONE = 434, + STR_ENABLE_BLUETOOTH_CALL_NOTE_ANDROID = 435, + STR_SIM_CARD_ERROR = 436, + STR_CHECK_SIM_CARD_INSERTION = 437, + STR_WEATHER_REPORT = 438, + STR_ULTRAVIOLET = 439, + STR_WIND_SPEED = 440, + STR_HUMIDITY = 441, + STR_NEXT_7_DAYS = 442, + STR_GET_WEATHER_ERROR = 443, + STR_MUSIC_SOURCE = 444, + STR_MOBILE_MUSIC = 445, + STR_WATCH_MUSIC = 446, + STR_MUSIC_LIST = 447, + STR_BLUETOOTH_CONNECTION_FAILED = 448, + STR_SCANNING_BINDING = 449, + STR_DEVICE_BINDING = 450, + STR_DEVICE_BINDING_NOTE = 451, + STR_EQUIPMENT_UNTYING = 452, + STR_EQUIPMENT_UNTYING_NOTE = 453, + STR_DRINK_WATER_REMINDER = 454, + STR_DRINK_WATER_REMINDER_NOTE = 455, + STR_SEDENTARY_REMINDER = 456, + STR_SEDENTARY_REMINDER_NOTE = 457, + STR_SYSTEM_UPGRADING = 458, + STR_NEWDEVICE_BIND_REMIND_NOTE = 459, + STR_AI_VOICE = 460, + STR_AI_INTELLIGENT_ASSISTANT = 461, + STR_START_CHAT = 462, + STR_BOOT_FAILED = 463, + STR_ENABLE_MOBILE_DATA_FIRST = 464, + STR_ENABLE_BLUETOOTH_FIRST = 465, + STR_LISTENING = 466, + STR_FINISH_SPEAKING = 467, + STR_THINKING = 468, + STR_CANCEL = 469, + STR_CONNECT_TIMEOUT = 470, + STR_PLEASE_RESTART_CHAT = 471, + STR_CONTINUE_CHAT = 472, + STR_AIMODELS_DOUBAO = 473, + STR_AIMODES_WENXINYIYAN = 474, + STR_AIMODES_KIMI = 475, + STR_AIMODES_CHATGPT = 476, + STR_SLIDE_TO_SHUTDOWN = 477, + STR_SLIDE_TO_REBOOT = 478, + STR_AI_FAMILY_MEALS = 479, + STR_CHAT = 480, + STR_PCY4GC_OR_AS = 481, + STR_API_KEYS = 482, + STR_PGTTAF = 483, + STR_DAFBS = 484, + STR_OPENAI_API_KEYS = 485, + STR_KHBB = 486, + STR_GTAS = 487, + STR_DYWTDAK = 488, + STR_CONNECTING = 489, + STR_CONNECTION_FAIL = 490, + STR_PTALORTM = 491, + STR_MOTION_DETECTION_NOTE = 492, + STR_PE4GC = 493, + STR_OBU_MESSAGE = 494, + STR_DELETE = 495, + STR_CHARGE = 496, + STR_CHARGE_NOTE = 497, + STR_STEP_FREQUENCY = 498, + STR_STEP_LENGTH = 499, + STR_AVG_PACE = 500, + STR_TONGYI_QIANWEN = 501, + STR_IFLYTEK_SPARK = 502, + STR_DISTURBNOTE_OFF = 503, + STR_4G_NOTE = 504, + STR_MUSIC_PLAYER_SOURCE_NOTE = 505, + STR_MAX_ID = 506, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/tools/language_tool/font/zh.lang b/tools/language_tool/font/zh.lang index 558c19bfe..a5c590b3c 100644 Binary files a/tools/language_tool/font/zh.lang and b/tools/language_tool/font/zh.lang differ