Caisking [Tue, 9 Jul 2024 06:15:03 +0000 (14:15 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Tue, 9 Jul 2024 06:14:55 +0000 (14:14 +0800)]
睡眠模式的勿扰将在外部设置
Caisking [Tue, 9 Jul 2024 06:14:26 +0000 (14:14 +0800)]
修复训练类在app显示不正常现象
Caisking [Tue, 9 Jul 2024 06:13:50 +0000 (14:13 +0800)]
同步资源文件更新
Caisking [Tue, 9 Jul 2024 06:12:16 +0000 (14:12 +0800)]
更新语言文件
袁清梦 [Tue, 9 Jul 2024 04:26:42 +0000 (04:26 +0000)]
Merge #484 into sdk602patch0626 from refs/changes/484/head
Code review from 袁清梦
* refs/changes/484/head: (3 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/484
hcj [Tue, 9 Jul 2024 04:18:53 +0000 (12:18 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Tue, 9 Jul 2024 04:09:42 +0000 (12:09 +0800)]
ANCS提交（还有bug，待测试，未打开目前）
Caisking [Tue, 9 Jul 2024 02:29:26 +0000 (10:29 +0800)]
增加读取信息错误的默认
Caisking [Tue, 9 Jul 2024 01:38:32 +0000 (09:38 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Tue, 9 Jul 2024 01:38:27 +0000 (09:38 +0800)]
走查部分代码
袁清梦 [Mon, 8 Jul 2024 14:04:39 +0000 (14:04 +0000)]
Merge #480 into sdk602patch0626 from refs/changes/480/head
增加转换训练协议Id的接口函数
* refs/changes/480/head: (1 commits squashed)
- 增加转换训练协议Id的接口函数
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/480
SnickerSun [Mon, 8 Jul 2024 13:59:28 +0000 (21:59 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
snickersun@163.com [Mon, 8 Jul 2024 14:00:20 +0000 (14:00 +0000)]
Merge #481 into sdk602patch0626 from refs/changes/481/head
添加语言工具脚本
* refs/changes/481/head: (1 commits squashed)
- 添加语言工具脚本
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/481
SnickerSun [Mon, 8 Jul 2024 13:59:08 +0000 (21:59 +0800)]
release V1.1.15
penglei [Mon, 8 Jul 2024 13:52:30 +0000 (21:52 +0800)]
增加开机蓝牙MAC地址，cywee chip info打印
SnickerSun [Mon, 8 Jul 2024 13:42:46 +0000 (21:42 +0800)]
添加语言工具脚本
SnickerSun [Mon, 8 Jul 2024 01:54:38 +0000 (09:54 +0800)]
文件接收通过记录前四个字节和CRC值的方式判定是否已重复。解决传输数据重复造成接收文件失败问题。
SnickerSun [Sat, 6 Jul 2024 12:17:10 +0000 (20:17 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Sat, 6 Jul 2024 12:16:55 +0000 (20:16 +0800)]
修复mkota.sh ota_all 和 res_only切换时环境不清空的问题
罗正 [Sat, 6 Jul 2024 10:54:52 +0000 (10:54 +0000)]
Merge #478 into sdk602patch0626 from refs/changes/478/head
Code review from 罗正
* refs/changes/478/head: (5 commits squashed)
- Ai语音修改，遗留Label闪屏和字数过长后段不显示问题，
与蓝鹊app联调经常发送了语音没有返回内容
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 添加applist的足球显示样式
- 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/478
penglei [Sat, 6 Jul 2024 10:45:42 +0000 (18:45 +0800)]
优化睡眠与小睡时间戳接收
snickersun@163.com [Sat, 6 Jul 2024 10:29:30 +0000 (10:29 +0000)]
Merge #476 into sdk602patch0626 from refs/changes/476/head
修复 autobuild.sh user 编译问题
* refs/changes/476/head: (1 commits squashed)
- 修复 autobuild.sh user 编译问题
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/476
SnickerSun [Sat, 6 Jul 2024 10:07:54 +0000 (18:07 +0800)]
修复 autobuild.sh user 编译问题
Caisking [Sat, 6 Jul 2024 10:03:23 +0000 (18:03 +0800)]
优化卡片管理按键
Caisking [Sat, 6 Jul 2024 09:01:56 +0000 (17:01 +0800)]
修复训练记录列表滑动异常bug
Caisking [Sat, 6 Jul 2024 08:27:31 +0000 (16:27 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Sat, 6 Jul 2024 08:27:24 +0000 (16:27 +0800)]
优化睡眠存储
Caisking [Sat, 6 Jul 2024 07:39:02 +0000 (15:39 +0800)]
修复表盘Id初始化不正确
penglei [Sat, 6 Jul 2024 06:54:47 +0000 (14:54 +0800)]
将PRINT替换为WEARABLE_LOGE，AT指令中PRINT替换为wstp_print。
penglei [Sat, 6 Jul 2024 06:52:55 +0000 (14:52 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Sat, 6 Jul 2024 06:47:56 +0000 (14:47 +0800)]
同步Id修改
Caisking [Sat, 6 Jul 2024 06:42:30 +0000 (14:42 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Sat, 6 Jul 2024 06:42:22 +0000 (14:42 +0800)]
同步语言文件
penglei [Sat, 6 Jul 2024 04:13:18 +0000 (12:13 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Sat, 6 Jul 2024 04:12:31 +0000 (12:12 +0800)]
update version to V1.1.14
penglei [Sat, 6 Jul 2024 04:01:05 +0000 (12:01 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Sat, 6 Jul 2024 03:55:01 +0000 (11:55 +0800)]
添加 user版本，去掉日志版本 编译指令 ./autobuild.sh user 即可
penglei [Sat, 6 Jul 2024 01:14:17 +0000 (09:14 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
罗正 [Fri, 5 Jul 2024 13:51:09 +0000 (13:51 +0000)]
Merge #470 into sdk602patch0626 from refs/changes/470/head
Code review from 罗正
* refs/changes/470/head: (2 commits squashed)
- Ai语音修改，遗留Label闪屏和字数过长后段不显示问题，
与蓝鹊app联调经常发送了语音没有返回内容
- 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/470
SnickerSun [Fri, 5 Jul 2024 13:48:56 +0000 (21:48 +0800)]
优化文件接收逻辑。添加重复包判定。
SnickerSun [Fri, 5 Jul 2024 13:03:28 +0000 (21:03 +0800)]
release V1.1.13
SnickerSun [Fri, 5 Jul 2024 13:02:53 +0000 (21:02 +0800)]
cat1 power on off 指令合并
penglei [Fri, 5 Jul 2024 12:55:08 +0000 (20:55 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
彭磊 [Fri, 5 Jul 2024 12:54:36 +0000 (12:54 +0000)]
Merge #468 into sdk602patch0626 from refs/changes/468/head
优化天线蓝牙产测，优化久坐提醒闹钟，添加extra info数据
* refs/changes/468/head: (1 commits squashed)
- 优化天线蓝牙产测，优化久坐提醒闹钟，添加extra info数据
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/468
penglei [Fri, 5 Jul 2024 12:50:26 +0000 (20:50 +0800)]
优化天线蓝牙产测，优化久坐提醒闹钟，添加extra info数据
Caisking [Fri, 5 Jul 2024 12:48:29 +0000 (20:48 +0800)]
message界面修改部分
Caisking [Fri, 5 Jul 2024 10:29:06 +0000 (18:29 +0800)]
message item增加来回滚动属性
Caisking [Fri, 5 Jul 2024 10:16:04 +0000 (18:16 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Fri, 5 Jul 2024 10:15:58 +0000 (18:15 +0800)]
增加并且优化表盘样式Slice
hcj [Fri, 5 Jul 2024 09:20:45 +0000 (17:20 +0800)]
合并蓝牙支付宝服务
Caisking [Fri, 5 Jul 2024 08:46:39 +0000 (16:46 +0800)]
修复主界面不刷新
Caisking [Fri, 5 Jul 2024 07:32:43 +0000 (15:32 +0800)]
血氧同步适配按键事件
Caisking [Fri, 5 Jul 2024 07:31:04 +0000 (15:31 +0800)]
修复按键适配心率导致的死机
Caisking [Fri, 5 Jul 2024 07:30:22 +0000 (15:30 +0800)]
修复死机文件内存泄漏 增加定制时间字符串接口
Caisking [Fri, 5 Jul 2024 03:10:31 +0000 (11:10 +0800)]
修复心率界面 修改死机分析脚本
SnickerSun [Fri, 5 Jul 2024 03:01:12 +0000 (11:01 +0800)]
修复同步0521分支中 applist 代码带来的编译问题。
SnickerSun [Fri, 5 Jul 2024 03:00:25 +0000 (11:00 +0800)]
同步0521分支最新AiVoice代码
Caisking [Fri, 5 Jul 2024 02:47:39 +0000 (10:47 +0800)]
补
Caisking [Fri, 5 Jul 2024 02:46:37 +0000 (10:46 +0800)]
补交
Caisking [Fri, 5 Jul 2024 02:34:46 +0000 (10:34 +0800)]
解决训练数据泄漏
SnickerSun [Thu, 4 Jul 2024 13:27:22 +0000 (21:27 +0800)]
update to V1.0.12
luozheng [Thu, 4 Jul 2024 13:15:53 +0000 (21:15 +0800)]
下拉视图更新
Caisking [Thu, 4 Jul 2024 13:12:52 +0000 (21:12 +0800)]
修复拼写错误
Caisking [Thu, 4 Jul 2024 12:52:30 +0000 (20:52 +0800)]
增加睡眠UI数据存储
Caisking [Thu, 4 Jul 2024 12:49:13 +0000 (20:49 +0800)]
修改每日目标默认值以及公里显示
penglei [Thu, 4 Jul 2024 12:42:38 +0000 (20:42 +0800)]
添加久坐提醒闹钟，优化cat1蓝牙产测
Caisking [Thu, 4 Jul 2024 11:23:23 +0000 (19:23 +0800)]
优化睡眠UI
Caisking [Thu, 4 Jul 2024 11:21:04 +0000 (19:21 +0800)]
修改Slice切换速度为200ms
Caisking [Thu, 4 Jul 2024 11:19:40 +0000 (19:19 +0800)]
修复训练协议同步的条数计算；部分数据增加；时间修改
luozheng [Thu, 4 Jul 2024 11:16:52 +0000 (19:16 +0800)]
1.ai语音修改
2.解决下拉视图信号显示问题
3.喝水提醒修改
Caisking [Thu, 4 Jul 2024 10:42:23 +0000 (18:42 +0800)]
去除主界面上下界面的PreLoad
Caisking [Thu, 4 Jul 2024 10:40:22 +0000 (18:40 +0800)]
心率view优化
hcj [Thu, 4 Jul 2024 10:39:07 +0000 (18:39 +0800)]
添加0106协议
penglei [Thu, 4 Jul 2024 09:03:24 +0000 (17:03 +0800)]
优化睡眠消息接收
hcj [Thu, 4 Jul 2024 01:44:33 +0000 (09:44 +0800)]
mp3作者名字读取，由于utf16的编码，串口打印出来是乱码
luozheng [Wed, 3 Jul 2024 12:35:13 +0000 (20:35 +0800)]
久坐提醒修改
Caisking [Wed, 3 Jul 2024 11:48:47 +0000 (19:48 +0800)]
增加睡眠目标
Caisking [Wed, 3 Jul 2024 11:48:24 +0000 (19:48 +0800)]
更新语言资源文件
luozheng [Wed, 3 Jul 2024 11:28:30 +0000 (19:28 +0800)]
AI语音Model修改
Caisking [Wed, 3 Jul 2024 10:59:01 +0000 (18:59 +0800)]
增加早安闹钟响铃
Caisking [Wed, 3 Jul 2024 10:58:41 +0000 (18:58 +0800)]
修改部分消息优先级
luozheng [Wed, 3 Jul 2024 10:51:30 +0000 (18:51 +0800)]
修改倒计时铃声，修改下拉定时器停止逻辑，在下拉视图析构前停止定时器
Caisking [Wed, 3 Jul 2024 10:45:28 +0000 (18:45 +0800)]
修复applist列表
luozheng [Wed, 3 Jul 2024 10:39:59 +0000 (18:39 +0800)]
Ai语音修改
penglei [Wed, 3 Jul 2024 10:18:39 +0000 (18:18 +0800)]
补交
Caisking [Wed, 3 Jul 2024 07:44:59 +0000 (15:44 +0800)]
关闭心率血氧大部分日志打印
SnickerSun [Thu, 4 Jul 2024 13:24:07 +0000 (21:24 +0800)]
添加AT^LSFD指令查看打开的文件
SnickerSun [Thu, 4 Jul 2024 12:12:43 +0000 (20:12 +0800)]
适配一键双联功能
SnickerSun [Thu, 4 Jul 2024 11:05:07 +0000 (19:05 +0800)]
优化蓝牙名称初始化代码
SnickerSun [Thu, 4 Jul 2024 09:50:19 +0000 (17:50 +0800)]
优化bleservice注册流程，0626 patch版本bleservice可以正常使用了。
支付宝和一键双联还未实现
SnickerSun [Wed, 3 Jul 2024 11:51:26 +0000 (19:51 +0800)]
修复bt编译问题
SnickerSun [Wed, 3 Jul 2024 11:46:04 +0000 (19:46 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Wed, 3 Jul 2024 11:45:52 +0000 (19:45 +0800)]
重构蓝牙服务架构，适配新的0626patch
彭磊 [Wed, 3 Jul 2024 06:54:49 +0000 (06:54 +0000)]
Merge #441 into sdk602patch0626 from refs/changes/441/head
优化小睡与睡眠消息接收
* refs/changes/441/head: (1 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/441
Caisking [Wed, 3 Jul 2024 03:05:33 +0000 (11:05 +0800)]
修复睡眠数据提交
(cherry picked from commit
15144367)
SnickerSun [Wed, 3 Jul 2024 03:16:29 +0000 (11:16 +0800)]
同步0626未提交的资源文件、说明文件及蓝牙部分代码
SnickerSun [Tue, 2 Jul 2024 15:19:58 +0000 (23:19 +0800)]
update version V1.0.10
snickersun@163.com [Tue, 2 Jul 2024 15:18:38 +0000 (23:18 +0800)]
Merge branch sdk602patch0626 into sdk602patch0521 (Conflict resolved online)
# Conflicts:
# code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
# code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
Caisking [Tue, 2 Jul 2024 12:45:04 +0000 (20:45 +0800)]
部分提交更新
projects / mirrors / FD230.git / log