Merge #1316 into sdk602patch0911 from refs/changes/1316/head
author袁清梦 <3449750381@qq.com>
Fri, 1 Nov 2024 08:53:18 +0000 (08:53 +0000)
committer袁清梦 <3449750381@qq.com>
Fri, 1 Nov 2024 08:53:18 +0000 (08:53 +0000)
commit5424320a9be31ec93239c1050945152e208bfca7
tree9ca01a4f8080d33f2d510b4ea92e4d43f0268179
parent6ebce9291fcc6bdf730a04a2fe2f6fe7b8015a5f
Merge #1316 into sdk602patch0911 from refs/changes/1316/head

Code review from 袁清梦

* refs/changes/1316/head: (3 commits squashed)

  - 遥控拍照:修复遥控拍照退出异常

  - 睡眠:优化睡眠弹窗topic发送

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

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1316
code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
code/sdk/application/wearable/fd230app/nativeui/takephotos/include/TakephotosModel.h
code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosModel.cpp