hcj [Thu, 25 Apr 2024 09:48:17 +0000 (17:48 +0800)]
修复设备训练目标BUG
SnickerSun [Thu, 25 Apr 2024 09:37:06 +0000 (17:37 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
snickersun@163.com [Thu, 25 Apr 2024 09:36:57 +0000 (09:36 +0000)]
Merge #82 into xts_origin from refs/changes/82/head
添加OTA升级UI提示，recovery里还只能是白屏。
* refs/changes/82/head: (1 commits squashed)
- 添加OTA升级UI提示，recovery里还只能是白屏。
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/82
SnickerSun [Thu, 25 Apr 2024 09:34:03 +0000 (17:34 +0800)]
添加OTA升级UI提示，recovery里还只能是白屏。
luozheng [Thu, 25 Apr 2024 08:29:27 +0000 (16:29 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Thu, 25 Apr 2024 08:21:49 +0000 (16:21 +0800)]
蓝牙Slice增加蓝牙服务选项Sliceq
SnickerSun [Thu, 25 Apr 2024 07:14:08 +0000 (15:14 +0800)]
1、缩短按电源开机时间
2、添加runtime 接口，供整个系统使用
3、优化cat1 消息解析，都移动到cat1_server里，直接修改runtime
4、优化工厂测试 cat1 测试接口
5、custom_utils添加thread terminal接口
Caisking [Thu, 25 Apr 2024 06:52:08 +0000 (14:52 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Thu, 25 Apr 2024 02:56:45 +0000 (10:56 +0800)]
修改训练UI初始化接口
hcj [Thu, 25 Apr 2024 02:41:49 +0000 (10:41 +0800)]
修复使用cjson时的内存泄露，添加蓝牙训练协议对接
Caisking [Thu, 25 Apr 2024 02:31:40 +0000 (10:31 +0800)]
修复head获取错误问题
Caisking [Thu, 25 Apr 2024 02:21:26 +0000 (10:21 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
罗正 [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
penglei [Thu, 25 Apr 2024 01:57:50 +0000 (09:57 +0800)]
低功耗优化，添加抬腕亮屏功能
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
luozheng [Thu, 25 Apr 2024 01:31:02 +0000 (09:31 +0800)]
修改设置视图中开关机icon，优化显示方式视图的退出方式，修改开关机视图的incon图标
Caisking [Wed, 24 Apr 2024 08:15:24 +0000 (16:15 +0800)]
训练实时数据发送
Caisking [Wed, 24 Apr 2024 07:49:16 +0000 (15:49 +0800)]
修复ble控制训练暂停和恢复
luozheng [Wed, 24 Apr 2024 06:29:25 +0000 (14:29 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Wed, 24 Apr 2024 06:28:31 +0000 (14:28 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Wed, 24 Apr 2024 06:23:36 +0000 (14:23 +0800)]
1.利用ConfigModel保存用户设置的VoLTE通话和运动识别开关状态。
2.解决运动识别视图右滑不退出问题。
3.删除系统视图中的4G能力开关并移动到网络与通话中。
Caisking [Wed, 24 Apr 2024 03:35:48 +0000 (11:35 +0800)]
增加心率检测接口
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
hcj [Wed, 24 Apr 2024 02:57:17 +0000 (10:57 +0800)]
添加开机升级自动上报升级结果
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
SnickerSun [Wed, 24 Apr 2024 02:16:20 +0000 (10:16 +0800)]
恢复acc sensor和cat1的 中断脚配置
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数据进行传输及显示
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
罗正 [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 '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
- 修改设置视图以适配多国语言
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
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
Caisking [Tue, 23 Apr 2024 12:30:46 +0000 (20:30 +0800)]
Add OpenState
luozheng [Tue, 23 Apr 2024 11:31:43 +0000 (19:31 +0800)]
修改设置视图以适配多国语言
luozheng [Tue, 23 Apr 2024 11:19:01 +0000 (19:19 +0800)]
增加运动识别Slice
hcj [Tue, 23 Apr 2024 10:13:46 +0000 (18:13 +0800)]
升级包下载，及升级结果上报
Caisking [Tue, 23 Apr 2024 09:48:32 +0000 (17:48 +0800)]
修复训练时长数据处理bug
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
luozheng [Tue, 23 Apr 2024 09:16:30 +0000 (17:16 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Tue, 23 Apr 2024 09:16:22 +0000 (17:16 +0800)]
添加移动数据选项页面
Caisking [Tue, 23 Apr 2024 08:48:40 +0000 (16:48 +0800)]
增加信息通知Slice到Applist
Caisking [Tue, 23 Apr 2024 08:41:10 +0000 (16:41 +0800)]
增加UIComponents文件
hcj [Tue, 23 Apr 2024 08:27:27 +0000 (16:27 +0800)]
http post完善
luozheng [Tue, 23 Apr 2024 07:12:52 +0000 (15:12 +0800)]
VoLTE，移动数据按钮增加点击监听
Caisking [Tue, 23 Apr 2024 07:03:56 +0000 (15:03 +0800)]
无训练记录UI
luozheng [Tue, 23 Apr 2024 06:41:03 +0000 (14:41 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Tue, 23 Apr 2024 06:37:45 +0000 (14:37 +0800)]
1.设置中增加网络与通话Slice,显示方式Slice去除快速访问Slice
2.修改多国语言适配设置界面
3.增加网络与通话界面图片
hcj [Tue, 23 Apr 2024 02:32:13 +0000 (10:32 +0800)]
蓝牙控制训练修改
hcj [Tue, 23 Apr 2024 02:28:26 +0000 (10:28 +0800)]
http使用post方法
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
SnickerSun [Mon, 22 Apr 2024 13:29:33 +0000 (21:29 +0800)]
解决编译问题
彭磊 [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 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- Merge branch 'xts_origin' 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
罗正 [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 'xts_origin' 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
penglei [Mon, 22 Apr 2024 13:06:24 +0000 (21:06 +0800)]
添加cywee中断模式读取数据（暂时不可用）
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
luozheng [Mon, 22 Apr 2024 12:48:27 +0000 (20:48 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Mon, 22 Apr 2024 12:48:17 +0000 (20:48 +0800)]
增加震动提醒功能
Caisking [Mon, 22 Apr 2024 11:49:37 +0000 (19:49 +0800)]
修改训练蓝牙数据打印
Caisking [Mon, 22 Apr 2024 11:26:42 +0000 (19:26 +0800)]
修复训练数据文件名@hcj
Caisking [Mon, 22 Apr 2024 10:35:36 +0000 (18:35 +0800)]
优化TrainingModel部分函数，实现训练数据存储
Caisking [Mon, 22 Apr 2024 08:28:19 +0000 (16:28 +0800)]
训练结果增加步数
Caisking [Mon, 22 Apr 2024 07:26:33 +0000 (15:26 +0800)]
训练结束同步训练类型Icon
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
袁清梦 [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 'xts_origin' 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
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
Caisking [Mon, 22 Apr 2024 03:59:18 +0000 (11:59 +0800)]
优化训练蓝牙控制接口
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
luozheng [Mon, 22 Apr 2024 03:45:29 +0000 (11:45 +0800)]
增加静音模式开关
Caisking [Mon, 22 Apr 2024 03:42:21 +0000 (11:42 +0800)]
同步训练强度数据
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
彭磊 [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
胡传军 [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
penglei [Mon, 22 Apr 2024 02:55:30 +0000 (10:55 +0800)]
解决佩戴模式系统不能休眠的问题
hcj [Mon, 22 Apr 2024 02:53:24 +0000 (10:53 +0800)]
修改通讯录为固定长度读取，增加异常判断
luozheng [Mon, 22 Apr 2024 02:09:24 +0000 (10:09 +0800)]
将用户设置系统音量和通话音量保存在ConfigModel中
SnickerSun [Sun, 21 Apr 2024 15:52:37 +0000 (23:52 +0800)]
暂时关闭佩戴检测，解决系统不休眠问题
去除部分不必要的日志
SnickerSun [Sun, 21 Apr 2024 14:29:14 +0000 (22:29 +0800)]
lwip添加tcp tls支持 ，修改AT^DOWNLOADOTA指令尝试支持https下载
Caisking [Sun, 21 Apr 2024 08:43:14 +0000 (16:43 +0800)]
恢复修改
Caisking [Sun, 21 Apr 2024 08:27:25 +0000 (16:27 +0800)]
修复格式化的提交
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
SnickerSun [Sun, 21 Apr 2024 08:01:36 +0000 (16:01 +0800)]
修复编译问题
SnickerSun [Sun, 21 Apr 2024 00:40:36 +0000 (08:40 +0800)]
提交智汇视讯的支付宝配置
Caisking [Fri, 19 Apr 2024 13:43:50 +0000 (21:43 +0800)]
修复训练卡片弹窗亮屏
luozheng [Fri, 19 Apr 2024 13:37:40 +0000 (21:37 +0800)]
解决调整声音不起作用问题
Caisking [Fri, 19 Apr 2024 13:13:05 +0000 (21:13 +0800)]
搭建训练强度接口
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
luozheng [Fri, 19 Apr 2024 12:46:23 +0000 (20:46 +0800)]
添加通话音量和系统音量，并将其声音调整放进线程中
Caisking [Fri, 19 Apr 2024 12:45:42 +0000 (20:45 +0800)]
解决界面析构问题
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
Caisking [Fri, 19 Apr 2024 12:32:45 +0000 (20:32 +0800)]
删除原训练达到目标弹窗Slice；修复bug
penglei [Fri, 19 Apr 2024 12:20:18 +0000 (20:20 +0800)]
修改开关抬腕亮屏
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
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
Caisking [Fri, 19 Apr 2024 10:31:04 +0000 (18:31 +0800)]
设置训练目标达标弹窗，测试弹窗功能成功
问题：
设置目标的GetIndex的组件函数没有生效
亮屏函数没有生效
彭磊 [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
penglei [Fri, 19 Apr 2024 10:07:41 +0000 (18:07 +0800)]
优化运动切换与静态模式切换，优化动态心率计算，添加抬腕亮屏开关
DXY [Fri, 19 Apr 2024 10:04:05 +0000 (18:04 +0800)]
1.优化支付宝和ble服务之间控制的流程 2.暂时不需要切换广播数据
luozheng [Fri, 19 Apr 2024 09:15:07 +0000 (17:15 +0800)]
将通话音量CALL_VOLUME_MAX从15调整为100
luozheng [Fri, 19 Apr 2024 07:06:03 +0000 (15:06 +0800)]
优化声音与设置视图
hcj [Fri, 19 Apr 2024 03:49:25 +0000 (11:49 +0800)]
蓝牙设置用户数据设置获取步数目标及添加通讯录读取到开关机
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
Caisking [Fri, 19 Apr 2024 02:00:49 +0000 (10:00 +0800)]
优化佩戴模式切换@penglei
projects / mirrors / FD230.git / log