Merge #24 into xts_origin from refs/changes/24/head 25/target/1 26/target/1
authorsnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Wed, 17 Apr 2024 02:20:20 +0000 (02:20 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Wed, 17 Apr 2024 02:20:20 +0000 (02:20 +0000)
commit0e931bd46f7ac07a4c4fac6a453b5d297b295fcb
treeba3605a809a4707b05747cc096b53331a1b64f2f
parent710eac96431c54d711d0c55cd1fe0a0f09ed07d6
Merge #24 into xts_origin from refs/changes/24/head

修复bleservice 不能开启的问,恢复keepon timeout 比较参数

* refs/changes/24/head: (1 commits squashed)

  - 修复bleservice 不能开启的问,恢复keepon timeout 比较参数

Signed-off-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.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/24
code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
code/sdk/application/wearable/service/power_manager/src/power_display_service.c
code/sdk/drivers/peripheral/utils/custom_utils.c