mirrors/FD230.git
2 years agoMerge #126 into xts_origin from refs/changes/126/head 127/target/1 128/target/1
胡传军 [Mon, 6 May 2024 06:55:24 +0000 (06:55 +0000)]
Merge #126 into xts_origin from refs/changes/126/head

Code review from 胡传军

* refs/changes/126/head: (6 commits squashed)

  - 将strtok改为strtok_r

  - 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

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

  - 增加蓝牙设置闹钟和获取闹钟

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/126
2 years ago修复表盘时间更新 124/1 124/head
Caisking [Mon, 6 May 2024 02:57:22 +0000 (10:57 +0800)]
修复表盘时间更新

2 years agoMerge #123 into xts_origin from refs/changes/123/head 124/target/1 126/target/1
邓雪英 [Mon, 6 May 2024 02:25:58 +0000 (02:25 +0000)]
Merge #123 into xts_origin from refs/changes/123/head

Code review from 邓雪英

* refs/changes/123/head: (6 commits squashed)

  -  解析协议相关内容

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

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

  - 查找手表弹窗对接协议已完成:声音与振动ui对接已完成 屏幕参数已完成

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

  - 还原文件修改bug

Signed-off-by: d15521469561 <1731678236@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/123
2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 122/1 122/head
Caisking [Mon, 6 May 2024 01:17:21 +0000 (09:17 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修复解绑bug
Caisking [Mon, 6 May 2024 01:17:06 +0000 (09:17 +0800)]
修复解绑bug

2 years agoMerge #119 into xts_origin from refs/changes/119/head 122/target/1 123/target/1
胡传军 [Thu, 2 May 2024 16:19:39 +0000 (16:19 +0000)]
Merge #119 into xts_origin from refs/changes/119/head

Code review from 胡传军

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

  - 将strtok改为strtok_r

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

  - 基础训练记录同步

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/119
2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 118/1 118/head
luozheng [Tue, 30 Apr 2024 10:17:42 +0000 (18:17 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修改震动模式适配app设置震动强度
luozheng [Tue, 30 Apr 2024 10:17:27 +0000 (18:17 +0800)]
修改震动模式适配app设置震动强度

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
Caisking [Tue, 30 Apr 2024 09:53:18 +0000 (17:53 +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... 117/2 117/head 118/target/1 119/target/1
penglei [Tue, 30 Apr 2024 06:49:45 +0000 (14:49 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_or

2 years agoMerge #114 into xts_origin from refs/changes/114/head 117/target/2
罗正 [Tue, 30 Apr 2024 06:36:29 +0000 (06:36 +0000)]
Merge #114 into xts_origin from refs/changes/114/head

Code review from 罗正

* refs/changes/114/head: (11 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

  - 修复下拉时间不更新问题

  - 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

  - 添加拨号方式Slice

  - 拨号视图修改,已测试通过sim卡拨号成功但发现喇叭不出声

  - 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/114
2 years agoMerge #116 into xts_origin from refs/changes/116/head
袁清梦 [Tue, 30 Apr 2024 06:35:54 +0000 (06:35 +0000)]
Merge #116 into xts_origin from refs/changes/116/head

Code review from 袁清梦

* refs/changes/116/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/116
2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 117/1
penglei [Tue, 30 Apr 2024 06:32:03 +0000 (14:32 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago统一cywee、磁力计、ppg的I2C通信接口,解决冲突问题。产测部分代码。
penglei [Tue, 30 Apr 2024 06:22:32 +0000 (14:22 +0800)]
统一cywee、磁力计、ppg的I2C通信接口,解决冲突问题。产测部分代码。

2 years ago实现第一次启动,需要实现弹窗切换语言的功能 114/2 114/head
luozheng [Tue, 30 Apr 2024 04:00:09 +0000 (12:00 +0800)]
实现第一次启动,需要实现弹窗切换语言的功能

2 years ago增加发送手表运动结束状态
Caisking [Tue, 30 Apr 2024 01:41:09 +0000 (09:41 +0800)]
增加发送手表运动结束状态

2 years ago更新运动状态协议发送条件 116/2 116/head
Caisking [Mon, 29 Apr 2024 12:13:37 +0000 (20:13 +0800)]
更新运动状态协议发送条件

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 116/1
Caisking [Mon, 29 Apr 2024 12:01:40 +0000 (20:01 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修复时间显示
Caisking [Mon, 29 Apr 2024 12:01:32 +0000 (20:01 +0800)]
修复时间显示

2 years ago修复码云里检测出的安全隐患 115/1 115/head
SnickerSun [Mon, 29 Apr 2024 10:47:35 +0000 (18:47 +0800)]
修复码云里检测出的安全隐患

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 114/1
luozheng [Mon, 29 Apr 2024 09:34:45 +0000 (17:34 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago拨号视图修改,已测试通过sim卡拨号成功但发现喇叭不出声
luozheng [Mon, 29 Apr 2024 09:28:13 +0000 (17:28 +0800)]
拨号视图修改,已测试通过sim卡拨号成功但发现喇叭不出声

2 years agoMerge #113 into xts_origin from refs/changes/113/head 114/target/1 115/target/1 116/target/1 117/target/1
邓雪英 [Mon, 29 Apr 2024 09:23:38 +0000 (09:23 +0000)]
Merge #113 into xts_origin from refs/changes/113/head

Code review from 邓雪英

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

  -  解析协议相关内容

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

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

Signed-off-by: d15521469561 <1731678236@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/113
2 years ago订正部分内存泄漏以及规范 110/4 110/head
Caisking [Mon, 29 Apr 2024 09:17:34 +0000 (17:17 +0800)]
订正部分内存泄漏以及规范

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 110/3
Caisking [Mon, 29 Apr 2024 08:36:47 +0000 (16:36 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago增加训练心率达到最高弹窗
Caisking [Mon, 29 Apr 2024 08:31:50 +0000 (16:31 +0800)]
增加训练心率达到最高弹窗

2 years ago删除不必要的文件
Caisking [Mon, 29 Apr 2024 07:30:10 +0000 (15:30 +0800)]
删除不必要的文件

2 years ago修复恢复出厂设置后 ConfigModel.json不会再次生成问题 110/target/2 112/2 112/head 113/target/1
SnickerSun [Mon, 29 Apr 2024 07:17:29 +0000 (15:17 +0800)]
修复恢复出厂设置后 ConfigModel.json不会再次生成问题

2 years ago删除不必要的文件
Caisking [Mon, 29 Apr 2024 07:06:41 +0000 (15:06 +0800)]
删除不必要的文件

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 112/1
SnickerSun [Mon, 29 Apr 2024 07:03:29 +0000 (15:03 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago更新cat1固件,增加at指令接口,修正协议中不一致的地方。cat1_server 兼容前后两种协议。
SnickerSun [Mon, 29 Apr 2024 07:02:38 +0000 (15:02 +0800)]
更新cat1固件,增加at指令接口,修正协议中不一致的地方。cat1_server 兼容前后两种协议。
同时释放最新cat1Service.py PY_SRV_V5 版本的cat1固件。EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240429-1457.zip

2 years agoMerge #111 into xts_origin from refs/changes/111/head 112/target/1
邓雪英 [Mon, 29 Apr 2024 06:52:50 +0000 (06:52 +0000)]
Merge #111 into xts_origin from refs/changes/111/head

Code review from 邓雪英

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

  -  解析协议相关内容

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

Signed-off-by: d15521469561 <1731678236@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/111
2 years agoMerge #108 into xts_origin from refs/changes/108/head
罗正 [Mon, 29 Apr 2024 06:48:54 +0000 (06:48 +0000)]
Merge #108 into xts_origin from refs/changes/108/head

Code review from 罗正

* refs/changes/108/head: (8 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

  - 修复下拉时间不更新问题

  - 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

  - 添加拨号方式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/108
2 years ago添加拨号方式Slice 108/2 108/head
luozheng [Mon, 29 Apr 2024 02:17:06 +0000 (10:17 +0800)]
添加拨号方式Slice

2 years ago蓝牙设置获取实时训练频率 110/2
Caisking [Sun, 28 Apr 2024 13:07:03 +0000 (21:07 +0800)]
蓝牙设置获取实时训练频率

2 years ago添加省电模式接口(暂不完善) 109/1 109/head
penglei [Sun, 28 Apr 2024 13:02:37 +0000 (21:02 +0800)]
添加省电模式接口(暂不完善)

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...
SnickerSun [Sun, 28 Apr 2024 12:57:20 +0000 (20:57 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago添加格式要求注释
SnickerSun [Sun, 28 Apr 2024 12:54:47 +0000 (20:54 +0800)]
添加格式要求注释

2 years agorecovery 升级提示图片更新
SnickerSun [Sun, 28 Apr 2024 12:53:59 +0000 (20:53 +0800)]
recovery 升级提示图片更新
image_tool 压缩参数
    /* 图片压缩参数如下:
       <imageRes compress="NONE" format="RGB888" align="16" tile="6"
                 alpha="0" rgb="0" autocmpmode="0" highqualitymode="0"
                 highcmpratiomode="0" ver="1">
       </imageRes>
    */

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 108/1
luozheng [Sun, 28 Apr 2024 10:08:20 +0000 (18:08 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago重构电话视图,解决主界面内存泄漏问题
luozheng [Sun, 28 Apr 2024 10:08:15 +0000 (18:08 +0800)]
重构电话视图,解决主界面内存泄漏问题

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 110/1
Caisking [Sun, 28 Apr 2024 09:13:34 +0000 (17:13 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修复蓝牙设置训练目标bug
Caisking [Sun, 28 Apr 2024 08:31:59 +0000 (16:31 +0800)]
修复蓝牙设置训练目标bug

2 years ago修复蓝牙读取心率bug
Caisking [Sun, 28 Apr 2024 08:31:11 +0000 (16:31 +0800)]
修复蓝牙读取心率bug

2 years ago补交恢复出厂设置 107/3 107/head 108/target/1 109/target/1 110/target/1 111/target/1
penglei [Sun, 28 Apr 2024 07:22:29 +0000 (15:22 +0800)]
补交恢复出厂设置

2 years ago增加蓝牙开启关闭获取获取实时数据;优化部分显示逻辑
Caisking [Sun, 28 Apr 2024 06:57:35 +0000 (14:57 +0800)]
增加蓝牙开启关闭获取获取实时数据;优化部分显示逻辑

2 years ago补交 107/2
penglei [Sun, 28 Apr 2024 06:46:32 +0000 (14:46 +0800)]
补交

2 years ago添加恢复出厂设置 107/1
penglei [Sun, 28 Apr 2024 06:40:22 +0000 (14:40 +0800)]
添加恢复出厂设置

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
luozheng [Sat, 27 Apr 2024 11:55:13 +0000 (19:55 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修复开启powerkey 3秒启动 修改未生效问题。 106/1 106/head 107/target/1
SnickerSun [Sat, 27 Apr 2024 11:54:58 +0000 (19:54 +0800)]
修复开启powerkey 3秒启动 修改未生效问题。

2 years ago产测中添加关闭蓝牙cat1进行睡眠电流测试的按钮
SnickerSun [Sat, 27 Apr 2024 11:54:14 +0000 (19:54 +0800)]
产测中添加关闭蓝牙cat1进行睡眠电流测试的按钮

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 105/1 105/head 106/target/1
Caisking [Sat, 27 Apr 2024 11:51:17 +0000 (19:51 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修复moamao表盘组件位置问题
Caisking [Sat, 27 Apr 2024 11:51:11 +0000 (19:51 +0800)]
修复moamao表盘组件位置问题

2 years ago勿扰模式同步主界面显示
Caisking [Sat, 27 Apr 2024 11:45:12 +0000 (19:45 +0800)]
勿扰模式同步主界面显示

2 years ago1、更新ota脚本,添加额外手动添加和删除的资源配置方案。测试颗正常添加删除文件,但带空格的文件仍然无法删除。 104/1 104/head 105/target/1
SnickerSun [Sat, 27 Apr 2024 11:21:09 +0000 (19:21 +0800)]
1、更新ota脚本,添加额外手动添加和删除的资源配置方案。测试颗正常添加删除文件,但带空格的文件仍然无法删除。
2、优化手表ota执行流程,ota更新第一次重启屏蔽掉系统UI,可直接进入第二次重启的recovery界面

2 years ago优化血氧驱动,解决血氧检测经常不出值的问题,优化心率血氧蓝牙服务。 103/1 103/head 104/target/1
penglei [Sat, 27 Apr 2024 11:05:04 +0000 (19:05 +0800)]
优化血氧驱动,解决血氧检测经常不出值的问题,优化心率血氧蓝牙服务。

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

2 years ago增加心率测试接口
Caisking [Sat, 27 Apr 2024 10:32:36 +0000 (18:32 +0800)]
增加心率测试接口

2 years agoMerge #101 into xts_origin from refs/changes/101/head 103/target/1
罗正 [Sat, 27 Apr 2024 10:20:11 +0000 (10:20 +0000)]
Merge #101 into xts_origin from refs/changes/101/head

Code review from 罗正

* refs/changes/101/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

  - 修复下拉时间不更新问题

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/101
2 years ago修复下拉时间不更新问题 101/2 101/head
luozheng [Sat, 27 Apr 2024 10:16:21 +0000 (18:16 +0800)]
修复下拉时间不更新问题

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 102/1 102/head
penglei [Sat, 27 Apr 2024 10:12:21 +0000 (18:12 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago添加心率血氧蓝牙服务
penglei [Sat, 27 Apr 2024 10:12:15 +0000 (18:12 +0800)]
添加心率血氧蓝牙服务

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 101/1
luozheng [Sat, 27 Apr 2024 09:57:29 +0000 (17:57 +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...
luozheng [Sat, 27 Apr 2024 09:54:22 +0000 (17:54 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago通过设置拦截函数优化连接状态视图的退出逻辑
luozheng [Sat, 27 Apr 2024 09:54:17 +0000 (17:54 +0800)]
通过设置拦截函数优化连接状态视图的退出逻辑

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 100/1 100/head 101/target/1 102/target/1
Caisking [Sat, 27 Apr 2024 09:47:04 +0000 (17:47 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修复表盘电量更新问题;需要更新表盘资源
Caisking [Sat, 27 Apr 2024 09:46:59 +0000 (17:46 +0800)]
修复表盘电量更新问题;需要更新表盘资源

2 years ago添加ble heartrate 服务 100/target/1 99/1 99/head
SnickerSun [Sat, 27 Apr 2024 09:21:46 +0000 (17:21 +0800)]
添加ble heartrate 服务

2 years ago优化动态心率 98/1 98/head 99/target/1
penglei [Sat, 27 Apr 2024 06:53:32 +0000 (14:53 +0800)]
优化动态心率

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 97/1 97/head 98/target/1
luozheng [Sat, 27 Apr 2024 06:36:25 +0000 (14:36 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago添加连接状态视图,通过在点击连接状态按钮进入
luozheng [Sat, 27 Apr 2024 06:35:16 +0000 (14:35 +0800)]
添加连接状态视图,通过在点击连接状态按钮进入

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 96/1 96/head 97/target/1
Caisking [Fri, 26 Apr 2024 10:38:41 +0000 (18:38 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修复时间戳错误更改为uint32;增加获取秒级时间戳函数
Caisking [Fri, 26 Apr 2024 10:38:30 +0000 (18:38 +0800)]
修复时间戳错误更改为uint32;增加获取秒级时间戳函数

2 years ago修复发送训练实时数据;修复设置训练面板死机bug;增加发送训练状态;
Caisking [Fri, 26 Apr 2024 10:03:15 +0000 (18:03 +0800)]
修复发送训练实时数据;修复设置训练面板死机bug;增加发送训练状态;

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 95/1 95/head 96/target/1
luozheng [Fri, 26 Apr 2024 09:51:51 +0000 (17:51 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago图片提交
luozheng [Fri, 26 Apr 2024 09:47:52 +0000 (17:47 +0800)]
图片提交

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 94/1 94/head 95/target/1
SnickerSun [Fri, 26 Apr 2024 09:44:07 +0000 (17:44 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #93 into xts_origin from refs/changes/93/head 94/target/1
snickersun@163.com [Fri, 26 Apr 2024 09:43:52 +0000 (09:43 +0000)]
Merge #93 into xts_origin from refs/changes/93/head

Code review from snickersun@163.com

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

  - 修复 插着充电线重启 充电检测无效问题

  - 临时默认开机开启Cat1 然后根据配置关闭或保持开启

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/93
2 years ago临时默认开机开启Cat1 然后根据配置关闭或保持开启 93/1 93/head
SnickerSun [Fri, 26 Apr 2024 09:42:09 +0000 (17:42 +0800)]
临时默认开机开启Cat1 然后根据配置关闭或保持开启

2 years ago修复 插着充电线重启 充电检测无效问题
SnickerSun [Fri, 26 Apr 2024 09:38:53 +0000 (17:38 +0800)]
修复 插着充电线重启 充电检测无效问题

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 92/1 92/head
luozheng [Fri, 26 Apr 2024 07:39:22 +0000 (15:39 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago 优化下拉控制中心,添加信号强度和4G图标显示
luozheng [Fri, 26 Apr 2024 07:37:44 +0000 (15:37 +0800)]
 优化下拉控制中心,添加信号强度和4G图标显示

2 years agoota脚本制作file资源查分支持 文件名带空格 91/1 91/head 92/target/1 93/target/1
SnickerSun [Fri, 26 Apr 2024 01:48:03 +0000 (09:48 +0800)]
ota脚本制作file资源查分支持 文件名带空格

2 years ago采用 lbs 跟踪二进制文件 90/1 90/head 91/target/1
SnickerSun [Fri, 26 Apr 2024 00:12:38 +0000 (08:12 +0800)]
采用 lbs 跟踪二进制文件

2 years ago修复mkota脚本自动更新fs ota包 89/1 89/head 90/target/1
SnickerSun [Thu, 25 Apr 2024 15:23:48 +0000 (23:23 +0800)]
修复mkota脚本自动更新fs ota包

2 years agoota包制作脚本自动添加fs data 打包
SnickerSun [Thu, 25 Apr 2024 14:48:36 +0000 (22:48 +0800)]
ota包制作脚本自动添加fs data 打包

2 years agoota生成脚本优化,目前支持使用gen_fs_otapkg.sh生成的需要更新的路径。 88/1 88/head 89/target/1
SnickerSun [Thu, 25 Apr 2024 13:50:59 +0000 (21:50 +0800)]
ota生成脚本优化,目前支持使用gen_fs_otapkg.sh生成的需要更新的路径。
后期还需优化自动 使用delete 文件列表

2 years agoMerge #85 into xts_origin from refs/changes/85/head 88/target/1
袁清梦 [Thu, 25 Apr 2024 12:55:06 +0000 (12:55 +0000)]
Merge #85 into xts_origin from refs/changes/85/head

Code review from 袁清梦

* refs/changes/85/head: (2 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/85
2 years ago删除带空格的图片 87/1 87/head
SnickerSun [Thu, 25 Apr 2024 12:52:25 +0000 (20:52 +0800)]
删除带空格的图片
添加gen_fs_otapkg.sh 生成针对某个版本到当前版本的修改内容

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 86/1 86/head 87/target/1
SnickerSun [Thu, 25 Apr 2024 11:04:40 +0000 (19:04 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修复cat1 version不更新问题
SnickerSun [Thu, 25 Apr 2024 11:04:32 +0000 (19:04 +0800)]
修复cat1 version不更新问题

2 years ago修复设备训练目标BUG 84/1 84/head 85/target/1 86/target/1
hcj [Thu, 25 Apr 2024 09:48:17 +0000 (17:48 +0800)]
修复设备训练目标BUG

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 83/1 83/head 84/target/1
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

2 years agoMerge #82 into xts_origin from refs/changes/82/head 83/target/1
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
2 years ago添加OTA升级UI提示,recovery里还只能是白屏。 82/1 82/head
SnickerSun [Thu, 25 Apr 2024 09:34:03 +0000 (17:34 +0800)]
添加OTA升级UI提示,recovery里还只能是白屏。

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 81/1 81/head
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

2 years ago蓝牙Slice增加蓝牙服务选项Sliceq
luozheng [Thu, 25 Apr 2024 08:21:49 +0000 (16:21 +0800)]
蓝牙Slice增加蓝牙服务选项Sliceq

2 years ago1、缩短按电源开机时间 80/1 80/head 81/target/1 82/target/1
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接口

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 77/4 77/head 80/target/1
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

2 years ago修改训练UI初始化接口 77/3
Caisking [Thu, 25 Apr 2024 02:56:45 +0000 (10:56 +0800)]
修改训练UI初始化接口