luozheng [Mon, 1 Jul 2024 01:33:46 +0000 (09:33 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Mon, 1 Jul 2024 01:33:37 +0000 (09:33 +0800)]
修改下拉图片显示错误问题
SnickerSun [Sat, 29 Jun 2024 10:35:22 +0000 (18:35 +0800)]
update to V1.0.9
SnickerSun [Sat, 29 Jun 2024 10:34:53 +0000 (18:34 +0800)]
支持res_only，ota_all flag制作 ota包
Caisking [Sat, 29 Jun 2024 10:28:33 +0000 (18:28 +0800)]
回退设置
Caisking [Sat, 29 Jun 2024 10:23:20 +0000 (18:23 +0800)]
其他卡片取消进入卡片设置
Caisking [Sat, 29 Jun 2024 10:15:52 +0000 (18:15 +0800)]
部分训练界面增加按键
Caisking [Sat, 29 Jun 2024 10:12:19 +0000 (18:12 +0800)]
Merge branches 'sdk602patch0521' and 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
胡传军 [Sat, 29 Jun 2024 10:09:03 +0000 (10:09 +0000)]
Merge #416 into sdk602patch0521 from refs/changes/416/head
Code review from 胡传军
* refs/changes/416/head: (8 commits squashed)
- 修复表盘协议BUG
- Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
- 低电量修改
- Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
- 优化低电量关机
- Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
- 更改低电量报警
- ble扫描过滤去除，ble read属性更新
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/416
Caisking [Sat, 29 Jun 2024 09:38:50 +0000 (17:38 +0800)]
增加心率按键控制
Caisking [Sat, 29 Jun 2024 09:25:12 +0000 (17:25 +0800)]
血氧增加按键控制
luozheng [Sat, 29 Jun 2024 09:22:34 +0000 (17:22 +0800)]
勿扰模式视图修改，注释开机加载CLOCK_IAMGES
Caisking [Sat, 29 Jun 2024 07:33:09 +0000 (15:33 +0800)]
同步表盘资源
luozheng [Sat, 29 Jun 2024 07:19:14 +0000 (15:19 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Sat, 29 Jun 2024 07:19:06 +0000 (15:19 +0800)]
下拉试图修改，图片采用直接读取内存取消采用Imagecach
Caisking [Sat, 29 Jun 2024 07:06:13 +0000 (15:06 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Sat, 29 Jun 2024 07:06:04 +0000 (15:06 +0800)]
卡片设置增加按键监控
penglei [Sat, 29 Jun 2024 06:35:32 +0000 (14:35 +0800)]
补交
penglei [Sat, 29 Jun 2024 06:33:49 +0000 (14:33 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521
penglei [Sat, 29 Jun 2024 06:31:49 +0000 (14:31 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521
Caisking [Sat, 29 Jun 2024 06:08:13 +0000 (14:08 +0800)]
重构心率血氧存储
Caisking [Sat, 29 Jun 2024 05:52:29 +0000 (13:52 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
SnickerSun [Sat, 29 Jun 2024 02:57:04 +0000 (10:57 +0800)]
mkota.sh 添加 res_only 、ota_all 参数
Caisking [Fri, 28 Jun 2024 12:20:22 +0000 (20:20 +0800)]
重构心率血氧存储内容
penglei [Fri, 28 Jun 2024 11:29:14 +0000 (19:29 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521
Caisking [Fri, 28 Jun 2024 11:24:34 +0000 (19:24 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Fri, 28 Jun 2024 11:22:52 +0000 (19:22 +0800)]
卡片管理重新设计
胡传军 [Fri, 28 Jun 2024 11:20:32 +0000 (11:20 +0000)]
Merge #411 into sdk602patch0521 from refs/changes/411/head
Code review from 胡传军
* refs/changes/411/head: (2 commits squashed)
- 修复表盘协议BUG
- Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
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/411
penglei [Fri, 28 Jun 2024 11:19:33 +0000 (19:19 +0800)]
闹钟添加切换睡眠与小睡模式
luozheng [Fri, 28 Jun 2024 10:57:33 +0000 (18:57 +0800)]
将每日目标中的动画采用图片路径不在采用Imagecach
luozheng [Fri, 28 Jun 2024 09:52:42 +0000 (17:52 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Fri, 28 Jun 2024 09:52:33 +0000 (17:52 +0800)]
网络与通话修改
SnickerSun [Fri, 28 Jun 2024 09:45:30 +0000 (17:45 +0800)]
更新版本V1.0.8
SnickerSun [Fri, 28 Jun 2024 09:44:23 +0000 (17:44 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
snickersun@163.com [Fri, 28 Jun 2024 09:44:16 +0000 (09:44 +0000)]
Merge #407 into sdk602patch0521 from refs/changes/407/head
Code review from snickersun@163.com
* refs/changes/407/head: (5 commits squashed)
- 更新modem新固件，添加电信入库新需求，pyVer版本增加到PY_SRV_V10。
- 修复mkota.sh 添加额外资源文件路径处理错误问题。
- Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
- Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
- Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
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/407
SnickerSun [Fri, 28 Jun 2024 09:42:33 +0000 (17:42 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
SnickerSun [Fri, 28 Jun 2024 09:41:45 +0000 (17:41 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
hcj [Fri, 28 Jun 2024 09:41:01 +0000 (17:41 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
hcj [Fri, 28 Jun 2024 09:40:51 +0000 (17:40 +0800)]
修改心率数据同步协议
snickersun@163.com [Fri, 28 Jun 2024 09:31:47 +0000 (09:31 +0000)]
Merge #403 into sdk602patch0521 from refs/changes/403/head
Code review from snickersun@163.com
* refs/changes/403/head: (3 commits squashed)
- 更新modem新固件，添加电信入库新需求，pyVer版本增加到PY_SRV_V10。
- 修复mkota.sh 添加额外资源文件路径处理错误问题。
- Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
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/403
袁清梦 [Fri, 28 Jun 2024 09:31:25 +0000 (09:31 +0000)]
Merge #405 into sdk602patch0521 from refs/changes/405/head
Code review from 袁清梦
* refs/changes/405/head: (3 commits squashed)
- 增加恢复出厂设置AT AT^RESTORE
- Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
- Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
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/405
penglei [Fri, 28 Jun 2024 09:25:53 +0000 (17:25 +0800)]
补交
penglei [Fri, 28 Jun 2024 09:22:19 +0000 (17:22 +0800)]
添加小睡与睡眠数据存储
SnickerSun [Fri, 28 Jun 2024 09:20:07 +0000 (17:20 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
SnickerSun [Fri, 28 Jun 2024 09:19:57 +0000 (17:19 +0800)]
修复mkota.sh 添加额外资源文件路径处理错误问题。
SnickerSun [Fri, 28 Jun 2024 09:19:37 +0000 (17:19 +0800)]
更新modem新固件，添加电信入库新需求，pyVer版本增加到PY_SRV_V10。
penglei [Fri, 28 Jun 2024 08:11:42 +0000 (16:11 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521
Caisking [Fri, 28 Jun 2024 08:08:09 +0000 (16:08 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Fri, 28 Jun 2024 07:55:22 +0000 (15:55 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Fri, 28 Jun 2024 07:55:19 +0000 (15:55 +0800)]
增加恢复出厂设置AT AT^RESTORE
penglei [Fri, 28 Jun 2024 07:54:14 +0000 (15:54 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521
luozheng [Fri, 28 Jun 2024 07:52:17 +0000 (15:52 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
hcj [Fri, 28 Jun 2024 07:51:09 +0000 (15:51 +0800)]
补
luozheng [Fri, 28 Jun 2024 07:49:57 +0000 (15:49 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Fri, 28 Jun 2024 07:49:47 +0000 (15:49 +0800)]
主界面切换释放Imagecach
penglei [Fri, 28 Jun 2024 07:49:18 +0000 (15:49 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521
hcj [Fri, 28 Jun 2024 07:42:40 +0000 (15:42 +0800)]
小睡及睡眠数据修改
彭磊 [Fri, 28 Jun 2024 07:37:01 +0000 (07:37 +0000)]
Merge #398 into sdk602patch0521 from refs/changes/398/head
优化小睡消息接收处理
* refs/changes/398/head: (2 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/398
Caisking [Fri, 28 Jun 2024 07:25:51 +0000 (15:25 +0800)]
增加心率血氧bin数据
penglei [Fri, 28 Jun 2024 06:40:00 +0000 (14:40 +0800)]
补交
Caisking [Fri, 28 Jun 2024 05:12:05 +0000 (13:12 +0800)]
补交
Caisking [Fri, 28 Jun 2024 05:09:13 +0000 (13:09 +0800)]
补交
Caisking [Fri, 28 Jun 2024 05:04:16 +0000 (13:04 +0800)]
同步表盘资源
Caisking [Fri, 28 Jun 2024 04:45:40 +0000 (12:45 +0800)]
补交
Caisking [Fri, 28 Jun 2024 04:38:44 +0000 (12:38 +0800)]
补交修改
penglei [Fri, 28 Jun 2024 04:03:58 +0000 (12:03 +0800)]
优化小睡消息接收处理
Caisking [Fri, 28 Jun 2024 03:38:36 +0000 (11:38 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Fri, 28 Jun 2024 03:38:33 +0000 (11:38 +0800)]
优化心率血氧存储
luozheng [Fri, 28 Jun 2024 02:53:41 +0000 (10:53 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Fri, 28 Jun 2024 02:51:33 +0000 (10:51 +0800)]
主界面卡片Unload与Load优化
Caisking [Thu, 27 Jun 2024 13:34:04 +0000 (21:34 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Thu, 27 Jun 2024 13:33:52 +0000 (21:33 +0800)]
修复心率血氧文件的读取
Caisking [Thu, 27 Jun 2024 12:52:05 +0000 (20:52 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
SnickerSun [Thu, 27 Jun 2024 12:51:49 +0000 (20:51 +0800)]
update 版本 V1.0.7
袁清梦 [Thu, 27 Jun 2024 12:49:14 +0000 (12:49 +0000)]
Merge #394 into sdk602patch0521 from refs/changes/394/head
Code review from 袁清梦
* refs/changes/394/head: (2 commits squashed)
- 卡片管理按照顺序配置
- Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
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/394
Caisking [Thu, 27 Jun 2024 12:48:29 +0000 (20:48 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Thu, 27 Jun 2024 12:48:26 +0000 (20:48 +0800)]
卡片管理按照顺序配置
luozheng [Thu, 27 Jun 2024 12:48:04 +0000 (20:48 +0800)]
补交
luozheng [Thu, 27 Jun 2024 12:46:25 +0000 (20:46 +0800)]
音乐视图补交
luozheng [Thu, 27 Jun 2024 12:37:45 +0000 (20:37 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Thu, 27 Jun 2024 12:37:38 +0000 (20:37 +0800)]
优化下拉，指南针，音乐，Load和Unload
hcj [Thu, 27 Jun 2024 09:02:59 +0000 (17:02 +0800)]
修改ble打印 及错误判断
hcj [Thu, 27 Jun 2024 08:58:42 +0000 (16:58 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
penglei [Thu, 27 Jun 2024 08:53:59 +0000 (16:53 +0800)]
补交
penglei [Thu, 27 Jun 2024 08:47:31 +0000 (16:47 +0800)]
修复步数界面显示bug
penglei [Thu, 27 Jun 2024 07:25:30 +0000 (15:25 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521
penglei [Thu, 27 Jun 2024 07:25:07 +0000 (15:25 +0800)]
优化精简运动模式与睡眠模式消息发送
hcj [Thu, 27 Jun 2024 07:23:55 +0000 (15:23 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Thu, 27 Jun 2024 07:23:54 +0000 (15:23 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Thu, 27 Jun 2024 07:23:51 +0000 (15:23 +0800)]
优化组件
hcj [Thu, 27 Jun 2024 07:09:04 +0000 (15:09 +0800)]
临时解决BLE因消息flag不回消息的问题
SnickerSun [Thu, 27 Jun 2024 06:59:18 +0000 (14:59 +0800)]
优化excdump.sh，支持trace_for_all_v3.16.69_mini直接查看application.elf
SnickerSun [Thu, 27 Jun 2024 06:48:05 +0000 (14:48 +0800)]
优化 excdump.sh
luozheng [Thu, 27 Jun 2024 06:36:02 +0000 (14:36 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
SnickerSun [Thu, 27 Jun 2024 06:34:58 +0000 (14:34 +0800)]
添加 exc_info.bin文件解析脚本，可以直接分析手表中下载的 exc_tar文件。
指令参考如下：
./tools/log_parser/excdump.sh /d/logs/
20240627/exc_V1.0.6_20240627_105411_CT_1458322.tar
SnickerSun [Thu, 27 Jun 2024 06:28:03 +0000 (14:28 +0800)]
电信入库增加一个字段
luozheng [Thu, 27 Jun 2024 03:33:33 +0000 (11:33 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Thu, 27 Jun 2024 03:31:36 +0000 (11:31 +0800)]
指南针界面优化
hcj [Thu, 27 Jun 2024 02:50:48 +0000 (10:50 +0800)]
修改协议BUG
hcj [Thu, 27 Jun 2024 01:47:19 +0000 (09:47 +0800)]
修改数据保存BUG
projects / mirrors / FD230.git / log