Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
Merge #1613 into sdk602patch0911 from refs/changes/1613/head
合并imeimap代码
* refs/changes/1613/head: (1 commits squashed)
- 合并imeimap代码
Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1613
Merge #1608 into sdk602patch0911 from refs/changes/1608/head
Code review from 袁清梦
* refs/changes/1608/head: (14 commits squashed)
- releaseV1.3.105
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- release V1.3.107
Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1608
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
Merge #1610 into sdk602patch0911 from refs/changes/1610/head
Code review from 彭磊
* refs/changes/1610/head: (9 commits squashed)
- 功耗runtime增加运动事件上报
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 优化产测读取心率id,优化读取老化测试标志
- 优化产测读取心率id,优化读取老化测试标志(补)
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 优化蓝牙产测马达测试,4G测试,优化心率初始化
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 优化ppg老化测试
Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1610
Merge #1602 into sdk602patch0911 from refs/changes/1602/head
表盘:【花蕾】
* refs/changes/1602/head: (1 commits squashed)
- 表盘:【花蕾】
Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1602
Merge #1600 into sdk602patch0911 from refs/changes/1600/head
Code review from 彭磊
* refs/changes/1600/head: (7 commits squashed)
- 功耗runtime增加运动事件上报
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 优化产测读取心率id,优化读取老化测试标志
- 优化产测读取心率id,优化读取老化测试标志(补)
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 优化蓝牙产测马达测试,4G测试,优化心率初始化
Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1600
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
Merge #1586 into sdk602patch0911 from refs/changes/1586/head
修改button.c代码,合并更改
* refs/changes/1586/head: (2 commits squashed)
- 修改button.c代码,合并更改
- 获取投票结果接口修改
Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1586
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
Merge #1583 into sdk602patch0911 from refs/changes/1583/head
Code review from 罗正
* refs/changes/1583/head: (42 commits squashed)
- 表盘【大眼雀梅】
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 表盘市场【大眼雀梅】
- 表盘【柯基】
- 表盘【仰望】
- 表盘【绿叶】
- 表盘【黄昏】
- 表盘【小松鼠】
- 表盘【蜥蜴】
- 表盘【灯塔】
- 表盘【波斯猫】
- 表盘【都市夜色】
- 表盘【自然】
- 表盘【梅花鹿】
- 表盘【烟花】
- 表盘【粉树】
- 表盘【湖泊】
- 表盘【樱花】
- 表盘【蜗牛】
- 表盘【小鸭】
- 表盘【深潜】
- 表盘【波浪】
- 表盘市场【柯基】
- 表盘市场【仰望】
- 表盘市场【绿叶】
- 表盘市场【黄昏】
- 表盘市场【小松鼠】
- 表盘市场【蜥蜴】
- 表盘市场【灯塔】
- 表盘市场【波斯猫】
- 表盘市场【都市夜色】
- 表盘市场【自然】
- 表盘市场【梅花鹿】
- 表盘市场【烟花】
- 表盘市场【粉树】
- 表盘市场【湖泊】
- 表盘市场【樱花】
- 表盘市场【蜗牛】
- 表盘市场【小鸭】
- 表盘市场【深潜】
- 表盘市场【波浪】
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1583
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911