mirrors/FD230.git
2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 1135/1 1135/head 1136/target/1 1137/target/1 1138/target/1
SnickerSun [Wed, 9 Oct 2024 04:22:54 +0000 (12:22 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化抬腕亮屏tp驱动恢复有时失效问题
SnickerSun [Wed, 9 Oct 2024 04:22:43 +0000 (12:22 +0800)]
优化抬腕亮屏tp驱动恢复有时失效问题
消息提醒唤醒后马达震动过久问题

2 years agoMerge #1133 into sdk602patch0626 from refs/changes/1133/head 1135/target/1
彭磊 [Wed, 9 Oct 2024 03:56:15 +0000 (03:56 +0000)]
Merge #1133 into sdk602patch0626 from refs/changes/1133/head

Code review from 彭磊

* refs/changes/1133/head: (18 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

  - 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

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - debug界面添加睡眠数据以及睡眠状态runtime,更新cywee算法库修复配速BUG,优化睡眠模式alarm逻辑

  - 修改gsensor FIFO笔数为15笔 并同步运动心率修改

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 回退alarm 睡眠闹钟修改

  - 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

  - 修改心率数据消息为1秒1次,优化省电模式蓝牙开关逻辑

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

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/1133
2 years ago修改蓝牙调试窗口 修改支付宝广播开启位置 修改目标达成界面内存泄漏 1134/1 1134/head
hcj [Wed, 9 Oct 2024 03:49:05 +0000 (11:49 +0800)]
修改蓝牙调试窗口 修改支付宝广播开启位置 修改目标达成界面内存泄漏

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Wed, 9 Oct 2024 03:36:39 +0000 (11:36 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years agorelease V1.1.62 1132/1 1132/head 1133/target/1 1134/target/1
SnickerSun [Wed, 9 Oct 2024 03:19:29 +0000 (11:19 +0800)]
release V1.1.62

2 years ago修复长按进入other_click的问题,当下支持1~8 click 1131/1 1131/head 1132/target/1
SnickerSun [Wed, 9 Oct 2024 03:10:35 +0000 (11:10 +0800)]
修复长按进入other_click的问题,当下支持1~8 click

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1130/1 1130/head 1131/target/1
Caisking [Wed, 9 Oct 2024 02:24:40 +0000 (10:24 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago系统:修复label滚动速度问题
Caisking [Wed, 9 Oct 2024 02:24:36 +0000 (10:24 +0800)]
系统:修复label滚动速度问题

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1127/2 1127/head 1130/target/1
luozheng [Wed, 9 Oct 2024 02:14:58 +0000 (10:14 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago常亮屏函数注释set_screen_set_keepon_timeout(0)
luozheng [Wed, 9 Oct 2024 02:14:50 +0000 (10:14 +0800)]
常亮屏函数注释set_screen_set_keepon_timeout(0)

2 years agoMerge #1126 into sdk602patch0626 from refs/changes/1126/head 1127/target/2
彭磊 [Wed, 9 Oct 2024 02:13:37 +0000 (02:13 +0000)]
Merge #1126 into sdk602patch0626 from refs/changes/1126/head

Code review from 彭磊

* refs/changes/1126/head: (13 commits squashed)

  - 修改小睡数据合并成一个文件

  - 修改小睡数据存入一个文件(默认关闭 待协议调通)

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - debug界面添加睡眠数据以及睡眠状态runtime,更新cywee算法库修复配速BUG,优化睡眠模式alarm逻辑

  - 修改gsensor FIFO笔数为15笔 并同步运动心率修改

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 回退alarm 睡眠闹钟修改

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/1126
2 years agoMerge #1129 into sdk602patch0626 from refs/changes/1129/head
胡传军 [Wed, 9 Oct 2024 02:00:04 +0000 (02:00 +0000)]
Merge #1129 into sdk602patch0626 from refs/changes/1129/head

修改开启运动回复模式,改由UI来回复是否成功

* refs/changes/1129/head: (1 commits squashed)

  - 修改开启运动回复模式,改由UI来回复是否成功

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/1129
2 years ago修改开启运动回复模式,改由UI来回复是否成功 1129/1 1129/head
hcj [Wed, 9 Oct 2024 01:44:19 +0000 (09:44 +0800)]
修改开启运动回复模式,改由UI来回复是否成功

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1128/1 1128/head
Caisking [Wed, 9 Oct 2024 01:38:28 +0000 (09:38 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago消息:增加省电模式不进行消息弹窗
Caisking [Wed, 9 Oct 2024 01:37:26 +0000 (09:37 +0800)]
消息:增加省电模式不进行消息弹窗

2 years ago 睡眠数据修正 1123/6 1123/head 1126/target/2 1128/target/1 1129/target/1
hcj [Wed, 9 Oct 2024 01:18:05 +0000 (09:18 +0800)]
 睡眠数据修正

2 years ago小睡数据修改待测试(补 1123/5
hcj [Tue, 8 Oct 2024 12:38:11 +0000 (20:38 +0800)]
小睡数据修改待测试(补

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1127/1
luozheng [Tue, 8 Oct 2024 12:12:34 +0000 (20:12 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago解决#922绑定iOS手机,蓝牙来电手表提示音刚开始时默认通知铃声然后中断播放手机来电铃声bug
luozheng [Tue, 8 Oct 2024 11:45:08 +0000 (19:45 +0800)]
解决#922绑定iOS手机,蓝牙来电手表提示音刚开始时默认通知铃声然后中断播放手机来电铃声bug
解决#934,静音模式,蓝牙来电有响铃bug
解决925,勿扰模式下,蓝牙来电有震动响铃bug

2 years ago小睡数据修改待测试 1123/4
hcj [Tue, 8 Oct 2024 10:44:40 +0000 (18:44 +0800)]
小睡数据修改待测试

2 years ago增加label控制
Caisking [Tue, 8 Oct 2024 10:42:33 +0000 (18:42 +0800)]
增加label控制

2 years ago解决#911,4G提示语字体太大,需要缩小,参考蓝牙界面提示语字体大小bug
luozheng [Tue, 8 Oct 2024 10:21:00 +0000 (18:21 +0800)]
解决#911,4G提示语字体太大,需要缩小,参考蓝牙界面提示语字体大小bug
解决#936,运动识别提示语字体大小修改,参考蓝牙提示语bug

2 years ago系统:修改无死机文件显示
Caisking [Tue, 8 Oct 2024 10:14:18 +0000 (18:14 +0800)]
系统:修改无死机文件显示

2 years ago#940 运动记录里的卡路里数据与运动完练页显示的不一致
Caisking [Tue, 8 Oct 2024 10:13:56 +0000 (18:13 +0800)]
#940 运动记录里的卡路里数据与运动完练页显示的不一致

2 years ago系统:修改label设置为不因为长度改变滚动速度
Caisking [Tue, 8 Oct 2024 09:25:38 +0000 (17:25 +0800)]
系统:修改label设置为不因为长度改变滚动速度

2 years ago系统:修改系统开关机日志的存储方式
Caisking [Tue, 8 Oct 2024 09:25:02 +0000 (17:25 +0800)]
系统:修改系统开关机日志的存储方式

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1123/3
hcj [Tue, 8 Oct 2024 09:17:22 +0000 (17:17 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago修复小睡死机问题
hcj [Tue, 8 Oct 2024 09:17:11 +0000 (17:17 +0800)]
修复小睡死机问题

2 years ago解绑确认弹窗添加关机动画
luozheng [Tue, 8 Oct 2024 08:46:38 +0000 (16:46 +0800)]
解绑确认弹窗添加关机动画

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Tue, 8 Oct 2024 08:22:45 +0000 (16:22 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #1125 into sdk602patch0626 from refs/changes/1125/head 1123/target/2 1126/target/1 1127/target/1
袁清梦 [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 &#39;sdk602patch0626&#39; 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
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Tue, 8 Oct 2024 08:12:54 +0000 (16:12 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago增加ota传输时自动拒接来电 1123/2
hcj [Tue, 8 Oct 2024 07:42:13 +0000 (15:42 +0800)]
增加ota传输时自动拒接来电

2 years agoble对接调试窗口
hcj [Tue, 8 Oct 2024 07:41:05 +0000 (15:41 +0800)]
ble对接调试窗口

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1125/1 1125/head
Caisking [Tue, 8 Oct 2024 07:35:56 +0000 (15:35 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago系统:增加死机文件名称列表的日志
Caisking [Tue, 8 Oct 2024 07:35:51 +0000 (15:35 +0800)]
系统:增加死机文件名称列表的日志

2 years ago解决#17,手表,充电时下拉状态栏电量图标不显示充电状态bug
luozheng [Tue, 8 Oct 2024 07:32:22 +0000 (15:32 +0800)]
解决#17,手表,充电时下拉状态栏电量图标不显示充电状态bug

2 years ago修改二维码界面点击五次进入产测界面,系统关于界面点击5次进入调试界面 1124/1 1124/head
luozheng [Tue, 8 Oct 2024 07:25:20 +0000 (15:25 +0800)]
修改二维码界面点击五次进入产测界面,系统关于界面点击5次进入调试界面

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Tue, 8 Oct 2024 07:13:33 +0000 (15:13 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1123/1
hcj [Tue, 8 Oct 2024 07:03:34 +0000 (15:03 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago燃脂时间BUG修改
hcj [Tue, 8 Oct 2024 07:03:21 +0000 (15:03 +0800)]
燃脂时间BUG修改

2 years ago系统:安全模式增加手表蓝牙名称,版本号,固件版本等相关信息
Caisking [Tue, 8 Oct 2024 06:46:23 +0000 (14:46 +0800)]
系统:安全模式增加手表蓝牙名称,版本号,固件版本等相关信息

2 years agorelease V1.1.61 1122/1 1122/head 1123/target/1 1124/target/1 1125/target/1
SnickerSun [Tue, 8 Oct 2024 03:04:07 +0000 (11:04 +0800)]
release V1.1.61

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1121/1 1121/head 1122/target/1
hcj [Tue, 8 Oct 2024 02:57:21 +0000 (10:57 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago修复log上传BUG
hcj [Tue, 8 Oct 2024 02:56:48 +0000 (10:56 +0800)]
修复log上传BUG

2 years agoMerge #1118 into sdk602patch0626 from refs/changes/1118/head 1121/target/1
罗正 [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 &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 解决恢复出厂设置后进入训练界面右滑退出进入语言界面

  - 屏蔽连接动画界面的title

  - 优化语言列表,解决语言列表最后一项被遮挡住bug

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 回退音乐来源界面代码修改

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 语言列表修改

  - 解决蓝牙耳机界面内存泄漏问题
    解决蓝牙耳机界面,如果进入搜索界面开启定时器后,按按键未关闭定时器问题

  - Merge branch &#39;sdk602patch0626&#39; 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
2 years agoMerge #1119 into sdk602patch0626 from refs/changes/1119/head
胡传军 [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
2 years ago系统:调试窗口增加电池相关服务 1120/1 1120/head
Caisking [Tue, 8 Oct 2024 02:23:45 +0000 (10:23 +0800)]
系统:调试窗口增加电池相关服务

2 years ago修复蓝牙释放,异步进程释放可能死机 1119/1 1119/head
hcj [Tue, 8 Oct 2024 01:48:44 +0000 (09:48 +0800)]
修复蓝牙释放,异步进程释放可能死机

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1118/1 1118/head
luozheng [Sat, 5 Oct 2024 11:35:48 +0000 (19:35 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago解决蓝牙耳机界面内存泄漏问题
luozheng [Sat, 5 Oct 2024 11:35:36 +0000 (19:35 +0800)]
解决蓝牙耳机界面内存泄漏问题
解决蓝牙耳机界面,如果进入搜索界面开启定时器后,按按键未关闭定时器问题

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1117/1 1117/head 1118/target/1 1119/target/1 1120/target/1
Caisking [Sat, 5 Oct 2024 11:27:24 +0000 (19:27 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago#886手表,快捷训练卡片修改骑行为自由训练
Caisking [Sat, 5 Oct 2024 11:27:17 +0000 (19:27 +0800)]
#886手表,快捷训练卡片修改骑行为自由训练

2 years agoMerge #1116 into sdk602patch0626 from refs/changes/1116/head 1117/target/1
罗正 [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 &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 解决恢复出厂设置后进入训练界面右滑退出进入语言界面

  - 屏蔽连接动画界面的title

  - 优化语言列表,解决语言列表最后一项被遮挡住bug

  - Merge branch &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 回退音乐来源界面代码修改

  - Merge branch &#39;sdk602patch0626&#39; 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
2 years ago语言列表修改 1116/2 1116/head
luozheng [Sat, 5 Oct 2024 10:22:21 +0000 (18:22 +0800)]
语言列表修改

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1116/1
luozheng [Sat, 5 Oct 2024 10:21:08 +0000 (18:21 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago回退音乐来源界面代码修改
luozheng [Sat, 5 Oct 2024 10:20:54 +0000 (18:20 +0800)]
回退音乐来源界面代码修改

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1115/1 1115/head
hcj [Sat, 5 Oct 2024 10:18:03 +0000 (18:18 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago多国语言适配传输界面
hcj [Sat, 5 Oct 2024 10:17:39 +0000 (18:17 +0800)]
多国语言适配传输界面

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Sat, 5 Oct 2024 09:54:11 +0000 (17:54 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化语言列表,解决语言列表最后一项被遮挡住bug
luozheng [Sat, 5 Oct 2024 09:52:55 +0000 (17:52 +0800)]
优化语言列表,解决语言列表最后一项被遮挡住bug

2 years ago充电弹窗:修改回调与UI的析构顺序
Caisking [Sat, 5 Oct 2024 09:50:41 +0000 (17:50 +0800)]
充电弹窗:修改回调与UI的析构顺序

2 years agorelease V1.1.60 1114/1 1114/head 1115/target/1 1116/target/1
SnickerSun [Sat, 5 Oct 2024 09:43:08 +0000 (17:43 +0800)]
release V1.1.60

2 years ago系统:修改充电弹窗的CallBack刷新;提前预防刷新空组件 1113/1 1113/head 1114/target/1
Caisking [Sat, 5 Oct 2024 09:41:01 +0000 (17:41 +0800)]
系统:修改充电弹窗的CallBack刷新;提前预防刷新空组件

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1112/1 1112/head 1113/target/1
Caisking [Sat, 5 Oct 2024 09:08:43 +0000 (17:08 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago#801 消息通知功能,下滑后,无法回到原位
Caisking [Sat, 5 Oct 2024 09:06:20 +0000 (17:06 +0800)]
#801 消息通知功能,下滑后,无法回到原位

2 years ago消息:修复消息列表显示不完成的按键
Caisking [Sat, 5 Oct 2024 09:03:47 +0000 (17:03 +0800)]
消息:修复消息列表显示不完成的按键

2 years ago消息:修复消息详情界面显示不完全的按键
Caisking [Sat, 5 Oct 2024 09:03:26 +0000 (17:03 +0800)]
消息:修复消息详情界面显示不完全的按键

2 years ago系统:修复系统日志的存储
Caisking [Sat, 5 Oct 2024 09:02:49 +0000 (17:02 +0800)]
系统:修复系统日志的存储

2 years ago屏蔽连接动画界面的title
luozheng [Sat, 5 Oct 2024 08:40:32 +0000 (16:40 +0800)]
屏蔽连接动画界面的title

2 years ago消息:修复消息Slice的析构
Caisking [Sat, 5 Oct 2024 08:21:01 +0000 (16:21 +0800)]
消息:修复消息Slice的析构

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 1111/1 1111/head 1112/target/1
SnickerSun [Sat, 5 Oct 2024 07:58:04 +0000 (15:58 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #1110 into sdk602patch0626 from refs/changes/1110/head 1111/target/1
彭磊 [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
2 years agoMerge #1109 into sdk602patch0626 from refs/changes/1109/head
罗正 [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 &#39;sdk602patch0626&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - Merge branch &#39;sdk602patch0626&#39; 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
2 years ago恢复拖动原始默认值10,让拖动更容易 1108/2 1108/head
SnickerSun [Sat, 5 Oct 2024 07:48:13 +0000 (15:48 +0800)]
恢复拖动原始默认值10,让拖动更容易

2 years ago增加内存泄露编译参数 leakcheck
SnickerSun [Sat, 5 Oct 2024 07:45:00 +0000 (15:45 +0800)]
增加内存泄露编译参数 leakcheck
autoota的编译参数 autoota  autootacli

2 years ago解决恢复出厂设置后进入训练界面右滑退出进入语言界面 1109/1 1109/head
luozheng [Sat, 5 Oct 2024 07:42:00 +0000 (15:42 +0800)]
解决恢复出厂设置后进入训练界面右滑退出进入语言界面

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Sat, 5 Oct 2024 07:19:46 +0000 (15:19 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago在安全模式里,打开AutoOta开启 SPP 服务 1108/1
SnickerSun [Sat, 5 Oct 2024 06:43:26 +0000 (14:43 +0800)]
在安全模式里,打开AutoOta开启 SPP 服务

2 years ago修正打开cat1时 对 Veto PM_ID_DEBUG的操作
SnickerSun [Sat, 5 Oct 2024 06:42:11 +0000 (14:42 +0800)]
修正打开cat1时 对 Veto PM_ID_DEBUG的操作

2 years ago修复可能因ble连接不稳定导致的广播误关,无法重新开启广播,导致重连失败(补 1107/2 1107/head 1108/target/1 1109/target/1 1110/target/1
hcj [Sat, 5 Oct 2024 06:22:11 +0000 (14:22 +0800)]
修复可能因ble连接不稳定导致的广播误关,无法重新开启广播,导致重连失败(补

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1107/1
hcj [Sat, 5 Oct 2024 06:14:30 +0000 (14:14 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago修复可能因ble连接不稳定导致的广播误关,无法重新开启广播,导致重连失败
hcj [Sat, 5 Oct 2024 06:13:35 +0000 (14:13 +0800)]
修复可能因ble连接不稳定导致的广播误关,无法重新开启广播,导致重连失败

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Sat, 5 Oct 2024 05:20:56 +0000 (13:20 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修改音乐来源界面,蓝牙耳机连接状态错误显示
luozheng [Sat, 5 Oct 2024 05:20:48 +0000 (13:20 +0800)]
修改音乐来源界面,蓝牙耳机连接状态错误显示

2 years ago睡眠:修复睡眠卡片析构 1106/1 1106/head 1107/target/1
Caisking [Sat, 5 Oct 2024 05:17:15 +0000 (13:17 +0800)]
睡眠:修复睡眠卡片析构

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Sat, 5 Oct 2024 05:15:25 +0000 (13:15 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago训练:修改“休闲运动”列表
Caisking [Sat, 5 Oct 2024 05:15:18 +0000 (13:15 +0800)]
训练:修改“休闲运动”列表

2 years ago训练:修改“其他”列表
Caisking [Sat, 5 Oct 2024 05:14:47 +0000 (13:14 +0800)]
训练:修改“其他”列表

2 years ago训练:修改“极限运动”列表
Caisking [Sat, 5 Oct 2024 05:14:32 +0000 (13:14 +0800)]
训练:修改“极限运动”列表

2 years ago训练:修改“冰上运动”列表
Caisking [Sat, 5 Oct 2024 05:14:18 +0000 (13:14 +0800)]
训练:修改“冰上运动”列表

2 years ago训练:修改”健身类“列表
Caisking [Sat, 5 Oct 2024 05:14:03 +0000 (13:14 +0800)]
训练:修改”健身类“列表

2 years ago训练:修改“舞蹈类"列表
Caisking [Sat, 5 Oct 2024 05:13:41 +0000 (13:13 +0800)]
训练:修改“舞蹈类"列表

2 years ago训练:修改“球类运动”列表
Caisking [Sat, 5 Oct 2024 05:13:23 +0000 (13:13 +0800)]
训练:修改“球类运动”列表

2 years ago训练:修改“水上运动”列表
Caisking [Sat, 5 Oct 2024 05:13:04 +0000 (13:13 +0800)]
训练:修改“水上运动”列表

2 years ago● 呼吸训练多国语言适配 1105/3 1105/head 1106/target/1
luozheng [Sat, 5 Oct 2024 04:59:17 +0000 (12:59 +0800)]
● 呼吸训练多国语言适配
● 4G界面多国语言适配,
● 运动识别多国语言适配

2 years ago多国语言字体资源更新 1105/2
luozheng [Sat, 5 Oct 2024 04:27:38 +0000 (12:27 +0800)]
多国语言字体资源更新

2 years ago训练:修复“更多”列表的析构
Caisking [Sat, 5 Oct 2024 03:58:12 +0000 (11:58 +0800)]
训练:修复“更多”列表的析构

2 years ago训练:修改“健身类”列表
Caisking [Sat, 5 Oct 2024 03:01:41 +0000 (11:01 +0800)]
训练:修改“健身类”列表