Merge #321 into sdk602patch0521 from refs/changes/321/head 323/target/1
author罗正 <1732036298@qq.com>
Wed, 19 Jun 2024 06:14:01 +0000 (06:14 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Wed, 19 Jun 2024 06:14:01 +0000 (06:14 +0000)
commit734e255b1dcf77b6498693be6d67d50a0514c75c
tree438bcf824244099eb50028f48f73f6344f93a3b7
parentbfca2354c76f34ca0feab74d91c1348448a268c8
Merge #321 into sdk602patch0521 from refs/changes/321/head

Code review from 罗正

* refs/changes/321/head: (9 commits squashed)

  - 解决显示方式和天气bug

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

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

  - 修改使用ImageCacheManager后清除图片资源

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

  - 天气界面图片加载不用ImageCacheManager 采用直接读取路径

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

  - 天气视图优化修改

  - 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/321
16 files changed:
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/include/FutureWeatherView.h
code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherControlView.h
code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherModel.h
code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherView.cpp
code/sdk/application/wearable/fd230app/nativeui/weather/src/GetWeatherDataErrorView.cpp
code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherView.cpp
code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherControlView.cpp
code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherModel.cpp
code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherReportView.cpp
code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp
code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/weather/weather65x65/weather_clear_cloudy.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/weather/weather65x65/weather_clear-cloudy.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/weather/weather65x65/weather_clear_sunny.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/weather/weather65x65/weather_clear-sunny.bin with 100% similarity]
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/weather/weather65x65/weather_sunny_cloudy.bin [moved from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/weather/weather65x65/weather_sunny-cloudy.bin with 100% similarity]