mirrors/FD230.git
23 months ago下拉界面更新优化:已经在下拉界面不重复调用更新函数,因为在定时器中已做更新 1463/2 1463/head 1464/target/1
luozheng [Tue, 26 Nov 2024 02:07:10 +0000 (10:07 +0800)]
下拉界面更新优化:已经在下拉界面不重复调用更新函数,因为在定时器中已做更新

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1463/1
luozheng [Mon, 25 Nov 2024 09:44:40 +0000 (17:44 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months ago验证离线日志保存问题
luozheng [Mon, 25 Nov 2024 09:42:14 +0000 (17:42 +0800)]
验证离线日志保存问题
1.在对应目录CMakeLists添加:
set(MODULE_NAME "app")
set(AUTO_DEF_FILE_ID TRUE)
2.DIAG日志日志打印对应文件加上关键打印即可
注意目前只开放error和warning级别的打印

23 months agoMerge #1461 into sdk602patch0911 from refs/changes/1461/head 1462/target/1 1463/target/1
彭磊 [Mon, 25 Nov 2024 06:52:07 +0000 (06:52 +0000)]
Merge #1461 into sdk602patch0911 from refs/changes/1461/head

优化电量跳电

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

  - 优化电量跳电

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1461
23 months ago增加ppg ble服务,连接notif限制 1460/1 1460/head
hcj [Mon, 25 Nov 2024 03:04:31 +0000 (11:04 +0800)]
增加ppg ble服务,连接notif限制

23 months agorelease V1.3.97 1459/2 1459/head 1460/target/1 1461/target/1
SnickerSun [Mon, 25 Nov 2024 00:12:39 +0000 (08:12 +0800)]
release V1.3.97

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Sun, 24 Nov 2024 08:19:50 +0000 (16:19 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agorelease modem固件 python app V16 1459/1
SnickerSun [Sun, 24 Nov 2024 02:33:40 +0000 (10:33 +0800)]
release modem固件 python app V16

23 months ago默认关闭心率广播,debug界面增加心率广播开关 1458/1 1458/head 1459/target/1
penglei [Sat, 23 Nov 2024 14:27:44 +0000 (22:27 +0800)]
默认关闭心率广播,debug界面增加心率广播开关

23 months agoapplist拨号盘修改表冠转不动问题 1457/1 1457/head 1458/target/1
Caisking [Sat, 23 Nov 2024 12:16:43 +0000 (20:16 +0800)]
applist拨号盘修改表冠转不动问题

23 months agorelease V1.3.96
Caisking [Sat, 23 Nov 2024 12:08:04 +0000 (20:08 +0800)]
release V1.3.96

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Sat, 23 Nov 2024 12:07:41 +0000 (20:07 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1456/1 1456/head 1457/target/1
penglei [Sat, 23 Nov 2024 12:06:41 +0000 (20:06 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months ago优化产测关机指令
penglei [Sat, 23 Nov 2024 12:06:34 +0000 (20:06 +0800)]
优化产测关机指令

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Sat, 23 Nov 2024 12:06:20 +0000 (20:06 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Sat, 23 Nov 2024 12:00:09 +0000 (20:00 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1454/5 1454/head 1456/target/1
hcj [Sat, 23 Nov 2024 11:53:55 +0000 (19:53 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

23 months ago修改4Gota升级判断条件(补
hcj [Sat, 23 Nov 2024 11:53:42 +0000 (19:53 +0800)]
修改4Gota升级判断条件(补

23 months agoMerge #1455 into sdk602patch0911 from refs/changes/1455/head 1454/target/2
袁清梦 [Sat, 23 Nov 2024 11:52:37 +0000 (11:52 +0000)]
Merge #1455 into sdk602patch0911 from refs/changes/1455/head

Code review from 袁清梦

* refs/changes/1455/head: (23 commits squashed)

  - 省电模式:优化提醒界面

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

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

  - 系统:增加恢复出厂删除离线日志

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

  - 训练:优化训练配速表心率表数据存储

  - 心率:修复心率控制的错误修改

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

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

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

  - release V1.3.92

  - autobulid.sh:屏蔽制作data.base

  - 运动:优化运动时长计算与显示

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

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

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

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

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

  - 系统:优化部分UI适配

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

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

  - 系统:优化关机流程

  - 运动:修改运动错误的状态

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1455
23 months ago添加TP超时重置操作 1453/2 1453/head
penglei [Sat, 23 Nov 2024 11:29:11 +0000 (19:29 +0800)]
添加TP超时重置操作

23 months ago修改4Gota升级判断条件 1454/4
hcj [Sat, 23 Nov 2024 10:40:38 +0000 (18:40 +0800)]
修改4Gota升级判断条件

23 months ago运动:修改运动错误的状态 1455/1 1455/head
Caisking [Sat, 23 Nov 2024 10:32:25 +0000 (18:32 +0800)]
运动:修改运动错误的状态

23 months agocat1升级条件判断修改 1454/3
hcj [Sat, 23 Nov 2024 09:29:17 +0000 (17:29 +0800)]
cat1升级条件判断修改

23 months agocat1升级限制修改 1454/2
hcj [Sat, 23 Nov 2024 08:55:33 +0000 (16:55 +0800)]
cat1升级限制修改

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Sat, 23 Nov 2024 08:34:49 +0000 (16:34 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1454/1
hcj [Sat, 23 Nov 2024 08:26:25 +0000 (16:26 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

23 months agocat1升级增加升级文件屏蔽
hcj [Sat, 23 Nov 2024 08:25:28 +0000 (16:25 +0800)]
cat1升级增加升级文件屏蔽

23 months ago系统:优化关机流程
Caisking [Sat, 23 Nov 2024 07:34:22 +0000 (15:34 +0800)]
系统:优化关机流程

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1453/1
penglei [Sat, 23 Nov 2024 06:25:50 +0000 (14:25 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months ago关闭4G时去除CAT1投票
penglei [Sat, 23 Nov 2024 06:25:42 +0000 (14:25 +0800)]
关闭4G时去除CAT1投票

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Sat, 23 Nov 2024 06:21:09 +0000 (14:21 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge #1450 into sdk602patch0911 from refs/changes/1450/head 1453/target/1 1454/target/1 1455/target/1
罗正 [Sat, 23 Nov 2024 06:20:59 +0000 (06:20 +0000)]
Merge #1450 into sdk602patch0911 from refs/changes/1450/head

Code review from 罗正

* refs/changes/1450/head: (23 commits squashed)

  - applsit拨号盘实现:目前,滑动一下屏幕APP转动一次,后续优化为多次转动

  - 解决倒计时界面内存泄漏问题

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

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

  - 修改显示方式页面多国语言显示问题

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

  - 解决查找手表后变成长亮屏

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

  - 拨号盘样式,实现跟手滑动效果

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

  - 解决ChatGPT,设置Key后不能用问题

  - 修改拨号盘图片显示bug

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

  - #865,手表与手机同时进行10分钟倒计时,手机倒计时已结束手表还剩余40秒bug

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

  - 删除直线列表风格

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

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

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

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

  - debug界面弹窗内容不清空改为限制50条

  - 解决#1189拨号盘风格,编码器旋转震动一次跳两个图标。旋转一个图标不会震动bug

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

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1450
23 months agoMerge #1452 into sdk602patch0911 from refs/changes/1452/head
彭磊 [Sat, 23 Nov 2024 06:20:47 +0000 (06:20 +0000)]
Merge #1452 into sdk602patch0911 from refs/changes/1452/head

老化测试添加关机按钮

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

  - 老化测试添加关机按钮

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1452
23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Fri, 22 Nov 2024 14:13:13 +0000 (22:13 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Fri, 22 Nov 2024 12:41:36 +0000 (20:41 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Fri, 22 Nov 2024 12:41:25 +0000 (20:41 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months ago老化测试添加关机按钮 1452/1 1452/head
penglei [Fri, 22 Nov 2024 10:59:08 +0000 (18:59 +0800)]
老化测试添加关机按钮

23 months agotouch_resume 放回到display_lcd_on函数中 1451/1 1451/head
SnickerSun [Fri, 22 Nov 2024 10:45:40 +0000 (18:45 +0800)]
touch_resume 放回到display_lcd_on函数中

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1450/1 1450/head
luozheng [Fri, 22 Nov 2024 10:26:38 +0000 (18:26 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months ago解决#1189拨号盘风格,编码器旋转震动一次跳两个图标。旋转一个图标不会震动bug
luozheng [Fri, 22 Nov 2024 10:01:29 +0000 (18:01 +0800)]
解决#1189拨号盘风格,编码器旋转震动一次跳两个图标。旋转一个图标不会震动bug

23 months ago修改i2creset 代码增加reset参数指定
SnickerSun [Fri, 22 Nov 2024 09:24:10 +0000 (17:24 +0800)]
修改i2creset 代码增加reset参数指定

23 months agoMerge #1449 into sdk602patch0911 from refs/changes/1449/head 1450/target/1 1451/target/1 1452/target/1
袁清梦 [Fri, 22 Nov 2024 09:02:38 +0000 (09:02 +0000)]
Merge #1449 into sdk602patch0911 from refs/changes/1449/head

Code review from 袁清梦

* refs/changes/1449/head: (19 commits squashed)

  - 省电模式:优化提醒界面

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

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

  - 系统:增加恢复出厂删除离线日志

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

  - 训练:优化训练配速表心率表数据存储

  - 心率:修复心率控制的错误修改

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

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

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

  - release V1.3.92

  - autobulid.sh:屏蔽制作data.base

  - 运动:优化运动时长计算与显示

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

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

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

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

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

  - 系统:优化部分UI适配

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1449
23 months ago系统:优化部分UI适配 1449/1 1449/head
Caisking [Fri, 22 Nov 2024 08:53:41 +0000 (16:53 +0800)]
系统:优化部分UI适配

23 months ago增加进入产测模式保持高频率蓝牙广播,优化睡眠文件存储,调整活体检测阈值 1448/1 1448/head
penglei [Fri, 22 Nov 2024 08:21:46 +0000 (16:21 +0800)]
增加进入产测模式保持高频率蓝牙广播,优化睡眠文件存储,调整活体检测阈值

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Fri, 22 Nov 2024 08:19:54 +0000 (16:19 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agodebug界面弹窗内容不清空改为限制50条
luozheng [Fri, 22 Nov 2024 07:37:54 +0000 (15:37 +0800)]
debug界面弹窗内容不清空改为限制50条

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Fri, 22 Nov 2024 07:28:52 +0000 (15:28 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge #1447 into sdk602patch0911 from refs/changes/1447/head 1448/target/1 1449/target/1
胡传军 [Fri, 22 Nov 2024 07:28:40 +0000 (07:28 +0000)]
Merge #1447 into sdk602patch0911 from refs/changes/1447/head

蓝牙接口增加初始化限制

* refs/changes/1447/head: (2 commits squashed)

  - 蓝牙接口增加初始化限制

  - 非4G电话界面结束4G电话场景修改

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1447
23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Fri, 22 Nov 2024 07:28:35 +0000 (15:28 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

23 months ago非4G电话界面结束4G电话场景修改 1447/2 1447/head
hcj [Fri, 22 Nov 2024 07:19:30 +0000 (15:19 +0800)]
非4G电话界面结束4G电话场景修改

23 months agorelease V1.3.95 1446/2 1446/head
SnickerSun [Fri, 22 Nov 2024 07:14:01 +0000 (15:14 +0800)]
release V1.3.95

23 months ago蓝牙接口增加初始化限制 1447/1
hcj [Fri, 22 Nov 2024 07:00:33 +0000 (15:00 +0800)]
蓝牙接口增加初始化限制

23 months ago优化tp驱动 1446/1
SnickerSun [Fri, 22 Nov 2024 06:46:03 +0000 (14:46 +0800)]
优化tp驱动

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Fri, 22 Nov 2024 02:19:01 +0000 (10:19 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Fri, 22 Nov 2024 02:05:31 +0000 (10:05 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Thu, 21 Nov 2024 15:59:40 +0000 (23:59 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months ago活动数据保存修改(补 1445/1 1445/head 1446/target/1 1447/target/1
hcj [Thu, 21 Nov 2024 15:59:15 +0000 (23:59 +0800)]
活动数据保存修改(补

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Thu, 21 Nov 2024 15:47:06 +0000 (23:47 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1444/1 1444/head 1445/target/1
hcj [Thu, 21 Nov 2024 15:46:32 +0000 (23:46 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

23 months ago活动数据保存修改(补
hcj [Thu, 21 Nov 2024 15:46:22 +0000 (23:46 +0800)]
活动数据保存修改(补

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Thu, 21 Nov 2024 15:40:05 +0000 (23:40 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge #1443 into sdk602patch0911 from refs/changes/1443/head 1444/target/1
彭磊 [Thu, 21 Nov 2024 15:30:44 +0000 (15:30 +0000)]
Merge #1443 into sdk602patch0911 from refs/changes/1443/head

Code review from 彭磊

* refs/changes/1443/head: (3 commits squashed)

  - 修复睡眠数据重启丢失bug,增加产测录音测试音量,优化gsensor算法时间同步

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

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

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1443
23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1443/1 1443/head
penglei [Thu, 21 Nov 2024 15:29:33 +0000 (23:29 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agorelease V1.3.93 1442/1 1442/head
SnickerSun [Thu, 21 Nov 2024 15:28:26 +0000 (23:28 +0800)]
release V1.3.93

23 months agoMerge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 1441/1 1441/head 1442/target/1 1443/target/1
SnickerSun [Thu, 21 Nov 2024 15:27:42 +0000 (23:27 +0800)]
Merge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agotp增加失效后的复原操作
SnickerSun [Thu, 21 Nov 2024 15:27:15 +0000 (23:27 +0800)]
tp增加失效后的复原操作

23 months ago燃脂时间数据存储增加限制 1440/2 1440/head 1441/target/1
hcj [Thu, 21 Nov 2024 14:00:57 +0000 (22:00 +0800)]
燃脂时间数据存储增加限制

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Thu, 21 Nov 2024 13:54:38 +0000 (21:54 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1440/1
hcj [Thu, 21 Nov 2024 13:26:03 +0000 (21:26 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

23 months agocat1版本修改
hcj [Thu, 21 Nov 2024 13:25:34 +0000 (21:25 +0800)]
cat1版本修改

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Thu, 21 Nov 2024 13:10:30 +0000 (21:10 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months ago电话增加退出逻辑判断
hcj [Thu, 21 Nov 2024 12:40:59 +0000 (20:40 +0800)]
电话增加退出逻辑判断

23 months agoMerge #1438 into sdk602patch0911 from refs/changes/1438/head 1440/target/1
罗正 [Thu, 21 Nov 2024 12:23:06 +0000 (12:23 +0000)]
Merge #1438 into sdk602patch0911 from refs/changes/1438/head

Code review from 罗正

* refs/changes/1438/head: (16 commits squashed)

  - applsit拨号盘实现:目前,滑动一下屏幕APP转动一次,后续优化为多次转动

  - 解决倒计时界面内存泄漏问题

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

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

  - 修改显示方式页面多国语言显示问题

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

  - 解决查找手表后变成长亮屏

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

  - 拨号盘样式,实现跟手滑动效果

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

  - 解决ChatGPT,设置Key后不能用问题

  - 修改拨号盘图片显示bug

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

  - #865,手表与手机同时进行10分钟倒计时,手机倒计时已结束手表还剩余40秒bug

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

  - 删除直线列表风格

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1438
23 months agoMerge #1435 into sdk602patch0911 from refs/changes/1435/head
袁清梦 [Thu, 21 Nov 2024 12:22:54 +0000 (12:22 +0000)]
Merge #1435 into sdk602patch0911 from refs/changes/1435/head

Code review from 袁清梦

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

  - 省电模式:优化提醒界面

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

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

  - 系统:增加恢复出厂删除离线日志

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

  - 训练:优化训练配速表心率表数据存储

  - 心率:修复心率控制的错误修改

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

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

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

  - release V1.3.92

  - autobulid.sh:屏蔽制作data.base

  - 运动:优化运动时长计算与显示

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1435
23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Thu, 21 Nov 2024 11:26:18 +0000 (19:26 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge #1439 into sdk602patch0911 from refs/changes/1439/head
彭磊 [Thu, 21 Nov 2024 11:11:03 +0000 (11:11 +0000)]
Merge #1439 into sdk602patch0911 from refs/changes/1439/head

修复睡眠数据重启丢失bug,增加产测录音测试音量,优化gsensor算法时间同步

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

  - 修复睡眠数据重启丢失bug,增加产测录音测试音量,优化gsensor算法时间同步

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: 罗正 <1732036298@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1439
23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Thu, 21 Nov 2024 10:44:33 +0000 (18:44 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Thu, 21 Nov 2024 10:34:44 +0000 (18:34 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1436/4 1436/head
hcj [Thu, 21 Nov 2024 10:30:31 +0000 (18:30 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

23 months ago增加py版本判断
hcj [Thu, 21 Nov 2024 10:30:12 +0000 (18:30 +0800)]
增加py版本判断

23 months ago降低CONFIG_I2C_WAIT_CONDITION_TIMEOUT 为256ms 1436/target/2 1437/2 1437/head
SnickerSun [Thu, 21 Nov 2024 10:15:23 +0000 (18:15 +0800)]
降低CONFIG_I2C_WAIT_CONDITION_TIMEOUT 为256ms

23 months ago优化TP驱动,降低速率,优化reset时序
SnickerSun [Thu, 21 Nov 2024 10:14:50 +0000 (18:14 +0800)]
优化TP驱动,降低速率,优化reset时序

23 months ago修复睡眠数据重启丢失bug,增加产测录音测试音量,优化gsensor算法时间同步 1439/1 1439/head
penglei [Thu, 21 Nov 2024 10:14:07 +0000 (18:14 +0800)]
修复睡眠数据重启丢失bug,增加产测录音测试音量,优化gsensor算法时间同步

23 months ago删除直线列表风格 1438/2 1438/head
luozheng [Thu, 21 Nov 2024 09:39:19 +0000 (17:39 +0800)]
删除直线列表风格

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1438/1
luozheng [Thu, 21 Nov 2024 09:24:36 +0000 (17:24 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months ago#865,手表与手机同时进行10分钟倒计时,手机倒计时已结束手表还剩余40秒bug
luozheng [Thu, 21 Nov 2024 09:19:15 +0000 (17:19 +0800)]
#865,手表与手机同时进行10分钟倒计时,手机倒计时已结束手表还剩余40秒bug

23 months ago运动:优化运动时长计算与显示 1435/2 1435/head
Caisking [Thu, 21 Nov 2024 09:11:07 +0000 (17:11 +0800)]
运动:优化运动时长计算与显示

23 months agoautobulid.sh:屏蔽制作data.base
Caisking [Thu, 21 Nov 2024 09:06:33 +0000 (17:06 +0800)]
autobulid.sh:屏蔽制作data.base

23 months ago电话多国语言修改 1436/3
hcj [Thu, 21 Nov 2024 08:00:12 +0000 (16:00 +0800)]
电话多国语言修改

23 months ago延长i2c 超时为 500ms 解决心率读取超时问题。 1437/1
SnickerSun [Thu, 21 Nov 2024 07:52:25 +0000 (15:52 +0800)]
延长i2c 超时为 500ms 解决心率读取超时问题。

23 months ago取消所有custom_utils里加的irq_lock。解决ipc error造成的 蓝牙重启
SnickerSun [Thu, 21 Nov 2024 07:51:38 +0000 (15:51 +0800)]
取消所有custom_utils里加的irq_lock。解决ipc error造成的 蓝牙重启

23 months ago去除蓝牙初始化中的irq_lock 1436/2
hcj [Thu, 21 Nov 2024 07:37:42 +0000 (15:37 +0800)]
去除蓝牙初始化中的irq_lock

23 months ago合并 1436/1
hcj [Thu, 21 Nov 2024 06:49:38 +0000 (14:49 +0800)]
合并

23 months ago4G拨号超时优化
hcj [Thu, 21 Nov 2024 06:48:40 +0000 (14:48 +0800)]
4G拨号超时优化

23 months agorelease V1.3.92 1435/1
Caisking [Wed, 20 Nov 2024 15:17:40 +0000 (23:17 +0800)]
release V1.3.92

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Wed, 20 Nov 2024 15:00:38 +0000 (23:00 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

23 months agoMerge #1432 into sdk602patch0911 from refs/changes/1432/head 1435/target/1 1436/target/1 1437/target/1 1438/target/1 1439/target/1
胡传军 [Wed, 20 Nov 2024 14:50:50 +0000 (14:50 +0000)]
Merge #1432 into sdk602patch0911 from refs/changes/1432/head

电话优化

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

  - 电话优化

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1432
23 months agoMerge #1433 into sdk602patch0911 from refs/changes/1433/head
罗正 [Wed, 20 Nov 2024 14:50:36 +0000 (14:50 +0000)]
Merge #1433 into sdk602patch0911 from refs/changes/1433/head

Code review from 罗正

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

  - applsit拨号盘实现:目前,滑动一下屏幕APP转动一次,后续优化为多次转动

  - 解决倒计时界面内存泄漏问题

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

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

  - 修改显示方式页面多国语言显示问题

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

  - 解决查找手表后变成长亮屏

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

  - 拨号盘样式,实现跟手滑动效果

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

  - 解决ChatGPT,设置Key后不能用问题

  - 修改拨号盘图片显示bug

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

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1433
23 months ago调整活体检测阈值,优化睡眠数据存储 1434/1 1434/head
penglei [Wed, 20 Nov 2024 13:39:10 +0000 (21:39 +0800)]
调整活体检测阈值,优化睡眠数据存储

23 months agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Wed, 20 Nov 2024 12:23:24 +0000 (20:23 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911