Merge #1040 into sdk602patch0626 from refs/changes/1040/head 1041/target/1
author彭磊 <1624952103@qq.com>
Fri, 27 Sep 2024 10:52:00 +0000 (10:52 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Fri, 27 Sep 2024 10:52:00 +0000 (10:52 +0000)
commitc6d4286764e0a7eafb734dfe2665f51d16ad6da0
treec24b096309a2bc6aceff03541a734e270287a5bb
parentae01eae8a2ea4d0858899d44931a312a466e9765
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