luozheng [Sat, 20 Jul 2024 11:23:23 +0000 (19:23 +0800)]
实现：恢复出厂设置后必须绑定二维码才能进入主界面
luozheng [Sat, 20 Jul 2024 10:51:40 +0000 (18:51 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
hcj [Sat, 20 Jul 2024 10:47:08 +0000 (18:47 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Sat, 20 Jul 2024 10:46:35 +0000 (18:46 +0800)]
ble 状态改变提交
luozheng [Sat, 20 Jul 2024 10:44:49 +0000 (18:44 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
罗正 [Sat, 20 Jul 2024 10:41:58 +0000 (10:41 +0000)]
Merge #566 into sdk602patch0626 from refs/changes/566/head
Code review from 罗正
* refs/changes/566/head: (8 commits squashed)
- 添加滑动关机和重启功能：
恢复出厂设置未加
目前是长按才是滑动关机和重启
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 滑动关机和重启添加恢复出厂设置功能
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 滑动关机和重启界面多国语言修改
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- QRcode 添加版本号，title改为设别名
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
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/566
袁清梦 [Sat, 20 Jul 2024 10:41:06 +0000 (10:41 +0000)]
Merge #565 into sdk602patch0626 from refs/changes/565/head
Code review from 袁清梦
* refs/changes/565/head: (2 commits squashed)
- 优化动态心率显示算法保证数据较为稳定
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
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/565
hcj [Sat, 20 Jul 2024 10:12:06 +0000 (18:12 +0800)]
电话界面优化，applist中的通话记录改为通讯录
luozheng [Sat, 20 Jul 2024 09:08:39 +0000 (17:08 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Sat, 20 Jul 2024 09:06:55 +0000 (17:06 +0800)]
QRcode 添加版本号，title改为设别名
hcj [Sat, 20 Jul 2024 08:43:14 +0000 (16:43 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Sat, 20 Jul 2024 08:43:00 +0000 (16:43 +0800)]
表冠测试修改
罗正 [Sat, 20 Jul 2024 08:21:17 +0000 (08:21 +0000)]
Merge #561 into sdk602patch0626 from refs/changes/561/head
Code review from 罗正
* refs/changes/561/head: (5 commits squashed)
- 添加滑动关机和重启功能：
恢复出厂设置未加
目前是长按才是滑动关机和重启
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 滑动关机和重启添加恢复出厂设置功能
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 滑动关机和重启界面多国语言修改
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/561
luozheng [Sat, 20 Jul 2024 08:17:05 +0000 (16:17 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Sat, 20 Jul 2024 08:15:19 +0000 (16:15 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Sat, 20 Jul 2024 08:15:12 +0000 (16:15 +0800)]
修复语言脚本
luozheng [Sat, 20 Jul 2024 08:10:36 +0000 (16:10 +0800)]
滑动关机和重启界面多国语言修改
hcj [Sat, 20 Jul 2024 08:01:18 +0000 (16:01 +0800)]
每日目标，燃脂数据修改，增加获取站立次数
luozheng [Sat, 20 Jul 2024 07:48:14 +0000 (15:48 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Sat, 20 Jul 2024 07:48:08 +0000 (15:48 +0800)]
滑动关机和重启添加恢复出厂设置功能
hcj [Sat, 20 Jul 2024 04:05:16 +0000 (12:05 +0800)]
重写产测部分代码，优化结构，更方便后续更改和添加
luozheng [Sat, 20 Jul 2024 03:58:43 +0000 (11:58 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Sat, 20 Jul 2024 03:58:36 +0000 (11:58 +0800)]
添加滑动关机和重启功能：
恢复出厂设置未加
目前是长按才是滑动关机和重启
SnickerSun [Sat, 20 Jul 2024 02:33:34 +0000 (10:33 +0800)]
release V1.1.23
SnickerSun [Sat, 20 Jul 2024 02:32:20 +0000 (10:32 +0800)]
添加A5133驱动支持
hcj [Sat, 20 Jul 2024 01:59:45 +0000 (09:59 +0800)]
增加 连接状态改变(补)
hcj [Sat, 20 Jul 2024 01:47:53 +0000 (09:47 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Sat, 20 Jul 2024 01:47:22 +0000 (09:47 +0800)]
增加 连接状态改变
SnickerSun [Sat, 20 Jul 2024 01:43:10 +0000 (09:43 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Sat, 20 Jul 2024 01:27:33 +0000 (09:27 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Sat, 20 Jul 2024 01:27:25 +0000 (09:27 +0800)]
修复训练设置距离目标死机
SnickerSun [Sat, 20 Jul 2024 00:53:54 +0000 (08:53 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
penglei [Fri, 19 Jul 2024 10:30:45 +0000 (18:30 +0800)]
修复手表不接屏幕死机问题
Caisking [Fri, 19 Jul 2024 09:15:01 +0000 (17:15 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Fri, 19 Jul 2024 09:01:11 +0000 (17:01 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Fri, 19 Jul 2024 09:01:05 +0000 (17:01 +0800)]
修改喝水提醒弹窗的计算错误问题
hcj [Fri, 19 Jul 2024 08:37:44 +0000 (16:37 +0800)]
ble 取消下载及血氧bug修复
SnickerSun [Fri, 19 Jul 2024 08:15:13 +0000 (16:15 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Fri, 19 Jul 2024 08:09:11 +0000 (16:09 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Fri, 19 Jul 2024 08:08:46 +0000 (16:08 +0800)]
优化喝水提醒的时间段判断
袁清梦 [Fri, 19 Jul 2024 07:21:27 +0000 (07:21 +0000)]
Merge #552 into sdk602patch0626 from refs/changes/552/head
默认表盘文件修复
* refs/changes/552/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/552
penglei [Fri, 19 Jul 2024 06:57:12 +0000 (14:57 +0800)]
添加tcp线程控制，降低待机功耗
luozheng [Fri, 19 Jul 2024 06:53:38 +0000 (14:53 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Fri, 19 Jul 2024 06:53:32 +0000 (14:53 +0800)]
解决喝水提醒跨天设置问题
Caisking [Fri, 19 Jul 2024 06:50:57 +0000 (14:50 +0800)]
默认表盘文件修复
SnickerSun [Fri, 19 Jul 2024 05:48:50 +0000 (13:48 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Fri, 19 Jul 2024 05:03:39 +0000 (13:03 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Fri, 19 Jul 2024 03:52:15 +0000 (11:52 +0800)]
修复电量显示异常
luozheng [Fri, 19 Jul 2024 03:19:24 +0000 (11:19 +0800)]
实现喝水提醒功能(隔天的还有问题）
Caisking [Fri, 19 Jul 2024 03:02:45 +0000 (11:02 +0800)]
修改水母，运动表盘背景
Caisking [Fri, 19 Jul 2024 01:29:54 +0000 (09:29 +0800)]
删除缓存文件
Caisking [Fri, 19 Jul 2024 01:29:15 +0000 (09:29 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Fri, 19 Jul 2024 01:28:27 +0000 (09:28 +0800)]
同步资源文件更改
Caisking [Fri, 19 Jul 2024 01:27:52 +0000 (09:27 +0800)]
回退Id更改
SnickerSun [Thu, 18 Jul 2024 22:49:43 +0000 (06:49 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
袁清梦 [Thu, 18 Jul 2024 22:45:00 +0000 (22:45 +0000)]
Merge #549 into sdk602patch0626 from refs/changes/549/head
修改表盘资源
* refs/changes/549/head: (9 commits squashed)
- 修改表盘资源
- 删除项目中的缓存文件
- 优化部分缩略图
- 同步lzma配置
- 删除不必要的复制
- 修改默认表盘
- 同步默认表盘map配置
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 更新宇航员表盘lzma
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/549
hcj [Thu, 18 Jul 2024 12:39:26 +0000 (20:39 +0800)]
支付宝UI修改
Caisking [Thu, 18 Jul 2024 11:51:24 +0000 (19:51 +0800)]
更新宇航员表盘lzma
Caisking [Thu, 18 Jul 2024 09:45:50 +0000 (17:45 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Thu, 18 Jul 2024 09:45:43 +0000 (17:45 +0800)]
同步默认表盘map配置
luozheng [Thu, 18 Jul 2024 09:11:11 +0000 (17:11 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Thu, 18 Jul 2024 09:09:17 +0000 (17:09 +0800)]
指南针界面修改修改方向和度数居中
Caisking [Thu, 18 Jul 2024 09:04:56 +0000 (17:04 +0800)]
修改默认表盘
Caisking [Thu, 18 Jul 2024 09:00:16 +0000 (17:00 +0800)]
删除不必要的复制
Caisking [Thu, 18 Jul 2024 08:37:55 +0000 (16:37 +0800)]
同步lzma配置
Caisking [Thu, 18 Jul 2024 07:02:47 +0000 (15:02 +0800)]
优化部分缩略图
luozheng [Thu, 18 Jul 2024 06:50:05 +0000 (14:50 +0800)]
删除fd230app有关set_desktop文件
Caisking [Thu, 18 Jul 2024 06:39:30 +0000 (14:39 +0800)]
删除项目中的缓存文件
Caisking [Thu, 18 Jul 2024 06:32:47 +0000 (14:32 +0800)]
修改表盘资源
luozheng [Thu, 18 Jul 2024 04:00:51 +0000 (12:00 +0800)]
喝水提醒优化修改
hcj [Thu, 18 Jul 2024 03:59:31 +0000 (11:59 +0800)]
关闭自动回连
luozheng [Thu, 18 Jul 2024 03:49:43 +0000 (11:49 +0800)]
删除喝水提醒弹窗的多余代码
luozheng [Thu, 18 Jul 2024 03:38:26 +0000 (11:38 +0800)]
全局状态进入开机和重启界面优化：进入后如果不想重启或关机，优化退出和按键返回，遵循：从那来回那去
luozheng [Thu, 18 Jul 2024 03:33:44 +0000 (11:33 +0800)]
喝水提醒优化修改：不在提醒时间段内且计数器大于0就重置计数器
SnickerSun [Thu, 18 Jul 2024 03:31:25 +0000 (11:31 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Thu, 18 Jul 2024 03:08:42 +0000 (11:08 +0800)]
指南针优化修改方向和度数为居中
hcj [Wed, 17 Jul 2024 11:31:44 +0000 (19:31 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
luozheng [Wed, 17 Jul 2024 11:20:23 +0000 (19:20 +0800)]
添加扫码绑定手表功能
luozheng [Wed, 17 Jul 2024 10:25:58 +0000 (18:25 +0800)]
喝水提醒实现
1.每天在指定的时间提醒用户喝水
2..每天在指定的时间段间隔提醒用户喝水
解决设置震动模式手表没有物理震动问题
snickersun@163.com [Wed, 17 Jul 2024 09:52:15 +0000 (09:52 +0000)]
Merge #546 into sdk602patch0626 from refs/changes/546/head
Code review from snickersun@163.com
* refs/changes/546/head: (2 commits squashed)
- add unyaffs2tool.py 可以拆分file.bin为4个yaffs image
- Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
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/546
SnickerSun [Wed, 17 Jul 2024 09:50:41 +0000 (17:50 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Wed, 17 Jul 2024 09:50:27 +0000 (17:50 +0800)]
add unyaffs2tool.py 可以拆分file.bin为4个yaffs image
luozheng [Wed, 17 Jul 2024 09:14:17 +0000 (17:14 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Wed, 17 Jul 2024 09:14:06 +0000 (17:14 +0800)]
手表二维码界面修改添加了标题，修正了设备名的位置
Caisking [Wed, 17 Jul 2024 08:20:22 +0000 (16:20 +0800)]
增加表盘电量动态变化
hcj [Wed, 17 Jul 2024 08:17:34 +0000 (16:17 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
胡传军 [Wed, 17 Jul 2024 07:47:41 +0000 (07:47 +0000)]
Merge #543 into sdk602patch0626 from refs/changes/543/head
优化bleEvent中的部分函数名
* refs/changes/543/head: (1 commits squashed)
- 优化bleEvent中的部分函数名
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/543
hcj [Wed, 17 Jul 2024 07:41:13 +0000 (15:41 +0800)]
优化bleEvent中的部分函数名
luozheng [Wed, 17 Jul 2024 07:36:14 +0000 (15:36 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Wed, 17 Jul 2024 07:36:07 +0000 (15:36 +0800)]
applist实现power键双击切换样式功能
hcj [Wed, 17 Jul 2024 06:45:42 +0000 (14:45 +0800)]
补交hfp开关
hcj [Wed, 17 Jul 2024 06:36:19 +0000 (14:36 +0800)]
增加hfp和A2DP开关，以及获取状态（目前支持关一个，双关后会再次重连，后续优化）
hcj [Wed, 17 Jul 2024 06:28:38 +0000 (14:28 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
penglei [Wed, 17 Jul 2024 02:44:02 +0000 (10:44 +0800)]
优化蓝牙产测心率血氧漏光测试与LCD TP CROWN测试
胡传军 [Wed, 17 Jul 2024 01:43:43 +0000 (01:43 +0000)]
Merge #537 into sdk602patch0626 from refs/changes/537/head
Code review from 胡传军
* refs/changes/537/head: (2 commits squashed)
- 修复通讯录运营商和地址的读写错误BUG
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
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/537
SnickerSun [Wed, 17 Jul 2024 01:41:21 +0000 (09:41 +0800)]
移动cat1modem源码到 cat1modem
Caisking [Tue, 16 Jul 2024 12:15:16 +0000 (20:15 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Tue, 16 Jul 2024 12:15:12 +0000 (20:15 +0800)]
训练记录修改列表状态更新问题
hcj [Tue, 16 Jul 2024 12:14:33 +0000 (20:14 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Tue, 16 Jul 2024 12:14:12 +0000 (20:14 +0800)]
修复通讯录运营商和地址的读写错误BUG
projects / mirrors / FD230.git / log