Snicker Git - mirrors/FD230.git/commit

author	袁清梦 <3449750381@qq.com>
	Fri, 20 Dec 2024 07:03:19 +0000 (07:03 +0000)
committer	袁清梦 <3449750381@qq.com>
	Fri, 20 Dec 2024 07:03:19 +0000 (07:03 +0000)
commit	e559bea50afb2f6e86c30f8ca1d1c832cfef9a9b
tree	cc5f985454631ae575c608cc1b695765a00a00fd	tree \| snapshot
parent	761cc194e37e40b3c362f4537625a16a5b4778a7	commit \| diff

Merge #1538 into sdk602patch0911 from refs/changes/1538/head

- #1234 手表，手表上的运动记录图标与APP运动记录图标不一致

- 修复错误的解析项

39 files changed:

code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordModel.cpp		diff \| blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Ball.bin		diff \| blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Dance.bin		diff \| blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Fitness.bin		diff \| blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/FreeTraining_60.bin	[new file with mode: 0644]	blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Ice.bin		diff \| blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Limit.bin		diff \| blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Other.bin		diff \| blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Rest.bin		diff \| blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Riding_60.bin	[new file with mode: 0644]	blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Running_60.bin	[new file with mode: 0644]	blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Swimming.bin		diff \| blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/riding.bin	[new file with mode: 0644]	blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/running.bin	[new file with mode: 0644]	blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/walking.bin	[new file with mode: 0644]	blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/walking_60.bin	[new file with mode: 0644]	blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/Riding_60.bin		diff \| blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/Running_60.bin		diff \| blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/riding.bin	[new file with mode: 0644]	blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/running.bin	[new file with mode: 0644]	blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/walking.bin	[new file with mode: 0644]	blob
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/walking_60.bin		diff \| blob \| history
tools/image_converter_tool/test/hert/Training/icon_36x36/Jumprope.png	[deleted file]	blob \| history
tools/image_converter_tool/test/hert/Training/icon_36x36/Mountaineering.png	[deleted file]	blob \| history
tools/image_converter_tool/test/hert/Training/icon_36x36/Pingpong.png	[deleted file]	blob \| history
tools/image_converter_tool/test/hert/Training/icon_36x36/Riding.png	[deleted file]	blob \| history
tools/image_converter_tool/test/hert/Training/icon_36x36/Running.png	[deleted file]	blob \| history
tools/image_converter_tool/test/hert/Training/icon_36x36/Walking.png	[deleted file]	blob \| history
tools/image_converter_tool/test/hert/Training/icon_36x36/riding.png	[new file with mode: 0644]	blob
tools/image_converter_tool/test/hert/Training/icon_36x36/running.png	[new file with mode: 0644]	blob
tools/image_converter_tool/test/hert/Training/icon_36x36/walking.png	[new file with mode: 0644]	blob
tools/image_converter_tool/test/hert/Training/icon_60x60/riding.png	[new file with mode: 0644]	blob
tools/image_converter_tool/test/hert/Training/icon_60x60/running.png	[new file with mode: 0644]	blob
tools/image_converter_tool/test/hert/Training/icon_60x60/walking.png	[new file with mode: 0644]	blob
tools/log_parser/runtimeanalysis.py		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom