Merge #566 into sdk602patch0626 from refs/changes/566/head 568/target/1
author罗正 <1732036298@qq.com>
Sat, 20 Jul 2024 10:41:58 +0000 (10:41 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Sat, 20 Jul 2024 10:41:58 +0000 (10:41 +0000)
commit947aae271c3c736fc7986e11fa5486e9f111e46b
treec49a67b91c835b24f5122a374533ad5ec16497b0
parent665fd5b692263fd88dde100c85c104a0f3cd49dd
Merge #566 into sdk602patch0626 from refs/changes/566/head

Code review from 罗正

* refs/changes/566/head: (8 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

  - QRcode 添加版本号,title改为设别名

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

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/566
code/sdk/application/wearable/fd230app/nativeui/watchQRcode/src/WatchQRCodeView.cpp