Snicker Git - mirrors/FD230.git/commit

author	袁清梦 <3449750381@qq.com>
	Thu, 13 Jun 2024 10:28:44 +0000 (10:28 +0000)
committer	snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
	Thu, 13 Jun 2024 10:28:44 +0000 (10:28 +0000)
commit	d369f0f752727c9e195a6e3b3b236818fbf0aded
tree	5fb3ff5df07ba2d62a34078f038da80c795bb28b	tree \| snapshot
parent	bc25dd7f58b12180a09b31aeef3a2575f210a448	commit \| diff

Merge #274 into sdk602patch0521 from refs/changes/274/head

Code review from 袁清梦

* refs/changes/274/head: (5 commits squashed)

  - 优化训练死机bug

  - Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

  - 修复心率血氧数据json的时间戳

  - Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

  - Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

Signed-off-by: Caisking <3449750381@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/274

21 files changed:

code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/include/BloodOxygenPresenter.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/heart_blood/src/BloodCardView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartPresenter.h		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp		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/traing/training_list_aquatic/src/TraingAquaticView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_other/src/TraingOtherView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestView.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp		diff \| blob \| history
code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordView.cpp		diff \| blob \| history

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

RSS Atom