projects / mirrors / FD230.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7eaab84) | patch
Merge #814 into sdk602patch0626 from refs/changes/814/head 817/target/1
author彭磊 <1624952103@qq.com>
Thu, 29 Aug 2024 02:18:50 +0000 (02:18 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Thu, 29 Aug 2024 02:18:50 +0000 (02:18 +0000)
commite70b5412f9091d7f7c054055bc45c0637b63485b
tree5869970148ca9d81e604e4bed151adbeeaf4f0e5tree | snapshot
parent7eaab849bf1cd76fbce1dadcdd0fd25116521672commit | diff
Merge #814 into sdk602patch0626 from refs/changes/814/head

Code review from 彭磊

* refs/changes/814/head: (11 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

  - 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

  - 优化省电模式4G、蓝牙开关逻辑，添加“黑曜律动”表盘（待优化）

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

  - 4d606cb: 优化省电模式4G、蓝牙开关逻辑，添加“黑曜律动”表盘（待优化)(补)

Signed-off-by: aliyun6865282430 <1624952103@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/814
41 files changed:
code/sdk/application/wearable/fd230app/CMakeLists.txt diff | blob | history
code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h diff | blob | history
code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialDataBase.h diff | blob | history
code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeather.h diff | blob | history
code/sdk/application/wearable/fd230app/nativeui/main/include/dial/DialModelWeatherStr.h [new file with mode: 0644] blob
code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelWeatherStr.cpp [new file with mode: 0644] blob
code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp diff | blob | history
code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherModel.cpp diff | blob | history
code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp diff | blob | history
code/sdk/drivers/peripheral/utils/custom_utils.c diff | blob | history
tools/dial_converter_tool/instance/114/HOURHAND.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/MAIN_FACE_IMAGE.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/MINUTEHAND.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/SECONDHAND.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/module/calories.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/module/ellipse.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/module/heartrate.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/module/step.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/obsidianrhythm.mp4 [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/obsidianrhythm.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/obsidianrhythm.xml [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/preview_obsidianrhythm.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/weather/CLEAR_CLOUDY.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/weather/CLEAR_SUNNY.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/weather/DUSTSTORM.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/weather/FOGGY.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/weather/HAZE.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/weather/OVERCAST.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/weather/RAIN.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/weather/SNOW.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/weather/SUNNY.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/weather/SUNNY_CLOUDY.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/weather/THUNDERSHOWER.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/weather/UNKNOWN.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/week/WEEK_FRI.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/week/WEEK_MON.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/week/WEEK_SAT.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/week/WEEK_SUN.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/week/WEEK_THU.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/week/WEEK_TUE.png [new file with mode: 0644] blob
tools/dial_converter_tool/instance/114/week/WEEK_WED.png [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.