mirrors/FD230.git
2 years ago修复使用cjson时的内存泄露,添加蓝牙训练协议对接 77/target/3 79/1 79/head
hcj [Thu, 25 Apr 2024 02:41:49 +0000 (10:41 +0800)]
修复使用cjson时的内存泄露,添加蓝牙训练协议对接

2 years agoMerge #76 into xts_origin from refs/changes/76/head 77/target/2 79/target/1
罗正 [Thu, 25 Apr 2024 02:13:33 +0000 (02:13 +0000)]
Merge #76 into xts_origin from refs/changes/76/head

Code review from 罗正

* refs/changes/76/head: (12 commits squashed)

  - 增加震动提醒功能

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

  - 1.设置中增加网络与通话Slice,显示方式Slice去除快速访问Slice
    2.修改多国语言适配设置界面
    3.增加网络与通话界面图片

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

  - VoLTE,移动数据按钮增加点击监听

  - 添加移动数据选项页面

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

  - 增加运动识别Slice

  - 修改设置视图以适配多国语言

  - 1.利用ConfigModel保存用户设置的VoLTE通话和运动识别开关状态。
    2.解决运动识别视图右滑不退出问题。
    3.删除系统视图中的4G能力开关并移动到网络与通话中。

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

  - 修改设置视图中开关机icon,优化显示方式视图的退出方式,修改开关机视图的incon图标

Signed-off-by: 罗正 <1732036298@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/76
2 years ago低功耗优化,添加抬腕亮屏功能 78/1 78/head
penglei [Thu, 25 Apr 2024 01:57:50 +0000 (09:57 +0800)]
低功耗优化,添加抬腕亮屏功能

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
penglei [Thu, 25 Apr 2024 01:50:31 +0000 (09:50 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 75/1 75/head 76/target/1 77/target/1 78/target/1
hcj [Wed, 24 Apr 2024 02:57:45 +0000 (10:57 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago添加开机升级自动上报升级结果
hcj [Wed, 24 Apr 2024 02:57:17 +0000 (10:57 +0800)]
添加开机升级自动上报升级结果

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
penglei [Wed, 24 Apr 2024 02:33:11 +0000 (10:33 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago恢复acc sensor和cat1的 中断脚配置 74/2 74/head 75/target/1
SnickerSun [Wed, 24 Apr 2024 02:16:20 +0000 (10:16 +0800)]
恢复acc sensor和cat1的 中断脚配置

2 years ago1、优化产测流程,about,gsensor, magsensor 74/1
SnickerSun [Wed, 24 Apr 2024 01:56:34 +0000 (09:56 +0800)]
1、优化产测流程,about,gsensor, magsensor
2、cywee优化,采用中断读取数据
3、ppg和mag service 根据设备是否存在决定是否启动服务
4、cat1 所有timer处理移到timer中断外执行。
5、acc 采用float数据进行传输及显示

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 72/3 72/head 74/target/1
Caisking [Wed, 24 Apr 2024 01:42:12 +0000 (09:42 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #71 into xts_origin from refs/changes/71/head 72/target/2
罗正 [Wed, 24 Apr 2024 01:37:25 +0000 (01:37 +0000)]
Merge #71 into xts_origin from refs/changes/71/head

Code review from 罗正

* refs/changes/71/head: (9 commits squashed)

  - 增加震动提醒功能

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

  - 1.设置中增加网络与通话Slice,显示方式Slice去除快速访问Slice
    2.修改多国语言适配设置界面
    3.增加网络与通话界面图片

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

  - VoLTE,移动数据按钮增加点击监听

  - 添加移动数据选项页面

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

  - 增加运动识别Slice

  - 修改设置视图以适配多国语言

Signed-off-by: 罗正 <1732036298@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/71
2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
penglei [Wed, 24 Apr 2024 01:26:46 +0000 (09:26 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoAdd OpenState 72/2
Caisking [Tue, 23 Apr 2024 12:30:46 +0000 (20:30 +0800)]
Add OpenState

2 years ago升级包下载,及升级结果上报 73/1 73/head
hcj [Tue, 23 Apr 2024 10:13:46 +0000 (18:13 +0800)]
升级包下载,及升级结果上报

2 years ago修复训练时长数据处理bug 72/1
Caisking [Tue, 23 Apr 2024 09:48:32 +0000 (17:48 +0800)]
修复训练时长数据处理bug

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
Caisking [Tue, 23 Apr 2024 09:21:14 +0000 (17:21 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago增加信息通知Slice到Applist
Caisking [Tue, 23 Apr 2024 08:48:40 +0000 (16:48 +0800)]
增加信息通知Slice到Applist

2 years ago增加UIComponents文件
Caisking [Tue, 23 Apr 2024 08:41:10 +0000 (16:41 +0800)]
增加UIComponents文件

2 years agohttp post完善 70/2 70/head 71/target/1 72/target/1 73/target/1
hcj [Tue, 23 Apr 2024 08:27:27 +0000 (16:27 +0800)]
http post完善

2 years ago无训练记录UI
Caisking [Tue, 23 Apr 2024 07:03:56 +0000 (15:03 +0800)]
无训练记录UI

2 years ago蓝牙控制训练修改 70/1
hcj [Tue, 23 Apr 2024 02:32:13 +0000 (10:32 +0800)]
蓝牙控制训练修改

2 years agohttp使用post方法
hcj [Tue, 23 Apr 2024 02:28:26 +0000 (10:28 +0800)]
http使用post方法

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...
hcj [Tue, 23 Apr 2024 02:27:02 +0000 (10:27 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago解决编译问题 69/1 69/head 70/target/1
SnickerSun [Mon, 22 Apr 2024 13:29:33 +0000 (21:29 +0800)]
解决编译问题

2 years agoMerge #68 into xts_origin from refs/changes/68/head 69/target/1
彭磊 [Mon, 22 Apr 2024 13:12:22 +0000 (13:12 +0000)]
Merge #68 into xts_origin from refs/changes/68/head

Code review from 彭磊

* refs/changes/68/head: (4 commits squashed)

  - 解决佩戴模式系统不能休眠的问题

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

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

  - 添加cywee中断模式读取数据(暂时不可用)

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/68
2 years agoMerge #67 into xts_origin from refs/changes/67/head
罗正 [Mon, 22 Apr 2024 13:08:01 +0000 (13:08 +0000)]
Merge #67 into xts_origin from refs/changes/67/head

Code review from 罗正

* refs/changes/67/head: (2 commits squashed)

  - 增加震动提醒功能

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

Signed-off-by: 罗正 <1732036298@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/67
2 years ago添加cywee中断模式读取数据(暂时不可用) 68/1 68/head
penglei [Mon, 22 Apr 2024 13:06:24 +0000 (21:06 +0800)]
添加cywee中断模式读取数据(暂时不可用)

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
penglei [Mon, 22 Apr 2024 13:00:37 +0000 (21:00 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修改训练蓝牙数据打印 66/3 66/head
Caisking [Mon, 22 Apr 2024 11:49:37 +0000 (19:49 +0800)]
修改训练蓝牙数据打印

2 years ago修复训练数据文件名@hcj
Caisking [Mon, 22 Apr 2024 11:26:42 +0000 (19:26 +0800)]
修复训练数据文件名@hcj

2 years ago优化TrainingModel部分函数,实现训练数据存储 66/2
Caisking [Mon, 22 Apr 2024 10:35:36 +0000 (18:35 +0800)]
优化TrainingModel部分函数,实现训练数据存储

2 years ago训练结果增加步数
Caisking [Mon, 22 Apr 2024 08:28:19 +0000 (16:28 +0800)]
训练结果增加步数

2 years ago训练结束同步训练类型Icon 66/1
Caisking [Mon, 22 Apr 2024 07:26:33 +0000 (15:26 +0800)]
训练结束同步训练类型Icon

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
Caisking [Mon, 22 Apr 2024 06:23:32 +0000 (14:23 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #65 into xts_origin from refs/changes/65/head 66/target/1 67/target/1 68/target/1
袁清梦 [Mon, 22 Apr 2024 04:03:56 +0000 (04:03 +0000)]
Merge #65 into xts_origin from refs/changes/65/head

Code review from 袁清梦

* refs/changes/65/head: (3 commits squashed)

  - 同步训练强度数据

  - 优化训练蓝牙控制接口

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

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/65
2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 65/1 65/head
Caisking [Mon, 22 Apr 2024 03:59:26 +0000 (11:59 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago优化训练蓝牙控制接口
Caisking [Mon, 22 Apr 2024 03:59:18 +0000 (11:59 +0800)]
优化训练蓝牙控制接口

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 64/1 64/head
luozheng [Mon, 22 Apr 2024 03:45:37 +0000 (11:45 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago增加静音模式开关
luozheng [Mon, 22 Apr 2024 03:45:29 +0000 (11:45 +0800)]
增加静音模式开关

2 years ago同步训练强度数据
Caisking [Mon, 22 Apr 2024 03:42:21 +0000 (11:42 +0800)]
同步训练强度数据

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
penglei [Mon, 22 Apr 2024 03:40:34 +0000 (11:40 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #63 into xts_origin from refs/changes/63/head 64/target/1 65/target/1
彭磊 [Mon, 22 Apr 2024 03:37:42 +0000 (03:37 +0000)]
Merge #63 into xts_origin from refs/changes/63/head

解决佩戴模式系统不能休眠的问题

* refs/changes/63/head: (1 commits squashed)

  - 解决佩戴模式系统不能休眠的问题

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/63
2 years agoMerge #62 into xts_origin from refs/changes/62/head
胡传军 [Mon, 22 Apr 2024 03:37:16 +0000 (03:37 +0000)]
Merge #62 into xts_origin from refs/changes/62/head

修改通讯录为固定长度读取,增加异常判断

* refs/changes/62/head: (1 commits squashed)

  - 修改通讯录为固定长度读取,增加异常判断

Signed-off-by: aliyun8003852482 <1224667075@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/62
2 years ago解决佩戴模式系统不能休眠的问题 63/1 63/head
penglei [Mon, 22 Apr 2024 02:55:30 +0000 (10:55 +0800)]
解决佩戴模式系统不能休眠的问题

2 years ago修改通讯录为固定长度读取,增加异常判断 62/1 62/head
hcj [Mon, 22 Apr 2024 02:53:24 +0000 (10:53 +0800)]
修改通讯录为固定长度读取,增加异常判断

2 years ago将用户设置系统音量和通话音量保存在ConfigModel中 61/1 61/head
luozheng [Mon, 22 Apr 2024 02:09:24 +0000 (10:09 +0800)]
将用户设置系统音量和通话音量保存在ConfigModel中

2 years ago暂时关闭佩戴检测,解决系统不休眠问题 60/1 60/head 61/target/1 62/target/1 63/target/1
SnickerSun [Sun, 21 Apr 2024 15:52:37 +0000 (23:52 +0800)]
暂时关闭佩戴检测,解决系统不休眠问题
去除部分不必要的日志

2 years agolwip添加tcp tls支持 ,修改AT^DOWNLOADOTA指令尝试支持https下载
SnickerSun [Sun, 21 Apr 2024 14:29:14 +0000 (22:29 +0800)]
lwip添加tcp tls支持 ,修改AT^DOWNLOADOTA指令尝试支持https下载

2 years ago恢复修改 56/7 56/head 60/target/1
Caisking [Sun, 21 Apr 2024 08:43:14 +0000 (16:43 +0800)]
恢复修改

2 years ago修复格式化的提交 56/6
Caisking [Sun, 21 Apr 2024 08:27:25 +0000 (16:27 +0800)]
修复格式化的提交

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 56/5
Caisking [Sun, 21 Apr 2024 08:10:46 +0000 (16:10 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修复编译问题 56/target/2 59/1 59/head
SnickerSun [Sun, 21 Apr 2024 08:01:36 +0000 (16:01 +0800)]
修复编译问题

2 years ago提交智汇视讯的支付宝配置 58/1 58/head 59/target/1
SnickerSun [Sun, 21 Apr 2024 00:40:36 +0000 (08:40 +0800)]
提交智汇视讯的支付宝配置

2 years ago修复训练卡片弹窗亮屏 56/4
Caisking [Fri, 19 Apr 2024 13:43:50 +0000 (21:43 +0800)]
修复训练卡片弹窗亮屏

2 years ago解决调整声音不起作用问题 57/2 57/head 58/target/1
luozheng [Fri, 19 Apr 2024 13:37:40 +0000 (21:37 +0800)]
解决调整声音不起作用问题

2 years ago搭建训练强度接口 56/3
Caisking [Fri, 19 Apr 2024 13:13:05 +0000 (21:13 +0800)]
搭建训练强度接口

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 57/1
luozheng [Fri, 19 Apr 2024 13:08:40 +0000 (21:08 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago添加通话音量和系统音量,并将其声音调整放进线程中
luozheng [Fri, 19 Apr 2024 12:46:23 +0000 (20:46 +0800)]
添加通话音量和系统音量,并将其声音调整放进线程中

2 years ago解决界面析构问题 56/2
Caisking [Fri, 19 Apr 2024 12:45:42 +0000 (20:45 +0800)]
解决界面析构问题

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 56/1
Caisking [Fri, 19 Apr 2024 12:32:54 +0000 (20:32 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago删除原训练达到目标弹窗Slice;修复bug
Caisking [Fri, 19 Apr 2024 12:32:45 +0000 (20:32 +0800)]
删除原训练达到目标弹窗Slice;修复bug

2 years ago修改开关抬腕亮屏 55/1 55/head 56/target/1 57/target/1
penglei [Fri, 19 Apr 2024 12:20:18 +0000 (20:20 +0800)]
修改开关抬腕亮屏

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
penglei [Fri, 19 Apr 2024 11:48:22 +0000 (19:48 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 54/1 54/head 55/target/1
Caisking [Fri, 19 Apr 2024 10:31:08 +0000 (18:31 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago设置训练目标达标弹窗,测试弹窗功能成功
Caisking [Fri, 19 Apr 2024 10:31:04 +0000 (18:31 +0800)]
设置训练目标达标弹窗,测试弹窗功能成功
问题:
设置目标的GetIndex的组件函数没有生效
亮屏函数没有生效

2 years agoMerge #53 into xts_origin from refs/changes/53/head 54/target/1
彭磊 [Fri, 19 Apr 2024 10:11:44 +0000 (10:11 +0000)]
Merge #53 into xts_origin from refs/changes/53/head

优化运动切换与静态模式切换,优化动态心率计算,添加抬腕亮屏开关

* refs/changes/53/head: (1 commits squashed)

  - 优化运动切换与静态模式切换,优化动态心率计算,添加抬腕亮屏开关

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/53
2 years ago优化运动切换与静态模式切换,优化动态心率计算,添加抬腕亮屏开关 53/1 53/head
penglei [Fri, 19 Apr 2024 10:07:41 +0000 (18:07 +0800)]
优化运动切换与静态模式切换,优化动态心率计算,添加抬腕亮屏开关

2 years ago1.优化支付宝和ble服务之间控制的流程 2.暂时不需要切换广播数据 52/1 52/head
DXY [Fri, 19 Apr 2024 10:04:05 +0000 (18:04 +0800)]
1.优化支付宝和ble服务之间控制的流程 2.暂时不需要切换广播数据

2 years ago将通话音量CALL_VOLUME_MAX从15调整为100
luozheng [Fri, 19 Apr 2024 09:15:07 +0000 (17:15 +0800)]
将通话音量CALL_VOLUME_MAX从15调整为100

2 years ago优化声音与设置视图
luozheng [Fri, 19 Apr 2024 07:06:03 +0000 (15:06 +0800)]
优化声音与设置视图

2 years ago蓝牙设置用户数据设置获取步数目标及添加通讯录读取到开关机 51/1 51/head 52/target/1 53/target/1
hcj [Fri, 19 Apr 2024 03:49:25 +0000 (11:49 +0800)]
蓝牙设置用户数据设置获取步数目标及添加通讯录读取到开关机

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...
hcj [Fri, 19 Apr 2024 03:29:06 +0000 (11:29 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago优化佩戴模式切换@penglei 50/1 50/head 51/target/1
Caisking [Fri, 19 Apr 2024 02:00:49 +0000 (10:00 +0800)]
优化佩戴模式切换@penglei

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
Caisking [Fri, 19 Apr 2024 01:54:43 +0000 (09:54 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago打开支付UI控制广播接口 49/1 49/head 50/target/1
DXY [Fri, 19 Apr 2024 01:52:36 +0000 (09:52 +0800)]
打开支付UI控制广播接口

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
Caisking [Fri, 19 Apr 2024 01:31:22 +0000 (09:31 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago增加训练控制蓝牙协议接口
Caisking [Fri, 19 Apr 2024 01:29:16 +0000 (09:29 +0800)]
增加训练控制蓝牙协议接口

2 years ago1、由于插vbus重启无法检测vbus存在,临时取消关闭充电的步骤。 48/1 48/head 49/target/1
SnickerSun [Fri, 19 Apr 2024 01:04:35 +0000 (09:04 +0800)]
1、由于插vbus重启无法检测vbus存在,临时取消关闭充电的步骤。
2、更新邓工的蓝牙相关提交,alipay和bleService共存。
3、启动常亮时间从25秒改为15秒

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...
SnickerSun [Thu, 18 Apr 2024 13:08:26 +0000 (21:08 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #46 into xts_origin from refs/changes/46/head 48/target/1
罗正 [Thu, 18 Apr 2024 12:45:56 +0000 (12:45 +0000)]
Merge #46 into xts_origin from refs/changes/46/head

Code review from 罗正

* refs/changes/46/head: (4 commits squashed)

  - 添加抬腕亮屏功能

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

  - 修改声音与震动视图

  - 修改天气视图:解决天气子地区显示错误问题

Signed-off-by: 罗正 <1732036298@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/46
2 years ago修改天气视图:解决天气子地区显示错误问题 46/3 46/head
luozheng [Thu, 18 Apr 2024 10:46:23 +0000 (18:46 +0800)]
修改天气视图:解决天气子地区显示错误问题

2 years ago修改声音与震动视图 46/2
luozheng [Thu, 18 Apr 2024 10:28:19 +0000 (18:28 +0800)]
修改声音与震动视图

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 42/2 42/head
Caisking [Thu, 18 Apr 2024 09:25:04 +0000 (17:25 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago实现训练目标类型以及训练目标数据传递
Caisking [Thu, 18 Apr 2024 09:25:00 +0000 (17:25 +0800)]
实现训练目标类型以及训练目标数据传递

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 46/1
luozheng [Thu, 18 Apr 2024 08:44:08 +0000 (16:44 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago添加抬腕亮屏功能
luozheng [Thu, 18 Apr 2024 08:43:58 +0000 (16:43 +0800)]
添加抬腕亮屏功能

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...
hcj [Thu, 18 Apr 2024 08:22:45 +0000 (16:22 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...
SnickerSun [Thu, 18 Apr 2024 08:16:50 +0000 (16:16 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #45 into xts_origin from refs/changes/45/head 42/target/2 46/target/1 47/target/1
snickersun@163.com [Thu, 18 Apr 2024 08:16:33 +0000 (08:16 +0000)]
Merge #45 into xts_origin from refs/changes/45/head

Code review from snickersun@163.com

* refs/changes/45/head: (4 commits squashed)

  - 添加custom_cmd_service task,解决cat1 开机后cat1 Vote 无法消除的问题。

  - 修改acc 25Hz 让系统可以休眠

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

  - 修复ppg与cywee算法冲突问题

Signed-off-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.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/45
2 years ago修复ppg与cywee算法冲突问题 45/1 45/head
SnickerSun [Thu, 18 Apr 2024 08:15:47 +0000 (16:15 +0800)]
修复ppg与cywee算法冲突问题

2 years ago优化目标设置界面交互
Caisking [Thu, 18 Apr 2024 08:01:30 +0000 (16:01 +0800)]
优化目标设置界面交互

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
Caisking [Thu, 18 Apr 2024 07:50:51 +0000 (15:50 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago增加设置步数SubView,删除原Slice
Caisking [Thu, 18 Apr 2024 07:50:44 +0000 (15:50 +0800)]
增加设置步数SubView,删除原Slice

2 years ago添加蓝牙产测通讯录功能 44/1 44/head
penglei [Thu, 18 Apr 2024 07:42:35 +0000 (15:42 +0800)]
添加蓝牙产测通讯录功能

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...
SnickerSun [Thu, 18 Apr 2024 07:39:43 +0000 (15:39 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #43 into xts_origin from refs/changes/43/head 44/target/1 45/target/1
snickersun@163.com [Thu, 18 Apr 2024 07:39:21 +0000 (07:39 +0000)]
Merge #43 into xts_origin from refs/changes/43/head

Code review from snickersun@163.com

* refs/changes/43/head: (2 commits squashed)

  - 添加custom_cmd_service task,解决cat1 开机后cat1 Vote 无法消除的问题。

  - 修改acc 25Hz 让系统可以休眠

Signed-off-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.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/43
2 years ago修改acc 25Hz 让系统可以休眠 43/1 43/head
SnickerSun [Thu, 18 Apr 2024 07:37:05 +0000 (15:37 +0800)]
修改acc 25Hz 让系统可以休眠

2 years ago增加距离设置SubView,删除原Slice 42/1
Caisking [Thu, 18 Apr 2024 07:30:11 +0000 (15:30 +0800)]
增加距离设置SubView,删除原Slice

2 years ago添加custom_cmd_service task,解决cat1 开机后cat1 Vote 无法消除的问题。
SnickerSun [Thu, 18 Apr 2024 07:26:39 +0000 (15:26 +0800)]
添加custom_cmd_service task,解决cat1 开机后cat1 Vote 无法消除的问题。

2 years ago设置目标界面增加步数以及距离
Caisking [Thu, 18 Apr 2024 07:09:12 +0000 (15:09 +0800)]
设置目标界面增加步数以及距离