From 9607a484b9cdc5a9e74ed3a35cab01eb3810d70d Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E7=BD=97=E6=AD=A3?= <1732036298@qq.com> Date: Sat, 22 Jun 2024 08:29:01 +0000 Subject: [PATCH] Merge #358 into sdk602patch0521 from refs/changes/358/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 罗正 * refs/changes/358/head: (4 commits squashed) - 修改铃声MP3路径为music文件夹下 - 修改闹钟铃声为/user/music/ring/alarm.mp3 - 显示方式Model文件SetAppListDisplayStyle函数添加错误日志打印 - Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521 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/358 --- .../nativeui/alarm/src/AlarmClockModel.cpp | 3 ++- .../nativeui/themestyle/src/ThemeStyleModel.cpp | 14 ++++++++++---- .../wearable/nativeabilityfwk/src/Ability.cpp | 2 +- .../src/notify/findwatch_notification.cpp | 4 ++-- .../fd230/fs/user/{res => music}/ring/alarm.mp3 | Bin .../fd230/fs/user/{res => music}/ring/calling.mp3 | Bin .../fs/user/{res => music}/ring/findwatch.mp3 | Bin 7 files changed, 15 insertions(+), 8 deletions(-) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/{res => music}/ring/alarm.mp3 (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/{res => music}/ring/calling.mp3 (100%) rename code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/{res => music}/ring/findwatch.mp3 (100%) diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp index e43dbc22a..5304a663d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp @@ -760,7 +760,8 @@ int AlarmClockModel::AlarmPlayerInit(void) std::string strSongName = sliceId; std::string pureName = strSongName.substr(0, strSongName.rfind(".")); // 播放音乐的路径需要引用.号 WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayerInit, url:%s ", sliceId); - std::string strSrcMusic(APP_MUSIC_PATH); + //std::string strSrcMusic(APP_MUSIC_PATH); + std::string strSrcMusic("/user/music/ring"); std::string tempStr("/"); std::string strName = sliceId; uri = strSrcMusic + tempStr + strName; diff --git a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleModel.cpp index 6da8835c8..58ba50568 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleModel.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-07 09:21:47 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-06-18 14:42:50 + * @LastEditTime: 2024-06-22 15:10:07 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/ThemeStyleModel.cpp */ @@ -10,6 +10,7 @@ #include "kv_store.h" #include "securec.h" #include "wearable_log.h" +#include namespace OHOS { static const int STYLE_VALUE_LEN = 32; @@ -49,13 +50,18 @@ namespace OHOS /// @param style 要设置的风格样式 void ThemeStyleModel::SetAppListDisplayStyle(ThemeStyle style) { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ThemeStyleModel::SetAppListDisplayStyle"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ThemeStyleModel::SetAppListDisplayStyle,style = %d", style); // 检查是否存在对应的样式选项 if (ThemeStyleMap.find(style) != ThemeStyleMap.end()) { // 根据映射设置显示样式值 - (void)UtilsSetValue(THEMESTYLE_KEY, ThemeStyleMap.at(style).c_str()); + int ret = UtilsSetValue(THEMESTYLE_KEY, ThemeStyleMap.at(style).c_str()); + if (ret != EC_SUCCESS) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UtilsSetValue error,ret = %d", ret); + return; + } } else { @@ -63,7 +69,7 @@ namespace OHOS } } - //获取选中的样式Id + // 获取选中的样式Id uint16_t ThemeStyleModel::GetSelectThemeStyleId(void) { return GetAppListDisplayStyle(); diff --git a/code/sdk/application/wearable/nativeabilityfwk/src/Ability.cpp b/code/sdk/application/wearable/nativeabilityfwk/src/Ability.cpp index 114fc4ba8..311cba0e8 100755 --- a/code/sdk/application/wearable/nativeabilityfwk/src/Ability.cpp +++ b/code/sdk/application/wearable/nativeabilityfwk/src/Ability.cpp @@ -183,7 +183,7 @@ void Ability::PostChangeSlice(const uint16_t targetSliceId, TransitionType type, void Ability::OnTransitionEnd() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_LAUNCHER_FWK, "Ability::OnTransitionEnd"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_LAUNCHER_FWK, "Ability::OnTransitionEnd"); if (!sliceTransition_.IsCurrentSnapshotEnabled()) { if (prevSlice_.slice != nullptr) { prevSlice_.slice->OnStop(); diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp index 0302310a6..19bdd1002 100644 --- a/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-25 17:33:47 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-03-26 18:25:06 + * @LastEditTime: 2024-06-22 11:35:48 * @FilePath: /FD230/code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp * @details:实现查找手表的功能一般需要手表和智能手机之间的配合，通常是通过手机上的应用（App）或其他设备发送指令给手表，触发手表的查找功能。 * 以下是基本的实现步骤： @@ -87,7 +87,7 @@ namespace OHOS { // 本地播放文件路径和状态 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RingPlayerInit start!"); - std::string strSrcMusic("/user/res/ring"); + std::string strSrcMusic("/music/ring"); std::string tempStr("/"); std::string strName = RingMusicName; uri = strSrcMusic + tempStr + strName; diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ring/alarm.mp3 b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/ring/alarm.mp3 similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ring/alarm.mp3 rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/ring/alarm.mp3 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ring/calling.mp3 b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/ring/calling.mp3 similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ring/calling.mp3 rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/ring/calling.mp3 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ring/findwatch.mp3 b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/ring/findwatch.mp3 similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ring/findwatch.mp3 rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/ring/findwatch.mp3 -- 2.17.1