penglei [Wed, 8 May 2024 12:20:09 +0000 (20:20 +0800)]
优化产测代码，添加alipay测试，优化睡眠模式
Caisking [Wed, 8 May 2024 10:17:28 +0000 (18:17 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Wed, 8 May 2024 10:17:16 +0000 (18:17 +0800)]
增加遥控拍照Slice（还需要同步UI)
Caisking [Wed, 8 May 2024 10:00:45 +0000 (18:00 +0800)]
修复训练stw_task死机
SnickerSun [Wed, 8 May 2024 09:13:48 +0000 (17:13 +0800)]
修复cat1 server，5秒获取一次信号强度就无法休眠的问题
Caisking [Wed, 8 May 2024 09:12:10 +0000 (17:12 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
罗正 [Wed, 8 May 2024 09:11:53 +0000 (09:11 +0000)]
Merge #144 into xts_origin from refs/changes/144/head
采用定时器更新下拉控制视图的状态显示，包括时间，电池，信号强度
* refs/changes/144/head: (1 commits squashed)
- 采用定时器更新下拉控制视图的状态显示，包括时间，电池，信号强度
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/144
袁清梦 [Wed, 8 May 2024 09:11:43 +0000 (09:11 +0000)]
Merge #143 into xts_origin from refs/changes/143/head
Code review from 袁清梦
* refs/changes/143/head: (21 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多国语言
- 增加label适配多国语言函数
- 删除部分打印
- 增加训练记录列表
- 训练记录同步make
- 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/143
胡传军 [Wed, 8 May 2024 09:11:32 +0000 (09:11 +0000)]
Merge #142 into xts_origin from refs/changes/142/head
喝水及睡眠协议对接
* refs/changes/142/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/142
Caisking [Wed, 8 May 2024 07:59:16 +0000 (15:59 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Wed, 8 May 2024 07:32:39 +0000 (15:32 +0800)]
训练记录同步make
Caisking [Wed, 8 May 2024 07:30:15 +0000 (15:30 +0800)]
增加训练记录列表
Caisking [Wed, 8 May 2024 07:29:54 +0000 (15:29 +0800)]
删除部分打印
Caisking [Wed, 8 May 2024 07:28:27 +0000 (15:28 +0800)]
增加label适配多国语言函数
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
袁清梦 [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
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
SnickerSun [Tue, 7 May 2024 14:58:45 +0000 (22:58 +0800)]
修复cat1时间同步错误。
优化httpclient 下载
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
luozheng [Tue, 7 May 2024 12:13:03 +0000 (20:13 +0800)]
增加系统更新icon显示
Caisking [Tue, 7 May 2024 11:20:42 +0000 (19:20 +0800)]
适配训练记录Slice多国语言
Caisking [Tue, 7 May 2024 11:20:28 +0000 (19:20 +0800)]
适配信息通知Slice多国语言
Caisking [Tue, 7 May 2024 11:16:23 +0000 (19:16 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Tue, 7 May 2024 11:13:11 +0000 (19:13 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
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
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
Caisking [Tue, 7 May 2024 11:10:39 +0000 (19:10 +0800)]
适配血氧Slice多国语言
Caisking [Tue, 7 May 2024 11:10:11 +0000 (19:10 +0800)]
优化心率血氧time的更新显示逻辑
SnickerSun [Tue, 7 May 2024 11:08:22 +0000 (19:08 +0800)]
更改升级服务器为 snicker.com.cn，去掉cat1里过多的日志，优化lwip参数
Caisking [Tue, 7 May 2024 11:01:07 +0000 (19:01 +0800)]
更新字体文件
Caisking [Tue, 7 May 2024 10:45:09 +0000 (18:45 +0800)]
增加佩戴状态下的无效数控制
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
DXY [Tue, 7 May 2024 09:31:07 +0000 (17:31 +0800)]
解绑 绑定界面加名字显示: 修复解绑界面死机问题:补充用户数据协议增加字段
Caisking [Tue, 7 May 2024 09:27:40 +0000 (17:27 +0800)]
多国语言支持变量适配（updateLabel)
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
luozheng [Tue, 7 May 2024 09:23:43 +0000 (17:23 +0800)]
添加系统更新Slice
Caisking [Tue, 7 May 2024 09:20:59 +0000 (17:20 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Tue, 7 May 2024 08:58:10 +0000 (16:58 +0800)]
适配心率Slice多国语言
Caisking [Tue, 7 May 2024 08:23:23 +0000 (16:23 +0800)]
优化设置训练频率
hcj_ [Tue, 7 May 2024 07:14:05 +0000 (15:14 +0800)]
修改系统升级bug
Caisking [Tue, 7 May 2024 06:28:52 +0000 (14:28 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
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
luozheng [Tue, 7 May 2024 02:50:16 +0000 (10:50 +0800)]
修改恢复出厂设置视图适配多国语言
SnickerSun [Tue, 7 May 2024 02:20:14 +0000 (10:20 +0800)]
优化ota升级界面，保证下载时cat1不休眠，且随时可以退出界面。
优化http_client，支持下载文件进度提醒。
修复at下载指令。
SnickerSun [Tue, 7 May 2024 02:11:21 +0000 (10:11 +0800)]
开启Cat1后5秒更新一次信号状态
升级py脚本V6支持连接网络种类反馈
添加cat1持续唤醒接口，保证下载时的速度
hcj_ [Mon, 6 May 2024 13:02:52 +0000 (21:02 +0800)]
修改sjon_delete导致的死机
luozheng [Mon, 6 May 2024 12:44:58 +0000 (20:44 +0800)]
修改系统视图删除不必要的图片和代码，解决内存泄漏问题
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
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
SnickerSun [Mon, 6 May 2024 11:21:53 +0000 (19:21 +0800)]
优化ota制作脚本，制作ota包时可自动添加附加资源文件。
Caisking [Mon, 6 May 2024 10:14:19 +0000 (18:14 +0800)]
更新训练Slice的多国语言配置
Caisking [Mon, 6 May 2024 10:13:53 +0000 (18:13 +0800)]
更新多国语言xml以及font文件
luozheng [Mon, 6 May 2024 09:57:39 +0000 (17:57 +0800)]
修改运动识别Slice并适配多国语言
luozheng [Mon, 6 May 2024 09:39:38 +0000 (17:39 +0800)]
修改applist以适配多国语言
hcj_ [Mon, 6 May 2024 09:25:51 +0000 (17:25 +0800)]
修改训练数据读取bug
hcj_ [Mon, 6 May 2024 08:18:01 +0000 (16:18 +0800)]
合并
袁清梦 [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
Caisking [Mon, 6 May 2024 08:08:44 +0000 (16:08 +0800)]
替换结构体成员变量
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
DXY [Mon, 6 May 2024 07:48:56 +0000 (15:48 +0800)]
获取其他目标协议和UI对接已完成
luozheng [Mon, 6 May 2024 07:48:08 +0000 (15:48 +0800)]
修改声音与震动Slice以适配多国语言
luozheng [Mon, 6 May 2024 07:09:31 +0000 (15:09 +0800)]
修改蓝牙Slice以适配多国语言
胡传军 [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
hcj_ [Mon, 6 May 2024 06:51:34 +0000 (14:51 +0800)]
增加蓝牙设置闹钟和获取闹钟
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
luozheng [Mon, 6 May 2024 03:48:53 +0000 (11:48 +0800)]
修改网络与通话Slice适配多国语言
luozheng [Mon, 6 May 2024 03:24:41 +0000 (11:24 +0800)]
屏幕与亮度适配多国语言
Caisking [Mon, 6 May 2024 02:57:22 +0000 (10:57 +0800)]
修复表盘时间更新
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
邓雪英 [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 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
- Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
- 查找手表弹窗对接协议已完成:声音与振动ui对接已完成 屏幕参数已完成
- Merge branch 'xts_origin' 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
DXY [Mon, 6 May 2024 02:12:06 +0000 (10:12 +0800)]
还原文件修改bug
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
DXY [Mon, 6 May 2024 01:45:29 +0000 (09:45 +0800)]
查找手表弹窗对接协议已完成:声音与振动ui对接已完成 屏幕参数已完成
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
Caisking [Mon, 6 May 2024 01:17:06 +0000 (09:17 +0800)]
修复解绑bug
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
胡传军 [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 '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/119
hcj_ [Wed, 1 May 2024 13:37:54 +0000 (21:37 +0800)]
基础训练记录同步
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
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
luozheng [Tue, 30 Apr 2024 10:17:27 +0000 (18:17 +0800)]
修改震动模式适配app设置震动强度
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
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
罗正 [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 '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
- 重构电话视图，解决主界面内存泄漏问题
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- 添加拨号方式Slice
- 拨号视图修改，已测试通过sim卡拨号成功但发现喇叭不出声
- 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/114
袁清梦 [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 '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/116
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
penglei [Tue, 30 Apr 2024 06:22:32 +0000 (14:22 +0800)]
统一cywee、磁力计、ppg的I2C通信接口，解决冲突问题。产测部分代码。
hcj_ [Tue, 30 Apr 2024 06:07:48 +0000 (14:07 +0800)]
将strtok改为strtok_r
luozheng [Tue, 30 Apr 2024 04:00:09 +0000 (12:00 +0800)]
实现第一次启动，需要实现弹窗切换语言的功能
Caisking [Tue, 30 Apr 2024 01:41:09 +0000 (09:41 +0800)]
增加发送手表运动结束状态
Caisking [Mon, 29 Apr 2024 12:13:37 +0000 (20:13 +0800)]
更新运动状态协议发送条件
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
Caisking [Mon, 29 Apr 2024 12:01:32 +0000 (20:01 +0800)]
修复时间显示
SnickerSun [Mon, 29 Apr 2024 10:47:35 +0000 (18:47 +0800)]
修复码云里检测出的安全隐患
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
luozheng [Mon, 29 Apr 2024 09:28:13 +0000 (17:28 +0800)]
拨号视图修改，已测试通过sim卡拨号成功但发现喇叭不出声
邓雪英 [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 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
- Merge branch 'xts_origin' 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
Caisking [Mon, 29 Apr 2024 09:17:34 +0000 (17:17 +0800)]
订正部分内存泄漏以及规范
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
Caisking [Mon, 29 Apr 2024 08:31:50 +0000 (16:31 +0800)]
增加训练心率达到最高弹窗
projects / mirrors / FD230.git / log