mirrors/FD230.git
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 732/1 732/head
hcj [Tue, 20 Aug 2024 03:11:57 +0000 (11:11 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years agopabp服务添加
hcj [Tue, 20 Aug 2024 03:11:38 +0000 (11:11 +0800)]
pabp服务添加

2 years ago临时添加按键relese事件日志,方便跟踪按键无法退回mainclock的问题 730/1 730/head 731/target/1 732/target/1
SnickerSun [Mon, 19 Aug 2024 11:53:58 +0000 (19:53 +0800)]
临时添加按键relese事件日志,方便跟踪按键无法退回mainclock的问题

2 years ago检查心率不停止 729/2 729/head 730/target/1
Caisking [Mon, 19 Aug 2024 11:31:19 +0000 (19:31 +0800)]
检查心率不停止

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 729/1
Caisking [Mon, 19 Aug 2024 11:20:08 +0000 (19:20 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化主界面心率卡片;优化心率刷新
Caisking [Mon, 19 Aug 2024 11:20:05 +0000 (19:20 +0800)]
优化主界面心率卡片;优化心率刷新

2 years agoMerge #728 into sdk602patch0626 from refs/changes/728/head 729/target/1
罗正 [Mon, 19 Aug 2024 11:19:40 +0000 (11:19 +0000)]
Merge #728 into sdk602patch0626 from refs/changes/728/head

Code review from 罗正

* refs/changes/728/head: (6 commits squashed)

  - 1. 优化连接中的gif动画,由原来的20帧修改为现在的20帧

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

  - 修改连接动画为60帧

  - 添加手机同步歌曲到手表,手表音乐列表同步刷新。

  - 音乐列表刷新机制优化在每次切换到音乐列表刷新一次,list高度会根据歌曲数量自适应

  - 显示方式界面添加弧形列表样式,并添加对应资源

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/728
2 years ago优化省电模式退出
Caisking [Mon, 19 Aug 2024 11:19:34 +0000 (19:19 +0800)]
优化省电模式退出

2 years agoMerge #726 into sdk602patch0626 from refs/changes/726/head
彭磊 [Mon, 19 Aug 2024 11:06:23 +0000 (11:06 +0000)]
Merge #726 into sdk602patch0626 from refs/changes/726/head

解决运动数据步幅为0的问题

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

  - 解决运动数据步幅为0的问题

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/726
2 years agosleep mode 727/1 727/head
cheng [Mon, 19 Aug 2024 08:40:59 +0000 (16:40 +0800)]
sleep mode

2 years ago修复patch后logo不显示问题 725/1 725/head 726/target/1 727/target/1 728/target/1
SnickerSun [Mon, 19 Aug 2024 04:04:37 +0000 (12:04 +0800)]
修复patch后logo不显示问题

2 years ago修改运动识别接口效果;需要测试 724/1 724/head 725/target/1
Caisking [Mon, 19 Aug 2024 03:44:55 +0000 (11:44 +0800)]
修改运动识别接口效果;需要测试

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Mon, 19 Aug 2024 03:33:56 +0000 (11:33 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Mon, 19 Aug 2024 03:33:52 +0000 (11:33 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years agoMerge #722 into sdk602patch0626 from refs/changes/722/head 724/target/1
袁清梦 [Mon, 19 Aug 2024 03:33:44 +0000 (03:33 +0000)]
Merge #722 into sdk602patch0626 from refs/changes/722/head

更新语言工具进行适配

* refs/changes/722/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/722
2 years ago运动识别弹窗修改,需要添加开始运动接口 723/1 723/head
luozheng [Mon, 19 Aug 2024 03:27:21 +0000 (11:27 +0800)]
运动识别弹窗修改,需要添加开始运动接口

2 years ago更新语言工具进行适配 722/1 722/head
Caisking [Mon, 19 Aug 2024 03:24:21 +0000 (11:24 +0800)]
更新语言工具进行适配

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 721/1 721/head 722/target/1 723/target/1
Caisking [Mon, 19 Aug 2024 03:01:42 +0000 (11:01 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago增加心率数据nextday清空
Caisking [Mon, 19 Aug 2024 03:01:39 +0000 (11:01 +0800)]
增加心率数据nextday清空

2 years ago增加运动识别接口头文件
Caisking [Mon, 19 Aug 2024 03:01:20 +0000 (11:01 +0800)]
增加运动识别接口头文件

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Mon, 19 Aug 2024 03:01:00 +0000 (11:01 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago运动识别弹窗Cmake路径提交 720/1 720/head 721/target/1
luozheng [Mon, 19 Aug 2024 02:48:03 +0000 (10:48 +0800)]
运动识别弹窗Cmake路径提交

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Mon, 19 Aug 2024 02:47:15 +0000 (10:47 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years agorelease V1.1.34 719/1 719/head 720/target/1
SnickerSun [Mon, 19 Aug 2024 02:31:52 +0000 (10:31 +0800)]
release V1.1.34

2 years agoMerge #716 into sdk602patch0626 from refs/changes/716/head 719/target/1
胡传军 [Mon, 19 Aug 2024 02:30:37 +0000 (02:30 +0000)]
Merge #716 into sdk602patch0626 from refs/changes/716/head

Code review from 胡传军

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

  - 修改br连接接口 改用消息机制 增加回连判断 实际实现传统蓝牙开关关闭则br连接不上(有BUG)

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

  - 增加连接中 UI 及部分蓝牙问题修正

  - 重新打开br广播

  - 合并

  - 改为默认开hfp和A2DP

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

  - 电话UI更新

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

  - BUG修复

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/716
2 years agoMerge #715 into sdk602patch0626 from refs/changes/715/head
袁清梦 [Mon, 19 Aug 2024 02:21:49 +0000 (02:21 +0000)]
Merge #715 into sdk602patch0626 from refs/changes/715/head

增加运动识别开启运动接口

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

  - 增加运动识别开启运动接口

  - 修复同状态下更改睡眠配置不更新的bug

  - 修改错误的充电状态拼写

  - 修复睡眠闹钟后面响铃时间越来越少的bug

  - 修改省电模式表盘UI

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/715
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 717/2 717/head
penglei [Mon, 19 Aug 2024 02:18:10 +0000 (10:18 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Mon, 19 Aug 2024 02:17:26 +0000 (10:17 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago运动识别弹窗开始运动按钮添加注释 717/target/2 718/2 718/head
luozheng [Mon, 19 Aug 2024 02:16:14 +0000 (10:16 +0800)]
运动识别弹窗开始运动按钮添加注释

2 years ago添加运动识别弹窗 718/1
luozheng [Mon, 19 Aug 2024 02:09:23 +0000 (10:09 +0800)]
添加运动识别弹窗

2 years agoBUG修复 716/2 716/head
hcj [Mon, 19 Aug 2024 01:26:59 +0000 (09:26 +0800)]
BUG修复

2 years ago修改省电模式表盘UI 715/2 715/head
Caisking [Sat, 17 Aug 2024 10:30:26 +0000 (18:30 +0800)]
修改省电模式表盘UI

2 years ago修复睡眠闹钟后面响铃时间越来越少的bug
Caisking [Sat, 17 Aug 2024 10:23:26 +0000 (18:23 +0800)]
修复睡眠闹钟后面响铃时间越来越少的bug

2 years ago睡眠模式加入绝对静止判断 717/1
penglei [Sat, 17 Aug 2024 10:14:24 +0000 (18:14 +0800)]
睡眠模式加入绝对静止判断
优化运动数据获取保存
优化省电模式逻辑,添加运动识别开关
优化心率血氧slice获取佩戴状态,加大unwear count

2 years ago修改错误的充电状态拼写
Caisking [Sat, 17 Aug 2024 09:31:57 +0000 (17:31 +0800)]
修改错误的充电状态拼写

2 years ago修复同状态下更改睡眠配置不更新的bug
Caisking [Sat, 17 Aug 2024 09:31:07 +0000 (17:31 +0800)]
修复同状态下更改睡眠配置不更新的bug

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 716/1
hcj [Sat, 17 Aug 2024 09:16:37 +0000 (17:16 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago电话UI更新
hcj [Sat, 17 Aug 2024 09:16:10 +0000 (17:16 +0800)]
电话UI更新

2 years ago增加运动识别开启运动接口 715/1
Caisking [Sat, 17 Aug 2024 08:56:32 +0000 (16:56 +0800)]
增加运动识别开启运动接口

2 years ago天气界面添加历史数据保存,天气界面ui优化 714/2 714/head 718/target/1
luozheng [Sat, 17 Aug 2024 08:38:31 +0000 (16:38 +0800)]
天气界面添加历史数据保存,天气界面ui优化

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 714/1
luozheng [Sat, 17 Aug 2024 06:23:15 +0000 (14:23 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago增加省电模式停止当前音乐接口
luozheng [Sat, 17 Aug 2024 06:16:12 +0000 (14:16 +0800)]
增加省电模式停止当前音乐接口

2 years ago省电模式UI更新 713/1 713/head 714/target/1 715/target/1 716/target/1 717/target/1
Caisking [Sat, 17 Aug 2024 03:54:20 +0000 (11:54 +0800)]
省电模式UI更新

2 years ago增加省电模式runtime
Caisking [Sat, 17 Aug 2024 03:54:08 +0000 (11:54 +0800)]
增加省电模式runtime

2 years ago省电模式下不开启心率周期检测
Caisking [Sat, 17 Aug 2024 03:53:53 +0000 (11:53 +0800)]
省电模式下不开启心率周期检测

2 years ago指南针校准界面多国语言资源添加
luozheng [Sat, 17 Aug 2024 03:37:22 +0000 (11:37 +0800)]
指南针校准界面多国语言资源添加

2 years ago指南针界面UI修改与figma统一
luozheng [Sat, 17 Aug 2024 03:35:47 +0000 (11:35 +0800)]
指南针界面UI修改与figma统一

2 years agoAI语音上拉箭头修改为只在ChatGPT模式下显示
luozheng [Sat, 17 Aug 2024 02:55:50 +0000 (10:55 +0800)]
AI语音上拉箭头修改为只在ChatGPT模式下显示

2 years ago蓝牙耳机界面优化修改
luozheng [Sat, 17 Aug 2024 02:43:59 +0000 (10:43 +0800)]
蓝牙耳机界面优化修改

2 years ago提高ppg cywee task优先级,添加cywee中断失效超时恢复机制. 712/1 712/head 713/target/1
penglei [Fri, 16 Aug 2024 11:18:20 +0000 (19:18 +0800)]
提高ppg cywee task优先级,添加cywee中断失效超时恢复机制.
增加cywee ble日志开关,

2 years agoMerge #711 into sdk602patch0626 from refs/changes/711/head 712/target/1
胡传军 [Fri, 16 Aug 2024 11:06:28 +0000 (11:06 +0000)]
Merge #711 into sdk602patch0626 from refs/changes/711/head

Code review from 胡传军

* refs/changes/711/head: (7 commits squashed)

  - 修改br连接接口 改用消息机制 增加回连判断 实际实现传统蓝牙开关关闭则br连接不上(有BUG)

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

  - 增加连接中 UI 及部分蓝牙问题修正

  - 重新打开br广播

  - 合并

  - 改为默认开hfp和A2DP

  - 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/711
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 711/1 711/head
hcj [Fri, 16 Aug 2024 10:24:25 +0000 (18:24 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago改为默认开hfp和A2DP
hcj [Fri, 16 Aug 2024 10:24:11 +0000 (18:24 +0800)]
改为默认开hfp和A2DP

2 years ago同步配置 710/1 710/head
Caisking [Fri, 16 Aug 2024 10:22:15 +0000 (18:22 +0800)]
同步配置

2 years ago配置睡眠提醒闹铃为一分钟
Caisking [Fri, 16 Aug 2024 10:20:18 +0000 (18:20 +0800)]
配置睡眠提醒闹铃为一分钟

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 709/1 709/head 710/target/1 711/target/1
Caisking [Fri, 16 Aug 2024 08:52:06 +0000 (16:52 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago原文件同步更新
Caisking [Fri, 16 Aug 2024 08:52:03 +0000 (16:52 +0800)]
原文件同步更新

2 years ago同步资源文件更新
Caisking [Fri, 16 Aug 2024 08:51:50 +0000 (16:51 +0800)]
同步资源文件更新

2 years ago同步applsit更新;配置充电不能进行检测
Caisking [Fri, 16 Aug 2024 08:51:42 +0000 (16:51 +0800)]
同步applsit更新;配置充电不能进行检测

2 years ago增加心率检测applsit中Slice
Caisking [Fri, 16 Aug 2024 08:51:19 +0000 (16:51 +0800)]
增加心率检测applsit中Slice

2 years agoMerge #708 into sdk602patch0626 from refs/changes/708/head 709/target/1
胡传军 [Fri, 16 Aug 2024 07:49:22 +0000 (07:49 +0000)]
Merge #708 into sdk602patch0626 from refs/changes/708/head

Code review from 胡传军

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

  - 修改br连接接口 改用消息机制 增加回连判断 实际实现传统蓝牙开关关闭则br连接不上(有BUG)

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

  - 增加连接中 UI 及部分蓝牙问题修正

  - 重新打开br广播

  - 合并

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/708
2 years agoMerge #706 into sdk602patch0626 from refs/changes/706/head
袁清梦 [Fri, 16 Aug 2024 07:37:53 +0000 (07:37 +0000)]
Merge #706 into sdk602patch0626 from refs/changes/706/head

Code review from 袁清梦

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

  - 更新主界面心率卡片UI

  - 增加当日历史心率数据处理

  - 同步心率UI资源文件更新

  - 更新多国语言脚本 实现自动copy

  - ● 修改卡片管理样式与figma保持一致纵向
    ● 增加卡片管理表冠控制
    ● 增加卡片管理滑动条效果

  - 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

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/706
2 years ago合并 708/1 708/head
hcj [Fri, 16 Aug 2024 07:30:41 +0000 (15:30 +0800)]
合并

2 years ago重新打开br广播
hcj [Fri, 16 Aug 2024 07:28:35 +0000 (15:28 +0800)]
重新打开br广播

2 years ago占位提交 707/1 707/head
cheng [Fri, 16 Aug 2024 06:39:14 +0000 (14:39 +0800)]
占位提交

2 years ago蓝牙耳机多国语言添加
luozheng [Fri, 16 Aug 2024 03:50:54 +0000 (11:50 +0800)]
蓝牙耳机多国语言添加

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 706/1 706/head
Caisking [Fri, 16 Aug 2024 02:25:47 +0000 (10:25 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修复脚本的路径问题
Caisking [Fri, 16 Aug 2024 02:25:39 +0000 (10:25 +0800)]
修复脚本的路径问题

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
cheng [Fri, 16 Aug 2024 01:50:56 +0000 (09:50 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agorelease V1.1.33 705/1 705/head 706/target/1 707/target/1 708/target/1
SnickerSun [Fri, 16 Aug 2024 01:46:35 +0000 (09:46 +0800)]
release V1.1.33

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Fri, 16 Aug 2024 01:40:14 +0000 (09:40 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Fri, 16 Aug 2024 01:39:35 +0000 (09:39 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #704 into sdk602patch0626 from refs/changes/704/head 705/target/1
袁清梦 [Fri, 16 Aug 2024 01:38:14 +0000 (01:38 +0000)]
Merge #704 into sdk602patch0626 from refs/changes/704/head

Code review from 袁清梦

* refs/changes/704/head: (7 commits squashed)

  - 更新主界面心率卡片UI

  - 增加当日历史心率数据处理

  - 同步心率UI资源文件更新

  - 更新多国语言脚本 实现自动copy

  - ● 修改卡片管理样式与figma保持一致纵向
    ● 增加卡片管理表冠控制
    ● 增加卡片管理滑动条效果

  - 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: 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/704
2 years agoMerge #700 into sdk602patch0626 from refs/changes/700/head
胡传军 [Fri, 16 Aug 2024 01:35:56 +0000 (01:35 +0000)]
Merge #700 into sdk602patch0626 from refs/changes/700/head

Code review from 胡传军

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

  - 修改br连接接口 改用消息机制 增加回连判断 实际实现传统蓝牙开关关闭则br连接不上(有BUG)

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

  - 增加连接中 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/700
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Fri, 16 Aug 2024 01:31:54 +0000 (09: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... 704/3 704/head
Caisking [Fri, 16 Aug 2024 01:26:06 +0000 (09:26 +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 [Fri, 16 Aug 2024 01:26:02 +0000 (09:26 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #703 into sdk602patch0626 from refs/changes/703/head 704/target/2
罗正 [Fri, 16 Aug 2024 01:25:32 +0000 (01:25 +0000)]
Merge #703 into sdk602patch0626 from refs/changes/703/head

Code review from 罗正

* refs/changes/703/head: (12 commits squashed)

  - 1.呼吸训练在训练结束取消常亮屏

  - 暂时关闭AI界面的常亮操作

  - 指南针界面关闭常亮屏

  - 蓝牙耳机界面中“蓝牙耳机设备未找到视图”优化修改。

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

  - 查看已连接的蓝牙耳机视图UI修改

  - 修改powerKey的返回条件为(powerKey&amp;&amp;按键按下&amp;&amp;亮屏状态),存在长按power键进入关机页面会先退出当前页面bug

  - 修复错误关闭了单击切换AI模型功能

  - 功能键优化,修复在进入AI模型界面中切换模型时候屏幕息屏

  - 优化久坐提醒

  - AI语音的按钮背景与图片更新

  - AI语音已经对照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/703
2 years agoMerge #702 into sdk602patch0626 from refs/changes/702/head
程羽飞 [Fri, 16 Aug 2024 01:23:35 +0000 (01:23 +0000)]
Merge #702 into sdk602patch0626 from refs/changes/702/head

str resource

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

  - str resource

  - resource

  - image

Signed-off-by: dingtalk_kaxuzp <2393524978@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/702
2 years ago解决睡眠模式时间戳获取BUG,睡眠模式输入心率数据 701/3 701/head
penglei [Thu, 15 Aug 2024 12:29:34 +0000 (20:29 +0800)]
解决睡眠模式时间戳获取BUG,睡眠模式输入心率数据
优化设置久坐间隔
优化开机设置运动识别,添加TOPIC接收消息

2 years agoAI语音已经对照figma修改完成 703/5 703/head
luozheng [Thu, 15 Aug 2024 11:11:32 +0000 (19:11 +0800)]
AI语音已经对照figma修改完成

2 years ago● 修改卡片管理样式与figma保持一致纵向 704/2
Caisking [Thu, 15 Aug 2024 10:04:50 +0000 (18:04 +0800)]
● 修改卡片管理样式与figma保持一致纵向
● 增加卡片管理表冠控制
● 增加卡片管理滑动条效果

2 years agoAI语音的按钮背景与图片更新
luozheng [Thu, 15 Aug 2024 09:28:14 +0000 (17:28 +0800)]
AI语音的按钮背景与图片更新

2 years ago优化久坐提醒 703/4
luozheng [Thu, 15 Aug 2024 08:54:43 +0000 (16:54 +0800)]
优化久坐提醒

2 years ago更新多国语言脚本 实现自动copy 704/1
Caisking [Thu, 15 Aug 2024 08:49:11 +0000 (16:49 +0800)]
更新多国语言脚本 实现自动copy

2 years ago同步心率UI资源文件更新
Caisking [Thu, 15 Aug 2024 08:48:53 +0000 (16:48 +0800)]
同步心率UI资源文件更新

2 years ago增加当日历史心率数据处理
Caisking [Thu, 15 Aug 2024 08:48:25 +0000 (16:48 +0800)]
增加当日历史心率数据处理

2 years ago更新主界面心率卡片UI
Caisking [Thu, 15 Aug 2024 08:47:47 +0000 (16:47 +0800)]
更新主界面心率卡片UI

2 years ago功能键优化,修复在进入AI模型界面中切换模型时候屏幕息屏 703/3
luozheng [Thu, 15 Aug 2024 08:27:58 +0000 (16:27 +0800)]
功能键优化,修复在进入AI模型界面中切换模型时候屏幕息屏

2 years agoimage 702/2 702/head
cheng [Thu, 15 Aug 2024 08:07:55 +0000 (16:07 +0800)]
image

2 years agoresource
cheng [Thu, 15 Aug 2024 08:03:34 +0000 (16:03 +0800)]
resource

2 years ago修复错误关闭了单击切换AI模型功能 703/2
luozheng [Thu, 15 Aug 2024 07:53:15 +0000 (15:53 +0800)]
修复错误关闭了单击切换AI模型功能

2 years ago增加连接中 UI 及部分蓝牙问题修正 700/2 700/head
hcj [Thu, 15 Aug 2024 06:43:44 +0000 (14:43 +0800)]
增加连接中 UI 及部分蓝牙问题修正

2 years ago更改产测UI安全芯片I2C测试为alipay测试接口 701/2
penglei [Thu, 15 Aug 2024 06:43:26 +0000 (14:43 +0800)]
更改产测UI安全芯片I2C测试为alipay测试接口

2 years ago修改powerKey的返回条件为(powerKey&&按键按下&&亮屏状态),存在长按power键进入关机页面会先退出当前页面bug 703/1
luozheng [Thu, 15 Aug 2024 06:41:45 +0000 (14:41 +0800)]
修改powerKey的返回条件为(powerKey&&按键按下&&亮屏状态),存在长按power键进入关机页面会先退出当前页面bug

2 years ago查看已连接的蓝牙耳机视图UI修改
luozheng [Thu, 15 Aug 2024 06:27:31 +0000 (14:27 +0800)]
查看已连接的蓝牙耳机视图UI修改

2 years agostr resource 702/1
cheng [Thu, 15 Aug 2024 03:12:52 +0000 (11:12 +0800)]
str resource

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Thu, 15 Aug 2024 01:40:01 +0000 (09:40 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修改OBU ui界面,添加语音播报消息 701/1
penglei [Wed, 14 Aug 2024 12:09:13 +0000 (20:09 +0800)]
修改OBU ui界面,添加语音播报消息

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Wed, 14 Aug 2024 12:05:59 +0000 (20:05 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626