Merge #358 into sdk602patch0521 from refs/changes/358/head 362/target/1
author罗正 <1732036298@qq.com>
Sat, 22 Jun 2024 08:29:01 +0000 (08:29 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Sat, 22 Jun 2024 08:29:01 +0000 (08:29 +0000)
commit9607a484b9cdc5a9e74ed3a35cab01eb3810d70d
tree6ccc12d48d4a34300f892ae0fb0be32fa91add0c
parent3266152e43694b14c9fd528690655a5524f6612d
Merge #358 into sdk602patch0521 from refs/changes/358/head

Code review from 罗正

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

  - 修改铃声MP3路径为music文件夹下

  - 修改闹钟铃声为/user/music/ring/alarm.mp3

  - 显示方式Model文件SetAppListDisplayStyle函数添加错误日志打印

  - Merge branch &#39;sdk602patch0521&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

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/358
code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp
code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleModel.cpp
code/sdk/application/wearable/nativeabilityfwk/src/Ability.cpp
code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/ring/alarm.mp3 [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ring/alarm.mp3 with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/ring/calling.mp3 [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ring/calling.mp3 with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/music/ring/findwatch.mp3 [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ring/findwatch.mp3 with 100% similarity]