Merge #181 into xts_origin from refs/changes/181/head 183/target/1
author罗正 <1732036298@qq.com>
Sat, 25 May 2024 08:06:30 +0000 (08:06 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Sat, 25 May 2024 08:06:30 +0000 (08:06 +0000)
commit0b25fc503d911d9eae375a922d2e3aff0286d0be
tree84943ce2b9d145373bed2caa25c56f720b504860
parent9ced5910f833597c104bf6101aa397a4a9c171dd
Merge #181 into xts_origin from refs/changes/181/head

Code review from 罗正

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

  - 1.添加查找手表,来电,闹钟的铃声,
    2.修改查找手表的铃声为新添加铃声
    3.,修改下来视图中RefreshData函数中注释错误

  - 修改CustomEventPublish的第二和第三个参数,将c_activity_result_t更正为c_inactivity_result_t,以确保参数与实际类型匹配。

  - 添加久坐视功能,久坐开关,久坐时间间隔,就做时间段设置需要协议配合设置

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

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/181
14 files changed:
code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
code/sdk/application/wearable/fd230app/nativeui/config/src/ConfigModel.cpp
code/sdk/application/wearable/fd230app/nativeui/main/src/PullUpDownView.cpp
code/sdk/application/wearable/service/msg_center/CMakeLists.txt
code/sdk/application/wearable/service/msg_center/include/notify/findwatch_notification.h
code/sdk/application/wearable/service/msg_center/include/notify/notification_manager.h
code/sdk/application/wearable/service/msg_center/include/notify/sedentaryReminder_notification.h [new file with mode: 0644]
code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
code/sdk/application/wearable/service/msg_center/src/notify/findwatch_notification.cpp
code/sdk/application/wearable/service/msg_center/src/notify/notification_manager_customer.cpp
code/sdk/application/wearable/service/msg_center/src/notify/sedentaryReminder_notification.cpp [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ring/alarm.mp3 [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ring/calling.mp3 [new file with mode: 0644]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/ring/findwatch.mp3 [new file with mode: 0644]