Merge #1040 into sdk602patch0626 from refs/changes/1040/head
author彭磊 <1624952103@qq.com>
Fri, 27 Sep 2024 10:52:00 +0000 (10:52 +0000)
committerSnickerSun <snickersun@163.com>
Thu, 10 Oct 2024 06:41:48 +0000 (14:41 +0800)
commit34b19d256e9597e5b1f80f1a6e64a70e8fd10c32
tree15c633183dfb36422773cc762ffaaf2f0b63aa3d
parent273a4ab3e114d8bcebd47ff1e4ebaffa45af7e17
Merge #1040 into sdk602patch0626 from refs/changes/1040/head

Code review from 彭磊

* refs/changes/1040/head: (7 commits squashed)

  - 修改黑曜表盘配置

  - 同步默认表盘更新

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

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

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

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

  - 优化睡眠文件读写,优化A2DP音量映射

Signed-off-by: aliyun6865282430 <1624952103@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/1040
code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
code/sdk/application/wearable/fd230app/nativeui/sleep/include/SleepModel.h
code/sdk/application/wearable/fd230app/nativeui/sleep/src/SleepModel.cpp
code/sdk/middleware/services/media/foundation/audiomanager/frameworks/audiomanager/cpp/audio_manager.cpp