hcj [Mon, 17 Jun 2024 11:01:27 +0000 (19:01 +0800)]
ble久坐协议对接
luozheng [Mon, 17 Jun 2024 10:42:42 +0000 (18:42 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Mon, 17 Jun 2024 10:42:34 +0000 (18:42 +0800)]
下拉视图优化修改 ,设置Model添加设备的连接状态更新操作
Caisking [Mon, 17 Jun 2024 10:28:12 +0000 (18:28 +0800)]
修复主界面首次刷新notify
Caisking [Mon, 17 Jun 2024 08:20:11 +0000 (16:20 +0800)]
增加Rtc打印AT指令
hcj [Mon, 17 Jun 2024 03:02:48 +0000 (11:02 +0800)]
修复删除表盘BUG
hcj [Mon, 17 Jun 2024 02:45:58 +0000 (10:45 +0800)]
增加ID文件保存，优化表盘注册
luozheng [Mon, 17 Jun 2024 01:32:34 +0000 (09:32 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
SnickerSun [Mon, 17 Jun 2024 01:31:28 +0000 (09:31 +0800)]
根据网络类型等信息，正确设置cat1_runtime变量，以供显示时使用。
Caisking [Sat, 15 Jun 2024 11:07:02 +0000 (19:07 +0800)]
消息Slice同步协议
Caisking [Sat, 15 Jun 2024 10:52:15 +0000 (18:52 +0800)]
更新主界面卡片资源
Caisking [Sat, 15 Jun 2024 10:08:00 +0000 (18:08 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
罗正 [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 'sdk602patch0521' 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
Caisking [Sat, 15 Jun 2024 10:07:55 +0000 (18:07 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Sat, 15 Jun 2024 10:07:51 +0000 (18:07 +0800)]
修复时间戳解析函数
luozheng [Sat, 15 Jun 2024 10:06:46 +0000 (18:06 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Sat, 15 Jun 2024 10:02:27 +0000 (18:02 +0800)]
天气界面实现app同步刷新数据
Caisking [Sat, 15 Jun 2024 09:38:06 +0000 (17:38 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Sat, 15 Jun 2024 09:38:01 +0000 (17:38 +0800)]
解析时间戳函数
SnickerSun [Sat, 15 Jun 2024 08:54:28 +0000 (16:54 +0800)]
兼容z1bootlogo显示
SnickerSun [Sat, 15 Jun 2024 08:26:15 +0000 (16:26 +0800)]
修正获取时间戳的函数
hcj [Sat, 15 Jun 2024 07:31:59 +0000 (15:31 +0800)]
修复切换表盘BUG 修改GOAL数据位置
luozheng [Sat, 15 Jun 2024 04:01:17 +0000 (12:01 +0800)]
天气视图第一个View刷新函数接口添加
luozheng [Sat, 15 Jun 2024 03:50:30 +0000 (11:50 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
hcj [Sat, 15 Jun 2024 03:36:34 +0000 (11:36 +0800)]
天气协议优化 表盘相关协议对接
hcj [Sat, 15 Jun 2024 03:35:21 +0000 (11:35 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Sat, 15 Jun 2024 02:26:32 +0000 (10:26 +0800)]
显示方式视图修改
罗正 [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 'sdk602patch0521' 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
luozheng [Fri, 14 Jun 2024 11:46:48 +0000 (19:46 +0800)]
applist与主题样式修改
luozheng [Fri, 14 Jun 2024 11:27:21 +0000 (19:27 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Fri, 14 Jun 2024 11:27:14 +0000 (19:27 +0800)]
添加显示方式(applist主题样式)Slice
SnickerSun [Fri, 14 Jun 2024 10:51:51 +0000 (18:51 +0800)]
更新modem固件到新pyVer 9
SnickerSun [Fri, 14 Jun 2024 10:46:59 +0000 (18:46 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
SnickerSun [Fri, 14 Jun 2024 10:41:59 +0000 (18:41 +0800)]
更新modem脚本版本，以及打包自动添加modem固件
DXY [Fri, 14 Jun 2024 10:36:17 +0000 (18:36 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
DXY [Fri, 14 Jun 2024 10:36:00 +0000 (18:36 +0800)]
移动入库BLE增加指令保存上报地址：优化报错问题
hcj [Fri, 14 Jun 2024 10:26:23 +0000 (18:26 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Fri, 14 Jun 2024 10:23:12 +0000 (18:23 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Fri, 14 Jun 2024 10:23:06 +0000 (18:23 +0800)]
增加获取所有表盘Id
SnickerSun [Fri, 14 Jun 2024 10:10:36 +0000 (18:10 +0800)]
打印cat1 更新 版本 imei等信息的过程
SnickerSun [Fri, 14 Jun 2024 10:08:06 +0000 (18:08 +0800)]
取消蜂窝界面表冠直接进入应用的能力
SnickerSun [Fri, 14 Jun 2024 10:03:56 +0000 (18:03 +0800)]
恢复出厂设置中添加bluetooth_factory_reset函数
SnickerSun [Fri, 14 Jun 2024 10:03:08 +0000 (18:03 +0800)]
修复 imei，pyVer，modemVer在runtime中没有正确保存的问题
Caisking [Fri, 14 Jun 2024 08:27:33 +0000 (16:27 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Fri, 14 Jun 2024 08:27:26 +0000 (16:27 +0800)]
修复心率显示不正常原因
胡传军 [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
Caisking [Fri, 14 Jun 2024 07:06:42 +0000 (15:06 +0800)]
优化主界面notify判断逻辑
Caisking [Fri, 14 Jun 2024 06:33:14 +0000 (14:33 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Fri, 14 Jun 2024 06:33:09 +0000 (14:33 +0800)]
修复主界面表盘不暂停心率检测
hcj [Fri, 14 Jun 2024 03:02:32 +0000 (11:02 +0800)]
主界面活动卡片增加
SnickerSun [Fri, 14 Jun 2024 02:53:48 +0000 (10:53 +0800)]
custom runtime 去掉直接访问变量的方法，采用函数设置获取。
优化Cat1解析，版本6以上的信号解析增加 网络类型和是否连接选项。
luozheng [Thu, 13 Jun 2024 12:12:33 +0000 (20:12 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Thu, 13 Jun 2024 12:12:16 +0000 (20:12 +0800)]
注册双击按键事件，目前双击function键会跳转到显示方式界面
SnickerSun [Thu, 13 Jun 2024 11:30:12 +0000 (19:30 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
SnickerSun [Thu, 13 Jun 2024 11:27:07 +0000 (19:27 +0800)]
长按事件优化
luozheng [Thu, 13 Jun 2024 10:33:41 +0000 (18:33 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Thu, 13 Jun 2024 10:33:30 +0000 (18:33 +0800)]
语言选择界面优化
Caisking [Thu, 13 Jun 2024 10:32:37 +0000 (18:32 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
SnickerSun [Thu, 13 Jun 2024 10:30:54 +0000 (18:30 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
袁清梦 [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
Caisking [Thu, 13 Jun 2024 10:19:34 +0000 (18:19 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
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 'sdk602patch0521' 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
Caisking [Thu, 13 Jun 2024 10:14:13 +0000 (18:14 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Thu, 13 Jun 2024 10:14:06 +0000 (18:14 +0800)]
修复心率血氧数据json的时间戳
hcj [Thu, 13 Jun 2024 10:11:29 +0000 (18:11 +0800)]
增加活动slice
hcj [Thu, 13 Jun 2024 10:02:21 +0000 (18:02 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
SnickerSun [Thu, 13 Jun 2024 09:44:00 +0000 (17:44 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
彭磊 [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 'sdk602patch0521' 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
SnickerSun [Thu, 13 Jun 2024 09:10:32 +0000 (17:10 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
SnickerSun [Thu, 13 Jun 2024 09:10:19 +0000 (17:10 +0800)]
修复蓝牙耳机扫描窗口不记录历史配对记录问题
Caisking [Thu, 13 Jun 2024 08:14:03 +0000 (16:14 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Thu, 13 Jun 2024 08:10:19 +0000 (16:10 +0800)]
优化训练死机bug
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.优化呼吸训练：训练过程中开启心率检测，训练完成获取心率值展示在完成视图上。
luozheng [Thu, 13 Jun 2024 06:57:46 +0000 (14:57 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Thu, 13 Jun 2024 06:57:24 +0000 (14:57 +0800)]
录音视图优化
彭磊 [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
Caisking [Thu, 13 Jun 2024 04:00:35 +0000 (12:00 +0800)]
优化训练记录存储
Caisking [Thu, 13 Jun 2024 02:14:53 +0000 (10:14 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Thu, 13 Jun 2024 02:10:09 +0000 (10:10 +0800)]
增加心率控制接口。实现主界面心率检测
luozheng [Thu, 13 Jun 2024 01:35:49 +0000 (09:35 +0800)]
呼吸训练优化
SnickerSun [Wed, 12 Jun 2024 13:34:30 +0000 (21:34 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
SnickerSun [Wed, 12 Jun 2024 13:33:58 +0000 (21:33 +0800)]
release路径添加版本号，方便跟踪
SnickerSun [Wed, 12 Jun 2024 13:32:46 +0000 (21:32 +0800)]
优化屏幕长按事件，更容易触发
SnickerSun [Wed, 12 Jun 2024 13:32:15 +0000 (21:32 +0800)]
优化uapi_tar_file，减少stack内存使用。
保存exctar文件时加入编译版本号方便以后查找
SnickerSun [Wed, 12 Jun 2024 13:01:44 +0000 (21:01 +0800)]
同步 patch_uapi_calendar_get_timestamp.zip，修复RC时间保存不准问题
SnickerSun [Wed, 12 Jun 2024 12:58:44 +0000 (20:58 +0800)]
fd230 nativelauncher 同步到0521patch
SnickerSun [Wed, 12 Jun 2024 12:57:57 +0000 (20:57 +0800)]
蓝牙br同步到0521patch
SnickerSun [Wed, 12 Jun 2024 12:57:26 +0000 (20:57 +0800)]
alipay同步到0521patch
SnickerSun [Wed, 12 Jun 2024 12:54:51 +0000 (20:54 +0800)]
alarm同步到0512 patch
penglei [Wed, 12 Jun 2024 12:43:29 +0000 (20:43 +0800)]
优化蓝牙产测，使能按键双击检测，添加efuse读写测试接口
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
Caisking [Wed, 12 Jun 2024 12:28:16 +0000 (20:28 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Wed, 12 Jun 2024 12:24:48 +0000 (20:24 +0800)]
增加主界面配置卡片，UI需要优化
luozheng [Wed, 12 Jun 2024 11:11:58 +0000 (19:11 +0800)]
录音视图修改
罗正 [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 'sdk602patch0521' 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
luozheng [Wed, 12 Jun 2024 08:54:00 +0000 (16:54 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
Caisking [Wed, 12 Jun 2024 08:52:01 +0000 (16:52 +0800)]
修复bug
luozheng [Wed, 12 Jun 2024 08:01:20 +0000 (16:01 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
luozheng [Wed, 12 Jun 2024 08:01:09 +0000 (16:01 +0800)]
解决applist录音Text内容显示错误问题
Caisking [Wed, 12 Jun 2024 07:44:27 +0000 (15:44 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0521
projects / mirrors / FD230.git / log