penglei [Sun, 28 Apr 2024 07:22:29 +0000 (15:22 +0800)]
补交恢复出厂设置
penglei [Sun, 28 Apr 2024 06:46:32 +0000 (14:46 +0800)]
补交
penglei [Sun, 28 Apr 2024 06:40:22 +0000 (14:40 +0800)]
添加恢复出厂设置
SnickerSun [Sat, 27 Apr 2024 11:54:58 +0000 (19:54 +0800)]
修复开启powerkey 3秒启动 修改未生效问题。
SnickerSun [Sat, 27 Apr 2024 11:54:14 +0000 (19:54 +0800)]
产测中添加关闭蓝牙cat1进行睡眠电流测试的按钮
Caisking [Sat, 27 Apr 2024 11:51:17 +0000 (19:51 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Sat, 27 Apr 2024 11:51:11 +0000 (19:51 +0800)]
修复moamao表盘组件位置问题
Caisking [Sat, 27 Apr 2024 11:45:12 +0000 (19:45 +0800)]
勿扰模式同步主界面显示
SnickerSun [Sat, 27 Apr 2024 11:21:09 +0000 (19:21 +0800)]
1、更新ota脚本，添加额外手动添加和删除的资源配置方案。测试颗正常添加删除文件，但带空格的文件仍然无法删除。
2、优化手表ota执行流程，ota更新第一次重启屏蔽掉系统UI，可直接进入第二次重启的recovery界面
penglei [Sat, 27 Apr 2024 11:05:04 +0000 (19:05 +0800)]
优化血氧驱动，解决血氧检测经常不出值的问题，优化心率血氧蓝牙服务。
Caisking [Sat, 27 Apr 2024 10:32:50 +0000 (18:32 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Sat, 27 Apr 2024 10:32:36 +0000 (18:32 +0800)]
增加心率测试接口
罗正 [Sat, 27 Apr 2024 10:20:11 +0000 (10:20 +0000)]
Merge #101 into xts_origin from refs/changes/101/head
Code review from 罗正
* refs/changes/101/head: (4 commits squashed)
- 通过设置拦截函数优化连接状态视图的退出逻辑
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- 修复下拉时间不更新问题
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/101
penglei [Sat, 27 Apr 2024 10:12:21 +0000 (18:12 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
penglei [Sat, 27 Apr 2024 10:12:15 +0000 (18:12 +0800)]
添加心率血氧蓝牙服务
Caisking [Sat, 27 Apr 2024 09:47:04 +0000 (17:47 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Sat, 27 Apr 2024 09:46:59 +0000 (17:46 +0800)]
修复表盘电量更新问题；需要更新表盘资源
SnickerSun [Sat, 27 Apr 2024 09:21:46 +0000 (17:21 +0800)]
添加ble heartrate 服务
penglei [Sat, 27 Apr 2024 06:53:32 +0000 (14:53 +0800)]
优化动态心率
luozheng [Sat, 27 Apr 2024 06:36:25 +0000 (14:36 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Sat, 27 Apr 2024 06:35:16 +0000 (14:35 +0800)]
添加连接状态视图，通过在点击连接状态按钮进入
Caisking [Fri, 26 Apr 2024 10:38:41 +0000 (18:38 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Fri, 26 Apr 2024 10:38:30 +0000 (18:38 +0800)]
修复时间戳错误更改为uint32;增加获取秒级时间戳函数
Caisking [Fri, 26 Apr 2024 10:03:15 +0000 (18:03 +0800)]
修复发送训练实时数据；修复设置训练面板死机bug；增加发送训练状态；
luozheng [Fri, 26 Apr 2024 09:51:51 +0000 (17:51 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Fri, 26 Apr 2024 09:47:52 +0000 (17:47 +0800)]
图片提交
SnickerSun [Fri, 26 Apr 2024 09:44:07 +0000 (17:44 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
snickersun@163.com [Fri, 26 Apr 2024 09:43:52 +0000 (09:43 +0000)]
Merge #93 into xts_origin from refs/changes/93/head
Code review from snickersun@163.com
* refs/changes/93/head: (2 commits squashed)
- 修复 插着充电线重启 充电检测无效问题
- 临时默认开机开启Cat1 然后根据配置关闭或保持开启
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/93
SnickerSun [Fri, 26 Apr 2024 09:42:09 +0000 (17:42 +0800)]
临时默认开机开启Cat1 然后根据配置关闭或保持开启
SnickerSun [Fri, 26 Apr 2024 09:38:53 +0000 (17:38 +0800)]
修复 插着充电线重启 充电检测无效问题
luozheng [Fri, 26 Apr 2024 07:39:22 +0000 (15:39 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Fri, 26 Apr 2024 07:37:44 +0000 (15:37 +0800)]
优化下拉控制中心，添加信号强度和4G图标显示
SnickerSun [Fri, 26 Apr 2024 01:48:03 +0000 (09:48 +0800)]
ota脚本制作file资源查分支持 文件名带空格
SnickerSun [Fri, 26 Apr 2024 00:12:38 +0000 (08:12 +0800)]
采用 lbs 跟踪二进制文件
SnickerSun [Thu, 25 Apr 2024 15:23:48 +0000 (23:23 +0800)]
修复mkota脚本自动更新fs ota包
SnickerSun [Thu, 25 Apr 2024 14:48:36 +0000 (22:48 +0800)]
ota包制作脚本自动添加fs data 打包
SnickerSun [Thu, 25 Apr 2024 13:50:59 +0000 (21:50 +0800)]
ota生成脚本优化，目前支持使用gen_fs_otapkg.sh生成的需要更新的路径。
后期还需优化自动 使用delete 文件列表
袁清梦 [Thu, 25 Apr 2024 12:55:06 +0000 (12:55 +0000)]
Merge #85 into xts_origin from refs/changes/85/head
Code review from 袁清梦
* refs/changes/85/head: (2 commits squashed)
- 训练目标同步设置
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
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/85
SnickerSun [Thu, 25 Apr 2024 12:52:25 +0000 (20:52 +0800)]
删除带空格的图片
添加gen_fs_otapkg.sh 生成针对某个版本到当前版本的修改内容
SnickerSun [Thu, 25 Apr 2024 11:04:40 +0000 (19:04 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Thu, 25 Apr 2024 11:04:32 +0000 (19:04 +0800)]
修复cat1 version不更新问题
hcj [Thu, 25 Apr 2024 09:48:17 +0000 (17:48 +0800)]
修复设备训练目标BUG
SnickerSun [Thu, 25 Apr 2024 09:37:06 +0000 (17:37 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
snickersun@163.com [Thu, 25 Apr 2024 09:36:57 +0000 (09:36 +0000)]
Merge #82 into xts_origin from refs/changes/82/head
添加OTA升级UI提示，recovery里还只能是白屏。
* refs/changes/82/head: (1 commits squashed)
- 添加OTA升级UI提示，recovery里还只能是白屏。
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/82
SnickerSun [Thu, 25 Apr 2024 09:34:03 +0000 (17:34 +0800)]
添加OTA升级UI提示，recovery里还只能是白屏。
luozheng [Thu, 25 Apr 2024 08:29:27 +0000 (16:29 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Thu, 25 Apr 2024 08:21:49 +0000 (16:21 +0800)]
蓝牙Slice增加蓝牙服务选项Sliceq
SnickerSun [Thu, 25 Apr 2024 07:14:08 +0000 (15:14 +0800)]
1、缩短按电源开机时间
2、添加runtime 接口，供整个系统使用
3、优化cat1 消息解析，都移动到cat1_server里，直接修改runtime
4、优化工厂测试 cat1 测试接口
5、custom_utils添加thread terminal接口
Caisking [Thu, 25 Apr 2024 06:52:08 +0000 (14:52 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Thu, 25 Apr 2024 02:56:45 +0000 (10:56 +0800)]
修改训练UI初始化接口
hcj [Thu, 25 Apr 2024 02:41:49 +0000 (10:41 +0800)]
修复使用cjson时的内存泄露，添加蓝牙训练协议对接
Caisking [Thu, 25 Apr 2024 02:31:40 +0000 (10:31 +0800)]
修复head获取错误问题
Caisking [Thu, 25 Apr 2024 02:21:26 +0000 (10:21 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
罗正 [Thu, 25 Apr 2024 02:13:33 +0000 (02:13 +0000)]
Merge #76 into xts_origin from refs/changes/76/head
Code review from 罗正
* refs/changes/76/head: (12 commits squashed)
- 增加震动提醒功能
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- 1.设置中增加网络与通话Slice,显示方式Slice去除快速访问Slice
2.修改多国语言适配设置界面
3.增加网络与通话界面图片
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- VoLTE，移动数据按钮增加点击监听
- 添加移动数据选项页面
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- 增加运动识别Slice
- 修改设置视图以适配多国语言
- 1.利用ConfigModel保存用户设置的VoLTE通话和运动识别开关状态。
2.解决运动识别视图右滑不退出问题。
3.删除系统视图中的4G能力开关并移动到网络与通话中。
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- 修改设置视图中开关机icon，优化显示方式视图的退出方式，修改开关机视图的incon图标
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/76
penglei [Thu, 25 Apr 2024 01:57:50 +0000 (09:57 +0800)]
低功耗优化，添加抬腕亮屏功能
penglei [Thu, 25 Apr 2024 01:50:31 +0000 (09:50 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Thu, 25 Apr 2024 01:31:02 +0000 (09:31 +0800)]
修改设置视图中开关机icon，优化显示方式视图的退出方式，修改开关机视图的incon图标
Caisking [Wed, 24 Apr 2024 08:15:24 +0000 (16:15 +0800)]
训练实时数据发送
Caisking [Wed, 24 Apr 2024 07:49:16 +0000 (15:49 +0800)]
修复ble控制训练暂停和恢复
luozheng [Wed, 24 Apr 2024 06:29:25 +0000 (14:29 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Wed, 24 Apr 2024 06:28:31 +0000 (14:28 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Wed, 24 Apr 2024 06:23:36 +0000 (14:23 +0800)]
1.利用ConfigModel保存用户设置的VoLTE通话和运动识别开关状态。
2.解决运动识别视图右滑不退出问题。
3.删除系统视图中的4G能力开关并移动到网络与通话中。
Caisking [Wed, 24 Apr 2024 03:35:48 +0000 (11:35 +0800)]
增加心率检测接口
hcj [Wed, 24 Apr 2024 02:57:45 +0000 (10:57 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
hcj [Wed, 24 Apr 2024 02:57:17 +0000 (10:57 +0800)]
添加开机升级自动上报升级结果
penglei [Wed, 24 Apr 2024 02:33:11 +0000 (10:33 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Wed, 24 Apr 2024 02:16:20 +0000 (10:16 +0800)]
恢复acc sensor和cat1的 中断脚配置
SnickerSun [Wed, 24 Apr 2024 01:56:34 +0000 (09:56 +0800)]
1、优化产测流程，about，gsensor， magsensor
2、cywee优化，采用中断读取数据
3、ppg和mag service 根据设备是否存在决定是否启动服务
4、cat1 所有timer处理移到timer中断外执行。
5、acc 采用float数据进行传输及显示
Caisking [Wed, 24 Apr 2024 01:42:12 +0000 (09:42 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
罗正 [Wed, 24 Apr 2024 01:37:25 +0000 (01:37 +0000)]
Merge #71 into xts_origin from refs/changes/71/head
Code review from 罗正
* refs/changes/71/head: (9 commits squashed)
- 增加震动提醒功能
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- 1.设置中增加网络与通话Slice,显示方式Slice去除快速访问Slice
2.修改多国语言适配设置界面
3.增加网络与通话界面图片
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- VoLTE，移动数据按钮增加点击监听
- 添加移动数据选项页面
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- 增加运动识别Slice
- 修改设置视图以适配多国语言
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/71
penglei [Wed, 24 Apr 2024 01:26:46 +0000 (09:26 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Tue, 23 Apr 2024 12:30:46 +0000 (20:30 +0800)]
Add OpenState
luozheng [Tue, 23 Apr 2024 11:31:43 +0000 (19:31 +0800)]
修改设置视图以适配多国语言
luozheng [Tue, 23 Apr 2024 11:19:01 +0000 (19:19 +0800)]
增加运动识别Slice
hcj [Tue, 23 Apr 2024 10:13:46 +0000 (18:13 +0800)]
升级包下载，及升级结果上报
Caisking [Tue, 23 Apr 2024 09:48:32 +0000 (17:48 +0800)]
修复训练时长数据处理bug
Caisking [Tue, 23 Apr 2024 09:21:14 +0000 (17:21 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Tue, 23 Apr 2024 09:16:30 +0000 (17:16 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Tue, 23 Apr 2024 09:16:22 +0000 (17:16 +0800)]
添加移动数据选项页面
Caisking [Tue, 23 Apr 2024 08:48:40 +0000 (16:48 +0800)]
增加信息通知Slice到Applist
Caisking [Tue, 23 Apr 2024 08:41:10 +0000 (16:41 +0800)]
增加UIComponents文件
hcj [Tue, 23 Apr 2024 08:27:27 +0000 (16:27 +0800)]
http post完善
luozheng [Tue, 23 Apr 2024 07:12:52 +0000 (15:12 +0800)]
VoLTE，移动数据按钮增加点击监听
Caisking [Tue, 23 Apr 2024 07:03:56 +0000 (15:03 +0800)]
无训练记录UI
luozheng [Tue, 23 Apr 2024 06:41:03 +0000 (14:41 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Tue, 23 Apr 2024 06:37:45 +0000 (14:37 +0800)]
1.设置中增加网络与通话Slice,显示方式Slice去除快速访问Slice
2.修改多国语言适配设置界面
3.增加网络与通话界面图片
hcj [Tue, 23 Apr 2024 02:32:13 +0000 (10:32 +0800)]
蓝牙控制训练修改
hcj [Tue, 23 Apr 2024 02:28:26 +0000 (10:28 +0800)]
http使用post方法
hcj [Tue, 23 Apr 2024 02:27:02 +0000 (10:27 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Mon, 22 Apr 2024 13:29:33 +0000 (21:29 +0800)]
解决编译问题
彭磊 [Mon, 22 Apr 2024 13:12:22 +0000 (13:12 +0000)]
Merge #68 into xts_origin from refs/changes/68/head
Code review from 彭磊
* refs/changes/68/head: (4 commits squashed)
- 解决佩戴模式系统不能休眠的问题
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
- 添加cywee中断模式读取数据（暂时不可用）
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/68
罗正 [Mon, 22 Apr 2024 13:08:01 +0000 (13:08 +0000)]
Merge #67 into xts_origin from refs/changes/67/head
Code review from 罗正
* refs/changes/67/head: (2 commits squashed)
- 增加震动提醒功能
- Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
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/67
penglei [Mon, 22 Apr 2024 13:06:24 +0000 (21:06 +0800)]
添加cywee中断模式读取数据（暂时不可用）
penglei [Mon, 22 Apr 2024 13:00:37 +0000 (21:00 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Mon, 22 Apr 2024 12:48:27 +0000 (20:48 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Mon, 22 Apr 2024 12:48:17 +0000 (20:48 +0800)]
增加震动提醒功能
Caisking [Mon, 22 Apr 2024 11:49:37 +0000 (19:49 +0800)]
修改训练蓝牙数据打印
Caisking [Mon, 22 Apr 2024 11:26:42 +0000 (19:26 +0800)]
修复训练数据文件名@hcj
Caisking [Mon, 22 Apr 2024 10:35:36 +0000 (18:35 +0800)]
优化TrainingModel部分函数，实现训练数据存储
Caisking [Mon, 22 Apr 2024 08:28:19 +0000 (16:28 +0800)]
训练结果增加步数
projects / mirrors / FD230.git / log