Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge #3328 into fd272 from refs/changes/3328/head
优化活动界面
* refs/changes/3328/head: (1 commits squashed)
- 优化活动界面
Signed-off-by: Caisking <3449750381@qq.com>
Merged-by: 薛文强 <accounts_67aaf52ad497cd558d73ac32@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3328
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge #3312 into fd272 from refs/changes/3312/head
二维码界面电量更新改成5s一只刷新
* refs/changes/3312/head: (1 commits squashed)
- 二维码界面电量更新改成5s一只刷新
Signed-off-by: 罗正 <1732036298@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3312
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge #3300 into fd272 from refs/changes/3300/head
表冠线程优化
* refs/changes/3300/head: (1 commits squashed)
- 表冠线程优化
Signed-off-by: 罗正 <1732036298@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3300
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge #3264 into fd272 from refs/changes/3264/head
Code review from aliyun3243248791
* refs/changes/3264/head: (2 commits squashed)
- 修改血氧,心率,运动,省电界面的UI颜色与资源
- Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Signed-off-by: 薛文强 <accounts_67aaf52ad497cd558d73ac32@mail.teambition.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3264
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272
Merge branch 'fd272' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into fd272