Merge #310 into sdk602patch0521 from refs/changes/310/head 311/target/1 312/target/1 313/target/1
author罗正 <1732036298@qq.com>
Tue, 18 Jun 2024 09:46:29 +0000 (09:46 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Tue, 18 Jun 2024 09:46:29 +0000 (09:46 +0000)
commit4af83d6bb01bcff8d3e60b8ab327a5daa90fff19
tree2d127c455b1bb6feda2e89a36cfdfb0200759a3a
parent7e4535e3d38f9bc04e67635b27f9126032a4b1b8
Merge #310 into sdk602patch0521 from refs/changes/310/head

Code review from 罗正

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

  - 解决显示方式和天气bug

  - 1.优化显示与亮度视图目前能够同步更新显示(除了亮屏时长视图不能考虑重构中)
    2.优化ui_service,

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

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/310
16 files changed:
code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/include/BrightnessLevelView.h
code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/brightnesslevel/src/BrightnessLevelView.cpp
code/sdk/application/wearable/fd230app/nativeui/displaybrightness/include/DisplayBrightnessModel.h
code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/BrightnessControlView.cpp
code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessModel.cpp
code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessView.cpp
code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/ScreenDurationView.cpp
code/sdk/application/wearable/fd230app/nativeui/themestyle/include/ThemeStyleModel.h
code/sdk/application/wearable/fd230app/nativeui/themestyle/src/ThemeStyleModel.cpp
code/sdk/application/wearable/fd230app/nativeui/uiservice/include/ui_service.h
code/sdk/application/wearable/fd230app/nativeui/uiservice/src/ui_service.cpp
code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherModel.cpp
code/sdk/application/wearable/service/ble_service/blemoder/CMakeLists.txt
code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp