mirrors/FD230.git
2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 310/1 310/head
luozheng [Tue, 18 Jun 2024 09:32:51 +0000 (17:32 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago1.优化显示与亮度视图目前能够同步更新显示(除了亮屏时长视图不能考虑重构中)
luozheng [Tue, 18 Jun 2024 09:32:47 +0000 (17:32 +0800)]
1.优化显示与亮度视图目前能够同步更新显示(除了亮屏时长视图不能考虑重构中)
2.优化ui_service,

2 years ago解决显示方式和天气bug
luozheng [Tue, 18 Jun 2024 06:43:57 +0000 (14:43 +0800)]
解决显示方式和天气bug

2 years ago优化开机动画播放,优化产测,优化磁力计service 307/1 307/head 309/target/1 310/target/1
penglei [Tue, 18 Jun 2024 03:04:34 +0000 (11:04 +0800)]
优化开机动画播放,优化产测,优化磁力计service

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

2 years ago修正 BT Scan 参数,解决产测扫描不出设备的问题 306/1 306/head 307/target/1
SnickerSun [Mon, 17 Jun 2024 12:34:25 +0000 (20:34 +0800)]
修正 BT Scan 参数,解决产测扫描不出设备的问题

2 years agoMerge #305 into sdk602patch0521 from refs/changes/305/head 306/target/1
袁清梦 [Mon, 17 Jun 2024 12:26:39 +0000 (12:26 +0000)]
Merge #305 into sdk602patch0521 from refs/changes/305/head

增加消息详细界面Slice

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

  - 增加消息详细界面Slice

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/305
2 years agoMerge #300 into sdk602patch0521 from refs/changes/300/head
彭磊 [Mon, 17 Jun 2024 12:25:45 +0000 (12:25 +0000)]
Merge #300 into sdk602patch0521 from refs/changes/300/head

Code review from 彭磊

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

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

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

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

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

  - 添加开机动画,优化蓝牙产测,优化久坐提醒设置,添加efuse读写测试接口

  - 补交

  - 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

  - 补交

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/300
2 years agoMerge #303 into sdk602patch0521 from refs/changes/303/head
胡传军 [Mon, 17 Jun 2024 12:24:45 +0000 (12:24 +0000)]
Merge #303 into sdk602patch0521 from refs/changes/303/head

ble久坐协议对接

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

  - ble久坐协议对接

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/303
2 years ago修复在主界面刷新表盘 304/1 304/head 305/target/1
Caisking [Mon, 17 Jun 2024 11:18:51 +0000 (19:18 +0800)]
修复在主界面刷新表盘

2 years ago补交 300/4 300/head
penglei [Mon, 17 Jun 2024 11:14:50 +0000 (19:14 +0800)]
补交

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

2 years ago优化蓝牙产测与开机动画 300/3
penglei [Mon, 17 Jun 2024 10:45:44 +0000 (18:45 +0800)]
优化蓝牙产测与开机动画

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Mon, 17 Jun 2024 10:45:00 +0000 (18:45 +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... 300/target/3 302/1 302/head 303/target/1 304/target/1
luozheng [Mon, 17 Jun 2024 10:42:42 +0000 (18:42 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago下拉视图优化修改 ,设置Model添加设备的连接状态更新操作
luozheng [Mon, 17 Jun 2024 10:42:34 +0000 (18:42 +0800)]
下拉视图优化修改 ,设置Model添加设备的连接状态更新操作

2 years ago修复主界面首次刷新notify 299/2 299/head 300/target/2 302/target/1
Caisking [Mon, 17 Jun 2024 10:28:12 +0000 (18:28 +0800)]
修复主界面首次刷新notify

2 years ago补交 300/2
penglei [Mon, 17 Jun 2024 08:44:20 +0000 (16:44 +0800)]
补交

2 years ago添加开机动画,优化蓝牙产测,优化久坐提醒设置,添加efuse读写测试接口 300/1
penglei [Mon, 17 Jun 2024 08:40:11 +0000 (16:40 +0800)]
添加开机动画,优化蓝牙产测,优化久坐提醒设置,添加efuse读写测试接口

2 years ago增加Rtc打印AT指令 299/1
Caisking [Mon, 17 Jun 2024 08:20:11 +0000 (16:20 +0800)]
增加Rtc打印AT指令

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

2 years ago修复删除表盘BUG 298/2 298/head 299/target/1 300/target/1
hcj [Mon, 17 Jun 2024 03:02:48 +0000 (11:02 +0800)]
修复删除表盘BUG

2 years ago增加ID文件保存,优化表盘注册 298/1
hcj [Mon, 17 Jun 2024 02:45:58 +0000 (10:45 +0800)]
增加ID文件保存,优化表盘注册

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Mon, 17 Jun 2024 01:32:34 +0000 (09:32 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago根据网络类型等信息,正确设置cat1_runtime变量,以供显示时使用。 297/1 297/head 298/target/1
SnickerSun [Mon, 17 Jun 2024 01:31:28 +0000 (09:31 +0800)]
根据网络类型等信息,正确设置cat1_runtime变量,以供显示时使用。

2 years ago消息Slice同步协议 296/1 296/head 297/target/1
Caisking [Sat, 15 Jun 2024 11:07:02 +0000 (19:07 +0800)]
消息Slice同步协议

2 years ago更新主界面卡片资源
Caisking [Sat, 15 Jun 2024 10:52:15 +0000 (18:52 +0800)]
更新主界面卡片资源

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 294/2 294/head 296/target/1
Caisking [Sat, 15 Jun 2024 10:08:00 +0000 (18:08 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agoMerge #295 into sdk602patch0521 from refs/changes/295/head 294/target/2
罗正 [Sat, 15 Jun 2024 10:07:57 +0000 (10:07 +0000)]
Merge #295 into sdk602patch0521 from refs/changes/295/head

Code review from 罗正

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

  - 天气界面实现app同步刷新数据

  - 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/295
2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Sat, 15 Jun 2024 10:07:55 +0000 (18:07 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago修复时间戳解析函数
Caisking [Sat, 15 Jun 2024 10:07:51 +0000 (18:07 +0800)]
修复时间戳解析函数

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

2 years ago天气界面实现app同步刷新数据
luozheng [Sat, 15 Jun 2024 10:02:27 +0000 (18:02 +0800)]
天气界面实现app同步刷新数据

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

2 years ago解析时间戳函数
Caisking [Sat, 15 Jun 2024 09:38:01 +0000 (17:38 +0800)]
解析时间戳函数

2 years ago兼容z1bootlogo显示 293/2 293/head
SnickerSun [Sat, 15 Jun 2024 08:54:28 +0000 (16:54 +0800)]
兼容z1bootlogo显示

2 years ago修正获取时间戳的函数 293/1
SnickerSun [Sat, 15 Jun 2024 08:26:15 +0000 (16:26 +0800)]
修正获取时间戳的函数

2 years ago修复切换表盘BUG 修改GOAL数据位置 292/2 292/head 293/target/1 294/target/1 295/target/1
hcj [Sat, 15 Jun 2024 07:31:59 +0000 (15:31 +0800)]
修复切换表盘BUG 修改GOAL数据位置

2 years ago天气视图第一个View刷新函数接口添加 291/1 291/head 292/target/1
luozheng [Sat, 15 Jun 2024 04:01:17 +0000 (12:01 +0800)]
天气视图第一个View刷新函数接口添加

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

2 years ago天气协议优化 表盘相关协议对接 290/1 290/head 291/target/1
hcj [Sat, 15 Jun 2024 03:36:34 +0000 (11:36 +0800)]
天气协议优化 表盘相关协议对接

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Sat, 15 Jun 2024 03:35:21 +0000 (11:35 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago显示方式视图修改
luozheng [Sat, 15 Jun 2024 02:26:32 +0000 (10:26 +0800)]
显示方式视图修改

2 years agoMerge #289 into sdk602patch0521 from refs/changes/289/head 290/target/1
罗正 [Sat, 15 Jun 2024 01:28:18 +0000 (01:28 +0000)]
Merge #289 into sdk602patch0521 from refs/changes/289/head

Code review from 罗正

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

  - 添加显示方式(applist主题样式)Slice

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

  - applist与主题样式修改

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/289
2 years agoapplist与主题样式修改 289/1 289/head
luozheng [Fri, 14 Jun 2024 11:46:48 +0000 (19:46 +0800)]
applist与主题样式修改

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Fri, 14 Jun 2024 11:27:21 +0000 (19:27 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago添加显示方式(applist主题样式)Slice
luozheng [Fri, 14 Jun 2024 11:27:14 +0000 (19:27 +0800)]
添加显示方式(applist主题样式)Slice

2 years ago更新modem固件到新pyVer 9 288/1 288/head
SnickerSun [Fri, 14 Jun 2024 10:51:51 +0000 (18:51 +0800)]
更新modem固件到新pyVer 9

2 years agoMerge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
SnickerSun [Fri, 14 Jun 2024 10:46:59 +0000 (18:46 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago更新modem脚本版本,以及打包自动添加modem固件
SnickerSun [Fri, 14 Jun 2024 10:41:59 +0000 (18:41 +0800)]
更新modem脚本版本,以及打包自动添加modem固件

2 years agoMerge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 287/1 287/head 288/target/1 289/target/1
DXY [Fri, 14 Jun 2024 10:36:17 +0000 (18:36 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago移动入库BLE增加指令保存上报地址:优化报错问题
DXY [Fri, 14 Jun 2024 10:36:00 +0000 (18:36 +0800)]
移动入库BLE增加指令保存上报地址:优化报错问题

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

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 286/1 286/head 287/target/1
Caisking [Fri, 14 Jun 2024 10:23:12 +0000 (18:23 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago增加获取所有表盘Id
Caisking [Fri, 14 Jun 2024 10:23:06 +0000 (18:23 +0800)]
增加获取所有表盘Id

2 years ago打印cat1 更新 版本 imei等信息的过程 285/1 285/head 286/target/1
SnickerSun [Fri, 14 Jun 2024 10:10:36 +0000 (18:10 +0800)]
打印cat1 更新 版本 imei等信息的过程

2 years ago取消蜂窝界面表冠直接进入应用的能力
SnickerSun [Fri, 14 Jun 2024 10:08:06 +0000 (18:08 +0800)]
取消蜂窝界面表冠直接进入应用的能力

2 years ago恢复出厂设置中添加bluetooth_factory_reset函数
SnickerSun [Fri, 14 Jun 2024 10:03:56 +0000 (18:03 +0800)]
恢复出厂设置中添加bluetooth_factory_reset函数

2 years ago修复 imei,pyVer,modemVer在runtime中没有正确保存的问题
SnickerSun [Fri, 14 Jun 2024 10:03:08 +0000 (18:03 +0800)]
修复 imei,pyVer,modemVer在runtime中没有正确保存的问题

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

2 years ago修复心率显示不正常原因
Caisking [Fri, 14 Jun 2024 08:27:26 +0000 (16:27 +0800)]
修复心率显示不正常原因

2 years agoMerge #282 into sdk602patch0521 from refs/changes/282/head 285/target/1
胡传军 [Fri, 14 Jun 2024 08:03:41 +0000 (08:03 +0000)]
Merge #282 into sdk602patch0521 from refs/changes/282/head

主界面活动卡片增加

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

  - 主界面活动卡片增加

Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/282
2 years ago优化主界面notify判断逻辑 284/1 284/head
Caisking [Fri, 14 Jun 2024 07:06:42 +0000 (15:06 +0800)]
优化主界面notify判断逻辑

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 283/1 283/head 284/target/1
Caisking [Fri, 14 Jun 2024 06:33:14 +0000 (14:33 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago修复主界面表盘不暂停心率检测
Caisking [Fri, 14 Jun 2024 06:33:09 +0000 (14:33 +0800)]
修复主界面表盘不暂停心率检测

2 years ago主界面活动卡片增加 282/1 282/head
hcj [Fri, 14 Jun 2024 03:02:32 +0000 (11:02 +0800)]
主界面活动卡片增加

2 years agocustom runtime 去掉直接访问变量的方法,采用函数设置获取。 281/1 281/head 282/target/1 283/target/1
SnickerSun [Fri, 14 Jun 2024 02:53:48 +0000 (10:53 +0800)]
custom runtime 去掉直接访问变量的方法,采用函数设置获取。
优化Cat1解析,版本6以上的信号解析增加 网络类型和是否连接选项。

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 280/1 280/head 281/target/1
luozheng [Thu, 13 Jun 2024 12:12:33 +0000 (20:12 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago注册双击按键事件,目前双击function键会跳转到显示方式界面
luozheng [Thu, 13 Jun 2024 12:12:16 +0000 (20:12 +0800)]
注册双击按键事件,目前双击function键会跳转到显示方式界面

2 years agoMerge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 279/1 279/head 280/target/1
SnickerSun [Thu, 13 Jun 2024 11:30:12 +0000 (19:30 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago长按事件优化
SnickerSun [Thu, 13 Jun 2024 11:27:07 +0000 (19:27 +0800)]
长按事件优化

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 https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Thu, 13 Jun 2024 10:32:37 +0000 (18:32 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

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 &#39;sdk602patch0521&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

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

  - 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/274
2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 274/2 274/head
Caisking [Thu, 13 Jun 2024 10:19:34 +0000 (18:19 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

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 agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Thu, 13 Jun 2024 10:14:13 +0000 (18:14 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago修复心率血氧数据json的时间戳
Caisking [Thu, 13 Jun 2024 10:14:06 +0000 (18:14 +0800)]
修复心率血氧数据json的时间戳

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 agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 274/1
Caisking [Thu, 13 Jun 2024 08:14:03 +0000 (16:14 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago优化训练死机bug
Caisking [Thu, 13 Jun 2024 08:10:19 +0000 (16:10 +0800)]
优化训练死机bug

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 ago蓝牙产测添加NTC测试指令 273/1 273/head
penglei [Thu, 13 Jun 2024 07:30:29 +0000 (15:30 +0800)]
蓝牙产测添加NTC测试指令

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Thu, 13 Jun 2024 07:25:53 +0000 (15:25 +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... 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 ago优化蓝牙产测,添加ppg关闭led指令 271/1 271/head
penglei [Thu, 13 Jun 2024 02:30:59 +0000 (10:30 +0800)]
优化蓝牙产测,添加ppg关闭led指令

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