mirrors/FD230.git
2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 278/1 278/head 279/target/1
luozheng [Thu, 13 Jun 2024 10:33:41 +0000 (18:33 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago语言选择界面优化
luozheng [Thu, 13 Jun 2024 10:33:30 +0000 (18:33 +0800)]
语言选择界面优化

2 years agoMerge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 277/1 277/head 278/target/1
SnickerSun [Thu, 13 Jun 2024 10:30:54 +0000 (18:30 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agoMerge #274 into sdk602patch0521 from refs/changes/274/head 277/target/1
袁清梦 [Thu, 13 Jun 2024 10:28:44 +0000 (10:28 +0000)]
Merge #274 into sdk602patch0521 from refs/changes/274/head

Code review from 袁清梦

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

  - 优化训练死机bug

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

  - 修复心率血氧数据json的时间戳

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

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

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/274
2 years agoMerge #275 into sdk602patch0521 from refs/changes/275/head 274/target/2
snickersun@163.com [Thu, 13 Jun 2024 10:19:31 +0000 (10:19 +0000)]
Merge #275 into sdk602patch0521 from refs/changes/275/head

Code review from snickersun@163.com

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

  - 修复蓝牙耳机扫描窗口不记录历史配对记录问题

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

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/275
2 years ago增加活动slice 276/1 276/head
hcj [Thu, 13 Jun 2024 10:11:29 +0000 (18:11 +0800)]
增加活动slice

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Thu, 13 Jun 2024 10:02:21 +0000 (18:02 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agoMerge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
SnickerSun [Thu, 13 Jun 2024 09:44:00 +0000 (17:44 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agoMerge #273 into sdk602patch0521 from refs/changes/273/head 276/target/1
彭磊 [Thu, 13 Jun 2024 09:11:40 +0000 (09:11 +0000)]
Merge #273 into sdk602patch0521 from refs/changes/273/head

Code review from 彭磊

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

  - 优化蓝牙产测,添加ppg关闭led指令

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

  - 蓝牙产测添加NTC测试指令

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/273
2 years agoMerge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 275/1 275/head
SnickerSun [Thu, 13 Jun 2024 09:10:32 +0000 (17:10 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago修复蓝牙耳机扫描窗口不记录历史配对记录问题
SnickerSun [Thu, 13 Jun 2024 09:10:19 +0000 (17:10 +0800)]
修复蓝牙耳机扫描窗口不记录历史配对记录问题

2 years ago1.优化在使用ScreenAlwaysOnCtr函数设置是否屏幕常亮时,
luozheng [Thu, 13 Jun 2024 07:41:32 +0000 (15:41 +0800)]
1.优化在使用ScreenAlwaysOnCtr函数设置是否屏幕常亮时,
(1)使用宏 OPEN_SCREEN_ALWAYS_ON 代替常量值 1 ,表示开启屏幕常亮功能。
(2)使用宏 CANCEL_SCREEN_ALWAYS_ON 代替常量值 0,表示取消屏幕常亮功能
2.优化呼吸训练:训练过程中开启心率检测,训练完成获取心率值展示在完成视图上。

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 272/1 272/head
luozheng [Thu, 13 Jun 2024 06:57:46 +0000 (14:57 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago录音视图优化
luozheng [Thu, 13 Jun 2024 06:57:24 +0000 (14:57 +0800)]
录音视图优化

2 years agoMerge #271 into sdk602patch0521 from refs/changes/271/head 272/target/1 273/target/1 274/target/1 275/target/1
彭磊 [Thu, 13 Jun 2024 06:14:10 +0000 (06:14 +0000)]
Merge #271 into sdk602patch0521 from refs/changes/271/head

优化蓝牙产测,添加ppg关闭led指令

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

  - 优化蓝牙产测,添加ppg关闭led指令

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/271
2 years ago优化训练记录存储 270/2 270/head
Caisking [Thu, 13 Jun 2024 04:00:35 +0000 (12:00 +0800)]
优化训练记录存储

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 270/1
Caisking [Thu, 13 Jun 2024 02:14:53 +0000 (10:14 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago增加心率控制接口。实现主界面心率检测
Caisking [Thu, 13 Jun 2024 02:10:09 +0000 (10:10 +0800)]
增加心率控制接口。实现主界面心率检测

2 years ago呼吸训练优化
luozheng [Thu, 13 Jun 2024 01:35:49 +0000 (09:35 +0800)]
呼吸训练优化

2 years agoMerge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 269/1 269/head 270/target/1 271/target/1
SnickerSun [Wed, 12 Jun 2024 13:34:30 +0000 (21:34 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agorelease路径添加版本号,方便跟踪
SnickerSun [Wed, 12 Jun 2024 13:33:58 +0000 (21:33 +0800)]
release路径添加版本号,方便跟踪

2 years ago优化屏幕长按事件,更容易触发
SnickerSun [Wed, 12 Jun 2024 13:32:46 +0000 (21:32 +0800)]
优化屏幕长按事件,更容易触发

2 years ago优化uapi_tar_file,减少stack内存使用。
SnickerSun [Wed, 12 Jun 2024 13:32:15 +0000 (21:32 +0800)]
优化uapi_tar_file,减少stack内存使用。
保存exctar文件时加入编译版本号方便以后查找

2 years ago同步 patch_uapi_calendar_get_timestamp.zip,修复RC时间保存不准问题
SnickerSun [Wed, 12 Jun 2024 13:01:44 +0000 (21:01 +0800)]
同步 patch_uapi_calendar_get_timestamp.zip,修复RC时间保存不准问题

2 years agofd230 nativelauncher 同步到0521patch
SnickerSun [Wed, 12 Jun 2024 12:58:44 +0000 (20:58 +0800)]
fd230 nativelauncher 同步到0521patch

2 years ago蓝牙br同步到0521patch
SnickerSun [Wed, 12 Jun 2024 12:57:57 +0000 (20:57 +0800)]
蓝牙br同步到0521patch

2 years agoalipay同步到0521patch
SnickerSun [Wed, 12 Jun 2024 12:57:26 +0000 (20:57 +0800)]
alipay同步到0521patch

2 years agoalarm同步到0512 patch
SnickerSun [Wed, 12 Jun 2024 12:54:51 +0000 (20:54 +0800)]
alarm同步到0512 patch

2 years ago优化蓝牙产测,使能按键双击检测,添加efuse读写测试接口 268/1 268/head 269/target/1
penglei [Wed, 12 Jun 2024 12:43:29 +0000 (20:43 +0800)]
优化蓝牙产测,使能按键双击检测,添加efuse读写测试接口

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Wed, 12 Jun 2024 12:38:34 +0000 (20:38 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 267/1 267/head 268/target/1
Caisking [Wed, 12 Jun 2024 12:28:16 +0000 (20:28 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago增加主界面配置卡片,UI需要优化
Caisking [Wed, 12 Jun 2024 12:24:48 +0000 (20:24 +0800)]
增加主界面配置卡片,UI需要优化

2 years ago录音视图修改
luozheng [Wed, 12 Jun 2024 11:11:58 +0000 (19:11 +0800)]
录音视图修改

2 years agoMerge #266 into sdk602patch0521 from refs/changes/266/head 267/target/1
罗正 [Wed, 12 Jun 2024 08:54:21 +0000 (08:54 +0000)]
Merge #266 into sdk602patch0521 from refs/changes/266/head

Code review from 罗正

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

  - 解决applist录音Text内容显示错误问题

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

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/266
2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Wed, 12 Jun 2024 08:54:00 +0000 (16:54 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago修复bug 265/1 265/head
Caisking [Wed, 12 Jun 2024 08:52:01 +0000 (16:52 +0800)]
修复bug

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 266/1 266/head
luozheng [Wed, 12 Jun 2024 08:01:20 +0000 (16:01 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago解决applist录音Text内容显示错误问题
luozheng [Wed, 12 Jun 2024 08:01:09 +0000 (16:01 +0800)]
解决applist录音Text内容显示错误问题

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 264/1 264/head 265/target/1 266/target/1
Caisking [Wed, 12 Jun 2024 07:44:27 +0000 (15:44 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago优化删除文件函数
Caisking [Wed, 12 Jun 2024 07:40:18 +0000 (15:40 +0800)]
优化删除文件函数

2 years ago表盘更换增加接口
Caisking [Wed, 12 Jun 2024 07:40:01 +0000 (15:40 +0800)]
表盘更换增加接口

2 years ago解决主界面音乐卡片死机问题,解决训练卡片点击音乐列表会死机问题 263/1 263/head 264/target/1
luozheng [Wed, 12 Jun 2024 07:12:04 +0000 (15:12 +0800)]
解决主界面音乐卡片死机问题,解决训练卡片点击音乐列表会死机问题

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Wed, 12 Jun 2024 03:44:23 +0000 (11:44 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Wed, 12 Jun 2024 03:42:24 +0000 (11:42 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

2 years agoMerge #262 into sdk602patch0521 from refs/changes/262/head 263/target/1
彭磊 [Wed, 12 Jun 2024 03:41:36 +0000 (03:41 +0000)]
Merge #262 into sdk602patch0521 from refs/changes/262/head

优化蓝牙产测,解决表盘指南针校准不过的问题

* refs/changes/262/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/262
2 years agoMerge #260 into sdk602patch0521 from refs/changes/260/head
罗正 [Wed, 12 Jun 2024 03:40:10 +0000 (03:40 +0000)]
Merge #260 into sdk602patch0521 from refs/changes/260/head

Code review from 罗正

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

  - 呼吸训练添加训练完成视图

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

  - 呼吸训练优化,差获取心率值接口,界面也还需要部分优化

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

  - 呼吸训练优化修改

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/260
2 years agoMerge #261 into sdk602patch0521 from refs/changes/261/head
胡传军 [Wed, 12 Jun 2024 03:39:06 +0000 (03:39 +0000)]
Merge #261 into sdk602patch0521 from refs/changes/261/head

Code review from 胡传军

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

  - 卡路里距离历史数据同步

  - 增加传输过程UI长亮

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

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/261
2 years ago添加删除文件通用接口,优化蓝牙产测 262/2 262/head
penglei [Wed, 12 Jun 2024 03:35:40 +0000 (11:35 +0800)]
添加删除文件通用接口,优化蓝牙产测

2 years ago呼吸训练优化修改 260/2 260/head
luozheng [Wed, 12 Jun 2024 03:13:44 +0000 (11:13 +0800)]
呼吸训练优化修改

2 years ago优化蓝牙产测,解决表盘指南针校准不过的问题 262/1
penglei [Wed, 12 Jun 2024 02:02:05 +0000 (10:02 +0800)]
优化蓝牙产测,解决表盘指南针校准不过的问题

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 261/1 261/head
hcj [Tue, 11 Jun 2024 10:53:45 +0000 (18:53 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago增加传输过程UI长亮
hcj [Tue, 11 Jun 2024 10:47:35 +0000 (18:47 +0800)]
增加传输过程UI长亮

2 years ago卡路里距离历史数据同步
hcj [Tue, 11 Jun 2024 10:47:00 +0000 (18:47 +0800)]
卡路里距离历史数据同步

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 260/1
luozheng [Tue, 11 Jun 2024 10:39:12 +0000 (18:39 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago呼吸训练优化,差获取心率值接口,界面也还需要部分优化
luozheng [Tue, 11 Jun 2024 10:39:05 +0000 (18:39 +0800)]
呼吸训练优化,差获取心率值接口,界面也还需要部分优化

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 259/1 259/head
Caisking [Tue, 11 Jun 2024 10:27:56 +0000 (18:27 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago修复训练记录icon不一致bug
Caisking [Tue, 11 Jun 2024 10:25:29 +0000 (18:25 +0800)]
修复训练记录icon不一致bug

2 years agoMerge #247 into sdk602patch0521 from refs/changes/247/head 259/target/1 260/target/1 261/target/1 262/target/1
袁清梦 [Tue, 11 Jun 2024 10:08:30 +0000 (10:08 +0000)]
Merge #247 into sdk602patch0521 from refs/changes/247/head

训练记录显示详细数据

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

  - 训练记录显示详细数据

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

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

  - 修复训练记录显示问题

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

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/247
2 years ago解决指南针校准不过的问题 258/2 258/head
penglei [Tue, 11 Jun 2024 09:53:04 +0000 (17:53 +0800)]
解决指南针校准不过的问题

2 years ago添加tar保存文件通用接口 258/1
penglei [Tue, 11 Jun 2024 09:45:54 +0000 (17:45 +0800)]
添加tar保存文件通用接口

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Tue, 11 Jun 2024 09:44:24 +0000 (17:44 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 247/2 247/head
Caisking [Tue, 11 Jun 2024 09:43:01 +0000 (17:43 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago修复训练记录显示问题
Caisking [Tue, 11 Jun 2024 09:42:57 +0000 (17:42 +0800)]
修复训练记录显示问题

2 years ago血氧心率修改补交 247/target/2 257/1 257/head 258/target/1
hcj [Tue, 11 Jun 2024 08:44:24 +0000 (16:44 +0800)]
血氧心率修改补交

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Tue, 11 Jun 2024 08:20:42 +0000 (16:20 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago呼吸训练添加训练完成视图
luozheng [Tue, 11 Jun 2024 08:20:32 +0000 (16:20 +0800)]
呼吸训练添加训练完成视图

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Tue, 11 Jun 2024 08:12:53 +0000 (16:12 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 256/1 256/head 257/target/1
hcj [Tue, 11 Jun 2024 07:49:50 +0000 (15:49 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago站立次数同步
hcj [Tue, 11 Jun 2024 07:49:45 +0000 (15:49 +0800)]
站立次数同步

2 years ago修改血氧和心率的存储json
hcj [Tue, 11 Jun 2024 07:47:52 +0000 (15:47 +0800)]
修改血氧和心率的存储json

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Tue, 11 Jun 2024 06:58:40 +0000 (14:58 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

2 years agoresume flash 驱动时降低flash驱动速度为 SPEED_MID,减少资源读取错误 255/1 255/head 256/target/1
SnickerSun [Tue, 11 Jun 2024 06:46:45 +0000 (14:46 +0800)]
resume flash 驱动时降低flash驱动速度为 SPEED_MID,减少资源读取错误

2 years ago降低nandflash读写速度,为 SPEED_MID,降低读取资源文件失败的情况。 254/1 254/head 255/target/1
SnickerSun [Tue, 11 Jun 2024 06:42:57 +0000 (14:42 +0800)]
降低nandflash读写速度,为 SPEED_MID,降低读取资源文件失败的情况。

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Tue, 11 Jun 2024 05:03:17 +0000 (13:03 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

2 years agoMerge #252 into sdk602patch0521 from refs/changes/252/head 254/target/1
胡传军 [Tue, 11 Jun 2024 03:52:38 +0000 (03:52 +0000)]
Merge #252 into sdk602patch0521 from refs/changes/252/head

Code review from 胡传军

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

  - 获取N天前日期

  - 增加传输中UI

  - 增加OTA传输中的进度条

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

  - 修复闹钟取消后依然会响的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/252
2 years ago bt core patch 20240609 253/1 253/head
SnickerSun [Tue, 11 Jun 2024 03:46:18 +0000 (11:46 +0800)]
 bt core patch 20240609

2 years ago修复闹钟取消后依然会响的bug 252/1 252/head
hcj [Tue, 11 Jun 2024 03:44:00 +0000 (11:44 +0800)]
修复闹钟取消后依然会响的bug

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Tue, 11 Jun 2024 02:30:33 +0000 (10:30 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agoMerge #249 into sdk602patch0521 from refs/changes/249/head 252/target/1 253/target/1
胡传军 [Tue, 11 Jun 2024 02:04:50 +0000 (02:04 +0000)]
Merge #249 into sdk602patch0521 from refs/changes/249/head

Code review from 胡传军

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

  - 获取N天前日期

  - 增加传输中UI

  - 增加OTA传输中的进度条

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/249
2 years agoMerge #251 into sdk602patch0521 from refs/changes/251/head
彭磊 [Tue, 11 Jun 2024 02:01:23 +0000 (02:01 +0000)]
Merge #251 into sdk602patch0521 from refs/changes/251/head

Code review from 彭磊

* refs/changes/251/head: (8 commits squashed)

  - 添加蓝牙产测麦克风测试项,添加tar保存exc文件功能

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

  - 补交

  - 补交

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

  - 优化麦克风蓝牙产测,优化tar保存死机文件

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

  - 优化tar保存exc文件

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/251
2 years ago增加OTA传输中的进度条 249/2 249/head
hcj [Tue, 11 Jun 2024 01:55:14 +0000 (09:55 +0800)]
增加OTA传输中的进度条

2 years ago优化tar保存exc文件 251/1 251/head
penglei [Sat, 8 Jun 2024 10:34:52 +0000 (18:34 +0800)]
优化tar保存exc文件

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 250/1 250/head
luozheng [Sat, 8 Jun 2024 10:12:23 +0000 (18:12 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago添加呼吸训练Slice,还需优化
luozheng [Sat, 8 Jun 2024 10:11:14 +0000 (18:11 +0800)]
添加呼吸训练Slice,还需优化

2 years ago增加传输中UI 249/1
hcj [Sat, 8 Jun 2024 09:53:51 +0000 (17:53 +0800)]
增加传输中UI

2 years ago获取N天前日期
hcj [Sat, 8 Jun 2024 09:50:44 +0000 (17:50 +0800)]
获取N天前日期

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Sat, 8 Jun 2024 09:40:02 +0000 (17:40 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Sat, 8 Jun 2024 09:38:45 +0000 (17:38 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agoMerge #244 into sdk602patch0521 from refs/changes/244/head 249/target/1 250/target/1 251/target/1
彭磊 [Sat, 8 Jun 2024 09:38:28 +0000 (09:38 +0000)]
Merge #244 into sdk602patch0521 from refs/changes/244/head

添加蓝牙产测麦克风测试项,添加tar保存exc文件功能

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

  - 添加蓝牙产测麦克风测试项,添加tar保存exc文件功能

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

  - 补交

  - 补交

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

  - 优化麦克风蓝牙产测,优化tar保存死机文件

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/244
2 years ago优化麦克风蓝牙产测,优化tar保存死机文件 244/4 244/head
penglei [Sat, 8 Jun 2024 09:30:41 +0000 (17:30 +0800)]
优化麦克风蓝牙产测,优化tar保存死机文件

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Sat, 8 Jun 2024 09:22:30 +0000 (17:22 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

2 years agopreserve.bin 保存时添加 时间戳 248/1 248/head
SnickerSun [Sat, 8 Jun 2024 09:12:14 +0000 (17:12 +0800)]
preserve.bin 保存时添加 时间戳

2 years ago训练记录显示详细数据 247/1
Caisking [Sat, 8 Jun 2024 09:02:38 +0000 (17:02 +0800)]
训练记录显示详细数据

2 years agoMerge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 244/target/3 246/1 246/head 247/target/1 248/target/1
SnickerSun [Sat, 8 Jun 2024 07:23:02 +0000 (15:23 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago补交 244/3
penglei [Sat, 8 Jun 2024 05:14:11 +0000 (13:14 +0800)]
补交

2 years ago补交 244/2
penglei [Sat, 8 Jun 2024 04:05:03 +0000 (12:05 +0800)]
补交

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Sat, 8 Jun 2024 04:03:57 +0000 (12:03 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

2 years agoMerge #245 into sdk602patch0521 from refs/changes/245/head 244/target/2 246/target/1
snickersun@163.com [Sat, 8 Jun 2024 03:20:14 +0000 (03:20 +0000)]
Merge #245 into sdk602patch0521 from refs/changes/245/head

跳过安卓手机传输文件crc校验

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

  - 跳过安卓手机传输文件crc校验

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/245
2 years agoMerge #242 into sdk602patch0521 from refs/changes/242/head
罗正 [Sat, 8 Jun 2024 03:20:03 +0000 (03:20 +0000)]
Merge #242 into sdk602patch0521 from refs/changes/242/head

Code review from 罗正

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

  - 秒表视图添加退出动画

  - 手电筒视图优化

  - 勿扰模式和查找手机视图优化

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

  - 优化指南针,倒计时,显示与亮度的退出逻辑

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

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

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/242
2 years ago跳过安卓手机传输文件crc校验 245/1 245/head
SnickerSun [Sat, 8 Jun 2024 03:19:29 +0000 (11:19 +0800)]
跳过安卓手机传输文件crc校验