mirrors/FD230.git
2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 140/2 140/head 143/target/1 144/target/1
luozheng [Wed, 8 May 2024 02:55:29 +0000 (10:55 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #139 into xts_origin from refs/changes/139/head 140/target/2
袁清梦 [Wed, 8 May 2024 02:35:04 +0000 (02:35 +0000)]
Merge #139 into xts_origin from refs/changes/139/head

Code review from 袁清梦

* refs/changes/139/head: (16 commits squashed)

  - 替换结构体成员变量

  - 更新多国语言xml以及font文件

  - 更新训练Slice的多国语言配置

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

  - 优化设置训练频率

  - 适配心率Slice多国语言

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

  - 多国语言支持变量适配(updateLabel)

  - 增加佩戴状态下的无效数控制

  - 更新字体文件

  - 优化心率血氧time的更新显示逻辑

  - 适配血氧Slice多国语言

  - 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

  - 适配信息通知Slice多国语言

  - 适配训练记录Slice多国语言

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/139
2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
luozheng [Wed, 8 May 2024 01:07:32 +0000 (09:07 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修复cat1时间同步错误。 141/1 141/head 142/target/1
SnickerSun [Tue, 7 May 2024 14:58:45 +0000 (22:58 +0800)]
修复cat1时间同步错误。
优化httpclient 下载

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 140/1
luozheng [Tue, 7 May 2024 12:13:34 +0000 (20:13 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago增加系统更新icon显示
luozheng [Tue, 7 May 2024 12:13:03 +0000 (20:13 +0800)]
增加系统更新icon显示

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 138/1 138/head 139/target/1 140/target/1 141/target/1
SnickerSun [Tue, 7 May 2024 11:11:48 +0000 (19:11 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #137 into xts_origin from refs/changes/137/head 138/target/1
snickersun@163.com [Tue, 7 May 2024 11:11:32 +0000 (11:11 +0000)]
Merge #137 into xts_origin from refs/changes/137/head

更改升级服务器为 snicker.com.cn,去掉cat1里过多的日志,优化lwip参数

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

  - 更改升级服务器为 snicker.com.cn,去掉cat1里过多的日志,优化lwip参数

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/137
2 years ago更改升级服务器为 snicker.com.cn,去掉cat1里过多的日志,优化lwip参数 137/1 137/head
SnickerSun [Tue, 7 May 2024 11:08:22 +0000 (19:08 +0800)]
更改升级服务器为 snicker.com.cn,去掉cat1里过多的日志,优化lwip参数

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 136/1 136/head
DXY [Tue, 7 May 2024 09:31:12 +0000 (17:31 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago解绑 绑定界面加名字显示: 修复解绑界面死机问题:补充用户数据协议增加字段
DXY [Tue, 7 May 2024 09:31:07 +0000 (17:31 +0800)]
解绑 绑定界面加名字显示: 修复解绑界面死机问题:补充用户数据协议增加字段

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
luozheng [Tue, 7 May 2024 09:25:55 +0000 (17:25 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago添加系统更新Slice
luozheng [Tue, 7 May 2024 09:23:43 +0000 (17:23 +0800)]
添加系统更新Slice

2 years ago修改系统升级bug 135/1 135/head 136/target/1 137/target/1
hcj_ [Tue, 7 May 2024 07:14:05 +0000 (15:14 +0800)]
修改系统升级bug

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 134/1 134/head 135/target/1
luozheng [Tue, 7 May 2024 02:56:41 +0000 (10:56 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修改恢复出厂设置视图适配多国语言
luozheng [Tue, 7 May 2024 02:50:16 +0000 (10:50 +0800)]
修改恢复出厂设置视图适配多国语言

2 years ago优化ota升级界面,保证下载时cat1不休眠,且随时可以退出界面。 133/1 133/head 134/target/1
SnickerSun [Tue, 7 May 2024 02:20:14 +0000 (10:20 +0800)]
优化ota升级界面,保证下载时cat1不休眠,且随时可以退出界面。
优化http_client,支持下载文件进度提醒。
修复at下载指令。

2 years ago开启Cat1后5秒更新一次信号状态
SnickerSun [Tue, 7 May 2024 02:11:21 +0000 (10:11 +0800)]
开启Cat1后5秒更新一次信号状态
升级py脚本V6支持连接网络种类反馈
添加cat1持续唤醒接口,保证下载时的速度

2 years ago修改sjon_delete导致的死机 132/1 132/head 133/target/1
hcj_ [Mon, 6 May 2024 13:02:52 +0000 (21:02 +0800)]
修改sjon_delete导致的死机

2 years ago修改系统视图删除不必要的图片和代码,解决内存泄漏问题
luozheng [Mon, 6 May 2024 12:44:58 +0000 (20:44 +0800)]
修改系统视图删除不必要的图片和代码,解决内存泄漏问题

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 131/1 131/head 132/target/1
SnickerSun [Mon, 6 May 2024 11:24:09 +0000 (19:24 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #130 into xts_origin from refs/changes/130/head 131/target/1
snickersun@163.com [Mon, 6 May 2024 11:24:03 +0000 (11:24 +0000)]
Merge #130 into xts_origin from refs/changes/130/head

优化ota制作脚本,制作ota包时可自动添加附加资源文件。

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

  - 优化ota制作脚本,制作ota包时可自动添加附加资源文件。

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/130
2 years ago优化ota制作脚本,制作ota包时可自动添加附加资源文件。 130/1 130/head
SnickerSun [Mon, 6 May 2024 11:21:53 +0000 (19:21 +0800)]
优化ota制作脚本,制作ota包时可自动添加附加资源文件。

2 years ago修改运动识别Slice并适配多国语言
luozheng [Mon, 6 May 2024 09:57:39 +0000 (17:57 +0800)]
修改运动识别Slice并适配多国语言

2 years ago修改applist以适配多国语言
luozheng [Mon, 6 May 2024 09:39:38 +0000 (17:39 +0800)]
修改applist以适配多国语言

2 years ago修改训练数据读取bug 129/1 129/head
hcj_ [Mon, 6 May 2024 09:25:51 +0000 (17:25 +0800)]
修改训练数据读取bug

2 years ago合并
hcj_ [Mon, 6 May 2024 08:18:01 +0000 (16:18 +0800)]
合并

2 years agoMerge #128 into xts_origin from refs/changes/128/head 129/target/1 130/target/1
袁清梦 [Mon, 6 May 2024 08:09:35 +0000 (08:09 +0000)]
Merge #128 into xts_origin from refs/changes/128/head

替换结构体成员变量

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

  - 替换结构体成员变量

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/128
2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 127/1 127/head
DXY [Mon, 6 May 2024 07:49:34 +0000 (15:49 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago获取其他目标协议和UI对接已完成
DXY [Mon, 6 May 2024 07:48:56 +0000 (15:48 +0800)]
获取其他目标协议和UI对接已完成

2 years ago 修改声音与震动Slice以适配多国语言
luozheng [Mon, 6 May 2024 07:48:08 +0000 (15:48 +0800)]
 修改声音与震动Slice以适配多国语言

2 years ago修改蓝牙Slice以适配多国语言
luozheng [Mon, 6 May 2024 07:09:31 +0000 (15:09 +0800)]
修改蓝牙Slice以适配多国语言

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 &#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

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

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增加蓝牙设置闹钟和获取闹钟 126/1 126/head
hcj_ [Mon, 6 May 2024 06:51:34 +0000 (14:51 +0800)]
增加蓝牙设置闹钟和获取闹钟

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
hcj_ [Mon, 6 May 2024 06:33:39 +0000 (14:33 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修改网络与通话Slice适配多国语言
luozheng [Mon, 6 May 2024 03:48:53 +0000 (11:48 +0800)]
修改网络与通话Slice适配多国语言

2 years ago屏幕与亮度适配多国语言
luozheng [Mon, 6 May 2024 03:24:41 +0000 (11:24 +0800)]
屏幕与亮度适配多国语言

2 years ago修复表盘时间更新 124/1 124/head
Caisking [Mon, 6 May 2024 02:57:22 +0000 (10:57 +0800)]
修复表盘时间更新

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...
DXY [Mon, 6 May 2024 02:47:06 +0000 (10:47 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

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 ago还原文件修改bug 123/2 123/head
DXY [Mon, 6 May 2024 02:12:06 +0000 (10:12 +0800)]
还原文件修改bug

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 123/1
DXY [Mon, 6 May 2024 02:02:30 +0000 (10:02 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago查找手表弹窗对接协议已完成:声音与振动ui对接已完成 屏幕参数已完成
DXY [Mon, 6 May 2024 01:45:29 +0000 (09:45 +0800)]
查找手表弹窗对接协议已完成:声音与振动ui对接已完成 屏幕参数已完成

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 branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
hcj_ [Sun, 5 May 2024 05:24:50 +0000 (13:24 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

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 ago基础训练记录同步 119/1 119/head
hcj_ [Wed, 1 May 2024 13:37:54 +0000 (21:37 +0800)]
基础训练记录同步

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
hcj_ [Wed, 1 May 2024 13:22:41 +0000 (21:22 +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... 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将strtok改为strtok_r
hcj_ [Tue, 30 Apr 2024 06:07:48 +0000 (14:07 +0800)]
将strtok改为strtok_r

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 agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 113/1 113/head
DXY [Mon, 29 Apr 2024 07:38:32 +0000 (15:38 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

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 agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 111/1 111/head
DXY [Mon, 29 Apr 2024 06:46:02 +0000 (14:46 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago 解析协议相关内容
DXY [Mon, 29 Apr 2024 06:34:39 +0000 (14:34 +0800)]
 解析协议相关内容

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表盘组件位置问题