mirrors/FD230.git
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 947/2
penglei [Thu, 12 Sep 2024 10:28:39 +0000 (18:28 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化cywee chipinfo转mac密钥激活
penglei [Thu, 12 Sep 2024 10:28:32 +0000 (18:28 +0800)]
优化cywee chipinfo转mac密钥激活

2 years ago修复可能因2ae2 read值更新不及时,导致APP可能无法及时获取到最新表盘 #28 947/target/2 950/1 950/head
hcj [Thu, 12 Sep 2024 08:34:17 +0000 (16:34 +0800)]
修复可能因2ae2 read值更新不及时,导致APP可能无法及时获取到最新表盘 #28

2 years ago修复恢复出厂无法解绑 #323 #324 949/1 949/head 950/target/1
hcj [Thu, 12 Sep 2024 08:14:40 +0000 (16:14 +0800)]
修复恢复出厂无法解绑 #323 #324

2 years ago安全模式:恢复出厂删除文件操作修复
penglei [Thu, 12 Sep 2024 07:31:31 +0000 (15:31 +0800)]
安全模式:恢复出厂删除文件操作修复

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 948/1 948/head 949/target/1
hcj [Thu, 12 Sep 2024 03:57:47 +0000 (11:57 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago添加日历
hcj [Thu, 12 Sep 2024 03:57:22 +0000 (11:57 +0800)]
添加日历

2 years ago修复手表重启后不进入睡眠、小睡或久坐模式的BUG 947/1
penglei [Thu, 12 Sep 2024 03:47:01 +0000 (11:47 +0800)]
修复手表重启后不进入睡眠、小睡或久坐模式的BUG
修复BUG #220 手表耳机模式音乐,音量调节跨度太大,最小三格几乎没有声音,最大三格一格的声音都很明显
修复BUG #617 手表,抬碗亮屏太灵敏,小幅度转腕也会亮屏
添加睡眠标志文件存储
优化chipinfo转mac的change函数

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Thu, 12 Sep 2024 02:22:40 +0000 (10:22 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 946/1 946/head 947/target/1 948/target/1
SnickerSun [Thu, 12 Sep 2024 01:56:35 +0000 (09:56 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #944 into sdk602patch0626 from refs/changes/944/head 946/target/1
袁清梦 [Thu, 12 Sep 2024 01:56:24 +0000 (01:56 +0000)]
Merge #944 into sdk602patch0626 from refs/changes/944/head

Code review from 袁清梦

* refs/changes/944/head: (10 commits squashed)

  - 修复 训练健身类多余的项

  - #637手表,遥控拍照,APP先退出会导致手表卡死机(必现)

  - #389密码-最后一个数字没有动画效果

  - 修复密码锁的错误处理

  - #456睡眠界面,紫色进度条外面有刻度未遮挡完全

  - #657手表,运动-健身类-滑倒最底部点击,室内运动,黑屏后电源键无法唤醒问题

  - 睡眠进度条优化

  - 优化睡眠进度条背景的线条

  - 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: 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/944
2 years agoMerge #945 into sdk602patch0626 from refs/changes/945/head
彭磊 [Thu, 12 Sep 2024 01:54:08 +0000 (01:54 +0000)]
Merge #945 into sdk602patch0626 from refs/changes/945/head

Code review from 彭磊

* refs/changes/945/head: (5 commits squashed)

  - 修复距离 卡路里不清零的BUG

  - 修复黑曜表盘天气图标显示错误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

  - 修复BUG #646 手表,黑曜表盘步数记录13300显示不全

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/945
2 years agoMerge #942 into sdk602patch0626 from refs/changes/942/head 944/target/2
罗正 [Thu, 12 Sep 2024 01:53:38 +0000 (01:53 +0000)]
Merge #942 into sdk602patch0626 from refs/changes/942/head

Code review from 罗正

* refs/changes/942/head: (10 commits squashed)

  - 闹钟UI优化:
    1.#636,解决,手表,闹钟只响铃3次bug
    2.闹钟编辑界面优化
    3.闹钟界面中星期缩写中文为:一,二...日,其他语言为:Mon,Tue...Sun

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

  - #534,解决闹钟设置多个闹钟,只响第一个,后续的没有提示闹钟bug

  - 解决#534,解决闹钟设置多个闹钟,只响第一个,后续的没有提示闹钟bug
    修改闹钟弹窗无操作50s后自动关闭

  - #642,解决:删除多余闹钟后,界面不能显示剩余闹钟bug

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

  - #370,解决:下拉状态栏中,开启4G开关,停留在下拉菜单中,信号格状态不刷新(息屏时不会刷新)bug
    #618,解决:4G开关开启,重启手表,4G开关状态颜色响应比较慢bug

  - #639,解决:设置-图标不圆,有缺失,勿扰模式,更换卡片,省电模式bug

  - #154,解决:手表端超时不操作后,绑定请求会继续留在手表界面bug

  - 6.天气界面UI修改,与figma上设计保持一致

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/942
2 years agoMerge #941 into sdk602patch0626 from refs/changes/941/head
snickersun@163.com [Thu, 12 Sep 2024 01:51:27 +0000 (01:51 +0000)]
Merge #941 into sdk602patch0626 from refs/changes/941/head

release V1.1.48

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

  - release V1.1.48

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/941
2 years ago修复BUG #646 手表,黑曜表盘步数记录13300显示不全 945/1 945/head
penglei [Thu, 12 Sep 2024 01:26:18 +0000 (09:26 +0800)]
修复BUG #646 手表,黑曜表盘步数记录13300显示不全

2 years ago语言增加图片显示(补) 943/1 943/head
hcj [Wed, 11 Sep 2024 07:58:48 +0000 (15:58 +0800)]
语言增加图片显示(补)

2 years ago语言增加图片显示
hcj [Wed, 11 Sep 2024 07:58:19 +0000 (15:58 +0800)]
语言增加图片显示

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Wed, 11 Sep 2024 06:55:34 +0000 (14:55 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agorelease V1.1.48 941/1 941/head
SnickerSun [Wed, 11 Sep 2024 06:39:36 +0000 (14:39 +0800)]
release V1.1.48

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 940/1 940/head 941/target/1 942/target/1 943/target/1 944/target/1 945/target/1
Caisking [Wed, 11 Sep 2024 05:13:49 +0000 (13:13 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago关闭安全模式测试宏
Caisking [Wed, 11 Sep 2024 05:13:41 +0000 (13:13 +0800)]
关闭安全模式测试宏

2 years agoMerge #938 into sdk602patch0626 from refs/changes/938/head 940/target/1
罗正 [Wed, 11 Sep 2024 05:13:13 +0000 (05:13 +0000)]
Merge #938 into sdk602patch0626 from refs/changes/938/head

Code review from 罗正

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

  - 闹钟UI优化:
    1.#636,解决,手表,闹钟只响铃3次bug
    2.闹钟编辑界面优化
    3.闹钟界面中星期缩写中文为:一,二...日,其他语言为:Mon,Tue...Sun

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

  - #534,解决闹钟设置多个闹钟,只响第一个,后续的没有提示闹钟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/938
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Wed, 11 Sep 2024 05:12:01 +0000 (13:12 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago安全模式:资源校验列表实现与优化
Caisking [Wed, 11 Sep 2024 05:11:44 +0000 (13:11 +0800)]
安全模式:资源校验列表实现与优化

2 years ago添加 希伯来语,乌克兰语,瑞典语,乌兹别克语,阿塞拜疆语 翻译, 939/2 939/head
SnickerSun [Wed, 11 Sep 2024 02:50:50 +0000 (10:50 +0800)]
添加 希伯来语,乌克兰语,瑞典语,乌兹别克语,阿塞拜疆语 翻译,
修改最后一条中文字符串,保存静止为保持静止

2 years agocompile fix for user model 939/1
SnickerSun [Wed, 11 Sep 2024 01:46:26 +0000 (09:46 +0800)]
compile fix for user model

2 years agorelease V1.1.47 937/1 937/head 938/target/1 939/target/1
SnickerSun [Tue, 10 Sep 2024 12:41:38 +0000 (20:41 +0800)]
release V1.1.47

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 934/1 934/head 937/target/1
SnickerSun [Tue, 10 Sep 2024 11:30:32 +0000 (19:30 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #932 into sdk602patch0626 from refs/changes/932/head 934/target/1
彭磊 [Tue, 10 Sep 2024 11:30:16 +0000 (11:30 +0000)]
Merge #932 into sdk602patch0626 from refs/changes/932/head

Code review from 彭磊

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

  - 修复距离 卡路里不清零的BUG

  - 修复黑曜表盘天气图标显示错误BUG

  - Merge branch &#39;sdk602patch0626&#39; 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/932
2 years ago增加2ae6兼容原协议内容 933/1 933/head
hcj [Tue, 10 Sep 2024 11:27:43 +0000 (19:27 +0800)]
增加2ae6兼容原协议内容

2 years ago更新 芬兰语,罗马尼亚语,土耳其语,波斯语,阿拉伯语 五种语言的翻译
SnickerSun [Tue, 10 Sep 2024 10:57:17 +0000 (18:57 +0800)]
更新 芬兰语,罗马尼亚语,土耳其语,波斯语,阿拉伯语 五种语言的翻译

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
SnickerSun [Tue, 10 Sep 2024 10:55:59 +0000 (18:55 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago在recovery和各种reboot前增加 保存时间到calendar,减少ota升级造成的时间偏差
SnickerSun [Tue, 10 Sep 2024 10:55:51 +0000 (18:55 +0800)]
在recovery和各种reboot前增加 保存时间到calendar,减少ota升级造成的时间偏差

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Tue, 10 Sep 2024 10:21:44 +0000 (18:21 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 932/1 932/head
penglei [Tue, 10 Sep 2024 08:32:54 +0000 (16:32 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修复黑曜表盘天气图标显示错误BUG
penglei [Tue, 10 Sep 2024 08:32:47 +0000 (16:32 +0800)]
修复黑曜表盘天气图标显示错误BUG

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 931/1 931/head 932/target/1 933/target/1
hcj [Tue, 10 Sep 2024 08:25:37 +0000 (16:25 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago修复 因通讯录协议数据改动导致的备注不生效BUG(补)
hcj [Tue, 10 Sep 2024 08:25:19 +0000 (16:25 +0800)]
修复 因通讯录协议数据改动导致的备注不生效BUG(补)

2 years ago删除资源里的无用用户数据
SnickerSun [Tue, 10 Sep 2024 08:19:29 +0000 (16:19 +0800)]
删除资源里的无用用户数据

2 years agoMerge #929 into sdk602patch0626 from refs/changes/929/head 931/target/1
彭磊 [Tue, 10 Sep 2024 08:00:50 +0000 (08:00 +0000)]
Merge #929 into sdk602patch0626 from refs/changes/929/head

修复距离 卡路里不清零的BUG

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

  - 修复距离 卡路里不清零的BUG

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/929
2 years ago修复步数显示问题 930/3 930/head
hcj [Tue, 10 Sep 2024 07:53:33 +0000 (15:53 +0800)]
修复步数显示问题

2 years ago修复 因通讯录协议数据改动导致的备注不生效BUG
hcj [Tue, 10 Sep 2024 07:43:56 +0000 (15:43 +0800)]
修复 因通讯录协议数据改动导致的备注不生效BUG

2 years ago修复 #248 电话点击有蓝色效果 930/2
hcj [Tue, 10 Sep 2024 07:04:57 +0000 (15:04 +0800)]
修复 #248 电话点击有蓝色效果

2 years ago修复 #635低电量提醒 #500联系人页面不流畅 930/1
hcj [Tue, 10 Sep 2024 06:38:51 +0000 (14:38 +0800)]
修复 #635低电量提醒 #500联系人页面不流畅

2 years ago保留缓存
Caisking [Tue, 10 Sep 2024 03:57:48 +0000 (11:57 +0800)]
保留缓存

2 years ago修复距离 卡路里不清零的BUG 929/1 929/head
penglei [Tue, 10 Sep 2024 02:26:20 +0000 (10:26 +0800)]
修复距离 卡路里不清零的BUG

2 years ago安全模式:优化资源校验提示语
Caisking [Mon, 9 Sep 2024 14:07:37 +0000 (22:07 +0800)]
安全模式:优化资源校验提示语

2 years ago安全模式 资源校验提示语修改为英语 928/2 928/head 929/target/1 930/target/1
Caisking [Mon, 9 Sep 2024 13:51:03 +0000 (21:51 +0800)]
安全模式 资源校验提示语修改为英语

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 928/1
Caisking [Mon, 9 Sep 2024 13:44:32 +0000 (21:44 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago安全模式:恢复出厂设置增加重启
Caisking [Mon, 9 Sep 2024 13:44:29 +0000 (21:44 +0800)]
安全模式:恢复出厂设置增加重启

2 years agorelease V1.1.46 927/1 927/head 928/target/1
SnickerSun [Mon, 9 Sep 2024 13:37:30 +0000 (21:37 +0800)]
release V1.1.46

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 925/3 925/head 927/target/1
luozheng [Mon, 9 Sep 2024 13:31:18 +0000 (21:31 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago 修改查找手表传进来路径path_类型为const char*
luozheng [Mon, 9 Sep 2024 13:31:06 +0000 (21:31 +0800)]
 修改查找手表传进来路径path_类型为const char*

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 925/target/3 926/1 926/head
Caisking [Mon, 9 Sep 2024 13:25:17 +0000 (21:25 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago增加安全模式->资源校验
Caisking [Mon, 9 Sep 2024 13:25:10 +0000 (21:25 +0800)]
增加安全模式->资源校验

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 925/2
luozheng [Mon, 9 Sep 2024 13:23:05 +0000 (21:23 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修改查找手表传进来路径path_类型为char*
luozheng [Mon, 9 Sep 2024 13:22:51 +0000 (21:22 +0800)]
修改查找手表传进来路径path_类型为char*

2 years ago1.通话音量添加4g音量调节 925/1
luozheng [Mon, 9 Sep 2024 13:10:30 +0000 (21:10 +0800)]
1.通话音量添加4g音量调节
2.#536,解决:闹钟响铃只有三下bug
3.闹钟弹窗UI优化

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 924/1 924/head 925/target/2 926/target/1
penglei [Mon, 9 Sep 2024 12:51:30 +0000 (20:51 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化多段睡眠文件存储,优化添加cywee密钥的AT指令(补)
penglei [Mon, 9 Sep 2024 12:49:52 +0000 (20:49 +0800)]
优化多段睡眠文件存储,优化添加cywee密钥的AT指令(补)

2 years agoMerge #922 into sdk602patch0626 from refs/changes/922/head 924/target/1 925/target/1
彭磊 [Mon, 9 Sep 2024 12:49:49 +0000 (12:49 +0000)]
Merge #922 into sdk602patch0626 from refs/changes/922/head

Code review from 彭磊

* refs/changes/922/head: (5 commits squashed)

  - 设置录音回环测试默认音量为30

  - 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

  - 优化多段睡眠文件存储,优化添加cywee密钥的AT指令

  - 优化多段睡眠文件存储,优化添加cywee密钥的AT指令(补交)

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/922
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 923/1 923/head
hcj [Mon, 9 Sep 2024 12:47:26 +0000 (20:47 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago修改msg_center CMake文件
hcj [Mon, 9 Sep 2024 12:47:19 +0000 (20:47 +0800)]
修改msg_center CMake文件

2 years ago优化多段睡眠文件存储,优化添加cywee密钥的AT指令(补交) 922/2 922/head
penglei [Mon, 9 Sep 2024 11:37:38 +0000 (19:37 +0800)]
优化多段睡眠文件存储,优化添加cywee密钥的AT指令(补交)

2 years ago优化多段睡眠文件存储,优化添加cywee密钥的AT指令 922/1
penglei [Mon, 9 Sep 2024 10:51:00 +0000 (18:51 +0800)]
优化多段睡眠文件存储,优化添加cywee密钥的AT指令

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Mon, 9 Sep 2024 10:31:37 +0000 (18:31 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Mon, 9 Sep 2024 09:56:55 +0000 (17:56 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #920 into sdk602patch0626 from refs/changes/920/head 922/target/1 923/target/1
胡传军 [Mon, 9 Sep 2024 09:54:13 +0000 (09:54 +0000)]
Merge #920 into sdk602patch0626 from refs/changes/920/head

Code review from 胡传军

* refs/changes/920/head: (4 commits squashed)

  - 增加运动中自动拒接电话

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

  - 增加多国语言切换字体逻辑(补)

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

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/920
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Mon, 9 Sep 2024 09:53:42 +0000 (17:53 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago增加安全模式Slice
Caisking [Mon, 9 Sep 2024 09:53:22 +0000 (17:53 +0800)]
增加安全模式Slice

2 years ago添加power+function按键同时按下开机,检测为SafeMode的函数。 921/1 921/head
SnickerSun [Mon, 9 Sep 2024 09:53:05 +0000 (17:53 +0800)]
添加power+function按键同时按下开机,检测为SafeMode的函数。
后面可以用这个函数切换SafeMode启动。

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 920/1 920/head
hcj [Mon, 9 Sep 2024 09:52:20 +0000 (17:52 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago增加多国语言切换字体逻辑(补)
hcj [Mon, 9 Sep 2024 09:52:08 +0000 (17:52 +0800)]
增加多国语言切换字体逻辑(补)

2 years agoMerge #918 into sdk602patch0626 from refs/changes/918/head 920/target/1 921/target/1
胡传军 [Mon, 9 Sep 2024 08:44:38 +0000 (08:44 +0000)]
Merge #918 into sdk602patch0626 from refs/changes/918/head

Code review from 胡传军

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

  - 增加运动中自动拒接电话

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

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/918
2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 919/1 919/head
SnickerSun [Mon, 9 Sep 2024 08:43:09 +0000 (16:43 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 918/1 918/head
hcj [Mon, 9 Sep 2024 08:14:00 +0000 (16:14 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago增加运动中自动拒接电话
hcj [Mon, 9 Sep 2024 08:13:38 +0000 (16:13 +0800)]
增加运动中自动拒接电话

2 years agoMerge #917 into sdk602patch0626 from refs/changes/917/head 918/target/1 919/target/1
snickersun@163.com [Mon, 9 Sep 2024 07:09:42 +0000 (07:09 +0000)]
Merge #917 into sdk602patch0626 from refs/changes/917/head

生成固件包时,同时更新 fileschecksum.txt 文件

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

  - 生成固件包时,同时更新 fileschecksum.txt 文件

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/917
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 916/1 916/head
hcj [Mon, 9 Sep 2024 07:06:29 +0000 (15:06 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago增加多国语言切换字体逻辑
hcj [Mon, 9 Sep 2024 07:06:14 +0000 (15:06 +0800)]
增加多国语言切换字体逻辑

2 years ago生成固件包时,同时更新 fileschecksum.txt 文件 917/1 917/head
SnickerSun [Mon, 9 Sep 2024 07:06:06 +0000 (15:06 +0800)]
生成固件包时,同时更新 fileschecksum.txt 文件

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Mon, 9 Sep 2024 01:29:11 +0000 (09:29 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago添加resfile文件校验工具,确认资源文件是否完整。校验依据 mkota.sh 创建的文件 /system/fileschecksum.txt 。 915/1 915/head 916/target/1 917/target/1
SnickerSun [Sun, 8 Sep 2024 18:13:46 +0000 (02:13 +0800)]
添加resfile文件校验工具,确认资源文件是否完整。校验依据 mkota.sh 创建的文件 /system/fileschecksum.txt 。

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 914/1 914/head 915/target/1
SnickerSun [Sat, 7 Sep 2024 16:26:16 +0000 (00:26 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoota包制作过程中,生成system/fileschecksum.txt 供新固件检测 ota升级失败内容。
SnickerSun [Sat, 7 Sep 2024 16:25:20 +0000 (00:25 +0800)]
ota包制作过程中,生成system/fileschecksum.txt 供新固件检测 ota升级失败内容。

2 years ago修复起床闹钟不触发的BUG(补交) 913/2 913/head 914/target/1
Caisking [Sat, 7 Sep 2024 12:34:39 +0000 (20:34 +0800)]
修复起床闹钟不触发的BUG(补交)

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 913/1
Caisking [Sat, 7 Sep 2024 12:32:23 +0000 (20:32 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修复起床闹钟不触发的BUG
Caisking [Sat, 7 Sep 2024 12:32:15 +0000 (20:32 +0800)]
修复起床闹钟不触发的BUG

2 years agorelease V1.1.45 912/1 912/head 913/target/1
SnickerSun [Sat, 7 Sep 2024 11:59:57 +0000 (19:59 +0800)]
release V1.1.45

2 years agoMerge #911 into sdk602patch0626 from refs/changes/911/head 912/target/1
彭磊 [Sat, 7 Sep 2024 11:59:32 +0000 (11:59 +0000)]
Merge #911 into sdk602patch0626 from refs/changes/911/head

设置录音回环测试默认音量为30

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

  - 设置录音回环测试默认音量为30

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/911
2 years agoMerge #910 into sdk602patch0626 from refs/changes/910/head
袁清梦 [Sat, 7 Sep 2024 11:59:15 +0000 (11:59 +0000)]
Merge #910 into sdk602patch0626 from refs/changes/910/head

Code review from 袁清梦

* refs/changes/910/head: (18 commits squashed)

  - 增加多国语言自动翻译脚本:待完善

  - 修复心率测量发生的死机

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

  - #440运动-健身类-少了循环训练

  - #439运动-健身类 排序问题 室外走路,跑步,骑行不在顶部,需要把常用的放在顶部

  - #445 运动-休闲运动-少了对战游戏

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

  - #447 运动结束界面添加提示语

  - #441运动-健身类有遮挡

  - #442运动-所有类底部有遮挡

  - #443运动-类别界面-上滑会有短暂回弹

  - #444运动类界面-右滑返回上一级界面有界面晃动

  - #207运动界面进行触摸进出操作,界面会抖动,卡顿

  - #438运动-健身类上下滑动,健身运动会跟着跳动

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

  - 优化训练记录UI

  - 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/910
2 years ago设置录音回环测试默认音量为30 911/1 911/head
penglei [Sat, 7 Sep 2024 11:57:41 +0000 (19:57 +0800)]
设置录音回环测试默认音量为30

2 years ago优化省电模式退出动效 910/1 910/head
Caisking [Sat, 7 Sep 2024 11:32:13 +0000 (19:32 +0800)]
优化省电模式退出动效

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Sat, 7 Sep 2024 11:31:31 +0000 (19:31 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化训练记录UI
Caisking [Sat, 7 Sep 2024 11:31:27 +0000 (19:31 +0800)]
优化训练记录UI

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 909/1 909/head 911/target/1
penglei [Sat, 7 Sep 2024 10:51:47 +0000 (18:51 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化录音回环产测
penglei [Sat, 7 Sep 2024 10:51:34 +0000 (18:51 +0800)]
优化录音回环产测

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 903/3 903/head 909/target/1 910/target/1
luozheng [Sat, 7 Sep 2024 10:04:12 +0000 (18:04 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago睡眠,训练定时器删除增加停止定时器操作
luozheng [Sat, 7 Sep 2024 09:59:55 +0000 (17:59 +0800)]
睡眠,训练定时器删除增加停止定时器操作

2 years agoMerge #908 into sdk602patch0626 from refs/changes/908/head 903/target/2
袁清梦 [Sat, 7 Sep 2024 09:52:51 +0000 (09:52 +0000)]
Merge #908 into sdk602patch0626 from refs/changes/908/head

Code review from 袁清梦

* refs/changes/908/head: (15 commits squashed)

  - 增加多国语言自动翻译脚本:待完善

  - 修复心率测量发生的死机

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

  - #440运动-健身类-少了循环训练

  - #439运动-健身类 排序问题 室外走路,跑步,骑行不在顶部,需要把常用的放在顶部

  - #445 运动-休闲运动-少了对战游戏

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

  - #447 运动结束界面添加提示语

  - #441运动-健身类有遮挡

  - #442运动-所有类底部有遮挡

  - #443运动-类别界面-上滑会有短暂回弹

  - #444运动类界面-右滑返回上一级界面有界面晃动

  - #207运动界面进行触摸进出操作,界面会抖动,卡顿

  - #438运动-健身类上下滑动,健身运动会跟着跳动

  - 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/908