hcj [Tue, 8 Oct 2024 09:17:22 +0000 (17:17 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Tue, 8 Oct 2024 09:17:11 +0000 (17:17 +0800)]
修复小睡死机问题
袁清梦 [Tue, 8 Oct 2024 08:13:21 +0000 (08:13 +0000)]
Merge #1125 into sdk602patch0626 from refs/changes/1125/head
Code review from 袁清梦
* refs/changes/1125/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/1125
hcj [Tue, 8 Oct 2024 07:42:13 +0000 (15:42 +0800)]
增加ota传输时自动拒接来电
hcj [Tue, 8 Oct 2024 07:41:05 +0000 (15:41 +0800)]
ble对接调试窗口
luozheng [Tue, 8 Oct 2024 07:25:20 +0000 (15:25 +0800)]
修改二维码界面点击五次进入产测界面，系统关于界面点击5次进入调试界面
luozheng [Tue, 8 Oct 2024 07:13:33 +0000 (15:13 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
hcj [Tue, 8 Oct 2024 07:03:34 +0000 (15:03 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Tue, 8 Oct 2024 07:03:21 +0000 (15:03 +0800)]
燃脂时间BUG修改
SnickerSun [Tue, 8 Oct 2024 03:04:07 +0000 (11:04 +0800)]
release V1.1.61
hcj [Tue, 8 Oct 2024 02:57:21 +0000 (10:57 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Tue, 8 Oct 2024 02:56:48 +0000 (10:56 +0800)]
修复log上传BUG
罗正 [Tue, 8 Oct 2024 02:47:34 +0000 (02:47 +0000)]
Merge #1118 into sdk602patch0626 from refs/changes/1118/head
Code review from 罗正
* refs/changes/1118/head: (12 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
- 解决恢复出厂设置后进入训练界面右滑退出进入语言界面
- 屏蔽连接动画界面的title
- 优化语言列表，解决语言列表最后一项被遮挡住bug
- 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
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/1118
胡传军 [Tue, 8 Oct 2024 02:46:22 +0000 (02:46 +0000)]
Merge #1119 into sdk602patch0626 from refs/changes/1119/head
修复蓝牙释放，异步进程释放可能死机
* refs/changes/1119/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/1119
Caisking [Tue, 8 Oct 2024 02:23:45 +0000 (10:23 +0800)]
系统：调试窗口增加电池相关服务
hcj [Tue, 8 Oct 2024 01:48:44 +0000 (09:48 +0800)]
修复蓝牙释放，异步进程释放可能死机
luozheng [Sat, 5 Oct 2024 11:35:48 +0000 (19:35 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Sat, 5 Oct 2024 11:35:36 +0000 (19:35 +0800)]
解决蓝牙耳机界面内存泄漏问题
解决蓝牙耳机界面，如果进入搜索界面开启定时器后，按按键未关闭定时器问题
Caisking [Sat, 5 Oct 2024 11:27:24 +0000 (19:27 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Sat, 5 Oct 2024 11:27:17 +0000 (19:27 +0800)]
#886手表，快捷训练卡片修改骑行为自由训练
罗正 [Sat, 5 Oct 2024 10:26:37 +0000 (10:26 +0000)]
Merge #1116 into sdk602patch0626 from refs/changes/1116/head
Code review from 罗正
* refs/changes/1116/head: (10 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
- 解决恢复出厂设置后进入训练界面右滑退出进入语言界面
- 屏蔽连接动画界面的title
- 优化语言列表，解决语言列表最后一项被遮挡住bug
- 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/1116
luozheng [Sat, 5 Oct 2024 10:22:21 +0000 (18:22 +0800)]
语言列表修改
luozheng [Sat, 5 Oct 2024 10:21:08 +0000 (18:21 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Sat, 5 Oct 2024 10:20:54 +0000 (18:20 +0800)]
回退音乐来源界面代码修改
hcj [Sat, 5 Oct 2024 10:18:03 +0000 (18:18 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Sat, 5 Oct 2024 10:17:39 +0000 (18:17 +0800)]
多国语言适配传输界面
luozheng [Sat, 5 Oct 2024 09:54:11 +0000 (17:54 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Sat, 5 Oct 2024 09:52:55 +0000 (17:52 +0800)]
优化语言列表，解决语言列表最后一项被遮挡住bug
Caisking [Sat, 5 Oct 2024 09:50:41 +0000 (17:50 +0800)]
充电弹窗：修改回调与UI的析构顺序
SnickerSun [Sat, 5 Oct 2024 09:43:08 +0000 (17:43 +0800)]
release V1.1.60
Caisking [Sat, 5 Oct 2024 09:41:01 +0000 (17:41 +0800)]
系统：修改充电弹窗的CallBack刷新；提前预防刷新空组件
Caisking [Sat, 5 Oct 2024 09:08:43 +0000 (17:08 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Sat, 5 Oct 2024 09:06:20 +0000 (17:06 +0800)]
#801 消息通知功能，下滑后，无法回到原位
Caisking [Sat, 5 Oct 2024 09:03:47 +0000 (17:03 +0800)]
消息：修复消息列表显示不完成的按键
Caisking [Sat, 5 Oct 2024 09:03:26 +0000 (17:03 +0800)]
消息：修复消息详情界面显示不完全的按键
Caisking [Sat, 5 Oct 2024 09:02:49 +0000 (17:02 +0800)]
系统：修复系统日志的存储
luozheng [Sat, 5 Oct 2024 08:40:32 +0000 (16:40 +0800)]
屏蔽连接动画界面的title
Caisking [Sat, 5 Oct 2024 08:21:01 +0000 (16:21 +0800)]
消息：修复消息Slice的析构
SnickerSun [Sat, 5 Oct 2024 07:58:04 +0000 (15:58 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
彭磊 [Sat, 5 Oct 2024 08:28:27 +0000 (08:28 +0000)]
Merge #1110 into sdk602patch0626 from refs/changes/1110/head
修改小睡数据合并成一个文件
* refs/changes/1110/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/1110
罗正 [Sat, 5 Oct 2024 08:25:08 +0000 (08:25 +0000)]
Merge #1109 into sdk602patch0626 from refs/changes/1109/head
Code review from 罗正
* refs/changes/1109/head: (4 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/1109
SnickerSun [Sat, 5 Oct 2024 07:48:13 +0000 (15:48 +0800)]
恢复拖动原始默认值10，让拖动更容易
SnickerSun [Sat, 5 Oct 2024 07:45:00 +0000 (15:45 +0800)]
增加内存泄露编译参数 leakcheck
autoota的编译参数 autoota autootacli
luozheng [Sat, 5 Oct 2024 07:42:00 +0000 (15:42 +0800)]
解决恢复出厂设置后进入训练界面右滑退出进入语言界面
luozheng [Sat, 5 Oct 2024 07:19:46 +0000 (15:19 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Sat, 5 Oct 2024 06:43:26 +0000 (14:43 +0800)]
在安全模式里，打开AutoOta开启 SPP 服务
SnickerSun [Sat, 5 Oct 2024 06:42:11 +0000 (14:42 +0800)]
修正打开cat1时 对 Veto PM_ID_DEBUG的操作
hcj [Sat, 5 Oct 2024 06:22:11 +0000 (14:22 +0800)]
修复可能因ble连接不稳定导致的广播误关，无法重新开启广播，导致重连失败（补
hcj [Sat, 5 Oct 2024 06:14:30 +0000 (14:14 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Sat, 5 Oct 2024 06:13:35 +0000 (14:13 +0800)]
修复可能因ble连接不稳定导致的广播误关，无法重新开启广播，导致重连失败
luozheng [Sat, 5 Oct 2024 05:20:56 +0000 (13:20 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Sat, 5 Oct 2024 05:20:48 +0000 (13:20 +0800)]
修改音乐来源界面，蓝牙耳机连接状态错误显示
Caisking [Sat, 5 Oct 2024 05:17:15 +0000 (13:17 +0800)]
睡眠：修复睡眠卡片析构
Caisking [Sat, 5 Oct 2024 05:15:25 +0000 (13:15 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Sat, 5 Oct 2024 05:15:18 +0000 (13:15 +0800)]
训练：修改“休闲运动”列表
Caisking [Sat, 5 Oct 2024 05:14:47 +0000 (13:14 +0800)]
训练：修改“其他”列表
Caisking [Sat, 5 Oct 2024 05:14:32 +0000 (13:14 +0800)]
训练：修改“极限运动”列表
Caisking [Sat, 5 Oct 2024 05:14:18 +0000 (13:14 +0800)]
训练：修改“冰上运动”列表
Caisking [Sat, 5 Oct 2024 05:14:03 +0000 (13:14 +0800)]
训练：修改”健身类“列表
Caisking [Sat, 5 Oct 2024 05:13:41 +0000 (13:13 +0800)]
训练：修改“舞蹈类"列表
Caisking [Sat, 5 Oct 2024 05:13:23 +0000 (13:13 +0800)]
训练：修改“球类运动”列表
Caisking [Sat, 5 Oct 2024 05:13:04 +0000 (13:13 +0800)]
训练：修改“水上运动”列表
luozheng [Sat, 5 Oct 2024 04:59:17 +0000 (12:59 +0800)]
● 呼吸训练多国语言适配
● 4G界面多国语言适配，
● 运动识别多国语言适配
luozheng [Sat, 5 Oct 2024 04:27:38 +0000 (12:27 +0800)]
多国语言字体资源更新
Caisking [Sat, 5 Oct 2024 03:58:12 +0000 (11:58 +0800)]
训练:修复“更多”列表的析构
Caisking [Sat, 5 Oct 2024 03:01:41 +0000 (11:01 +0800)]
训练：修改“健身类”列表
luozheng [Sat, 5 Oct 2024 03:01:28 +0000 (11:01 +0800)]
将一些不用翻译的组件字体设置为默认字体，避免在切换其他国语言时候该字库没有改字体而显示空白
luozheng [Sat, 5 Oct 2024 02:17:52 +0000 (10:17 +0800)]
解决查找手机标签被挡住bug
hcj [Sat, 5 Oct 2024 02:06:09 +0000 (10:06 +0800)]
语言选择提示固定为sc
luozheng [Sat, 5 Oct 2024 01:59:03 +0000 (09:59 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Fri, 4 Oct 2024 12:57:27 +0000 (20:57 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Fri, 4 Oct 2024 12:57:21 +0000 (20:57 +0800)]
训练：修改训练”更多“列表样式
罗正 [Fri, 4 Oct 2024 12:51:21 +0000 (12:51 +0000)]
Merge #1102 into sdk602patch0626 from refs/changes/1102/head
Code review from 罗正
* refs/changes/1102/head: (4 commits squashed)
- 完成#128,手表，呼吸训练，现在呼吸训练没有训练时长选择(需求)
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 解决呼吸训练的时长选择界面最后一个组件被遮住bug
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/1102
hcj [Fri, 4 Oct 2024 12:38:31 +0000 (20:38 +0800)]
完成提醒增加开关控制
luozheng [Fri, 4 Oct 2024 12:31:22 +0000 (20:31 +0800)]
解决呼吸训练的时长选择界面最后一个组件被遮住bug
hcj [Fri, 4 Oct 2024 12:26:55 +0000 (20:26 +0800)]
换新希伯来字体
luozheng [Fri, 4 Oct 2024 12:19:57 +0000 (20:19 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Fri, 4 Oct 2024 12:15:01 +0000 (20:15 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
luozheng [Fri, 4 Oct 2024 12:14:53 +0000 (20:14 +0800)]
完成#128,手表，呼吸训练，现在呼吸训练没有训练时长选择(需求)
Caisking [Fri, 4 Oct 2024 11:21:20 +0000 (19:21 +0800)]
系统：修改调试工具的刷新方式
hcj [Fri, 4 Oct 2024 11:17:57 +0000 (19:17 +0800)]
并
Caisking [Fri, 4 Oct 2024 11:17:53 +0000 (19:17 +0800)]
#627 手表端睡眠没有零星小睡显示时间
hcj [Fri, 4 Oct 2024 11:16:03 +0000 (19:16 +0800)]
目标达成弹窗添加
袁清梦 [Fri, 4 Oct 2024 10:30:12 +0000 (10:30 +0000)]
Merge #1100 into sdk602patch0626 from refs/changes/1100/head
调试窗口增加更新接口
* refs/changes/1100/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/1100
Caisking [Fri, 4 Oct 2024 10:28:19 +0000 (18:28 +0800)]
调试窗口增加更新接口
penglei [Fri, 4 Oct 2024 10:26:41 +0000 (18:26 +0800)]
解决编译问题
Caisking [Fri, 4 Oct 2024 10:03:05 +0000 (18:03 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Fri, 4 Oct 2024 10:01:28 +0000 (18:01 +0800)]
系统：增加系统开关机日志记录服务
Caisking [Fri, 4 Oct 2024 10:00:49 +0000 (18:00 +0800)]
系统：增加系统日志显示UI
penglei [Fri, 4 Oct 2024 09:26:13 +0000 (17:26 +0800)]
添加小睡数据读取，并与UI适配
添加蓝牙耳机音量映射
Caisking [Fri, 4 Oct 2024 08:04:33 +0000 (16:04 +0800)]
补交小睡cmake
Caisking [Fri, 4 Oct 2024 05:52:11 +0000 (13:52 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Fri, 4 Oct 2024 05:52:04 +0000 (13:52 +0800)]
优化pack的统一写法
Caisking [Fri, 4 Oct 2024 05:51:38 +0000 (13:51 +0800)]
睡眠：增加小睡UI
Caisking [Fri, 4 Oct 2024 05:51:13 +0000 (13:51 +0800)]
睡眠：增加睡眠目标显示
Caisking [Fri, 4 Oct 2024 05:50:40 +0000 (13:50 +0800)]
睡眠：增加小睡数据的相关接口
Caisking [Fri, 4 Oct 2024 05:50:14 +0000 (13:50 +0800)]
系统：增加线条的统一绘制接口
SnickerSun [Thu, 3 Oct 2024 13:02:00 +0000 (21:02 +0800)]
在uart输入AT唤醒手表，添加PM_ID_DEBUG Vote的时候，增加对 uar接收的使能标记的判断，解决偶尔Cat1 开启，引发不休眠问题。
SnickerSun [Thu, 3 Oct 2024 12:40:09 +0000 (20:40 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
snickersun@163.com [Thu, 3 Oct 2024 12:40:02 +0000 (12:40 +0000)]
Merge #1091 into sdk602patch0626 from refs/changes/1091/head
release V1.1.59
* refs/changes/1091/head: (1 commits squashed)
- release V1.1.59
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/1091
projects / mirrors / FD230.git / log