luozheng [Mon, 22 Apr 2024 02:09:24 +0000 (10:09 +0800)]
将用户设置系统音量和通话音量保存在ConfigModel中
SnickerSun [Sun, 21 Apr 2024 15:52:37 +0000 (23:52 +0800)]
暂时关闭佩戴检测，解决系统不休眠问题
去除部分不必要的日志
SnickerSun [Sun, 21 Apr 2024 14:29:14 +0000 (22:29 +0800)]
lwip添加tcp tls支持 ，修改AT^DOWNLOADOTA指令尝试支持https下载
Caisking [Sun, 21 Apr 2024 08:43:14 +0000 (16:43 +0800)]
恢复修改
Caisking [Sun, 21 Apr 2024 08:27:25 +0000 (16:27 +0800)]
修复格式化的提交
Caisking [Sun, 21 Apr 2024 08:10:46 +0000 (16:10 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Sun, 21 Apr 2024 08:01:36 +0000 (16:01 +0800)]
修复编译问题
SnickerSun [Sun, 21 Apr 2024 00:40:36 +0000 (08:40 +0800)]
提交智汇视讯的支付宝配置
Caisking [Fri, 19 Apr 2024 13:43:50 +0000 (21:43 +0800)]
修复训练卡片弹窗亮屏
luozheng [Fri, 19 Apr 2024 13:37:40 +0000 (21:37 +0800)]
解决调整声音不起作用问题
Caisking [Fri, 19 Apr 2024 13:13:05 +0000 (21:13 +0800)]
搭建训练强度接口
luozheng [Fri, 19 Apr 2024 13:08:40 +0000 (21:08 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Fri, 19 Apr 2024 12:46:23 +0000 (20:46 +0800)]
添加通话音量和系统音量，并将其声音调整放进线程中
Caisking [Fri, 19 Apr 2024 12:45:42 +0000 (20:45 +0800)]
解决界面析构问题
Caisking [Fri, 19 Apr 2024 12:32:54 +0000 (20:32 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Fri, 19 Apr 2024 12:32:45 +0000 (20:32 +0800)]
删除原训练达到目标弹窗Slice；修复bug
penglei [Fri, 19 Apr 2024 12:20:18 +0000 (20:20 +0800)]
修改开关抬腕亮屏
penglei [Fri, 19 Apr 2024 11:48:22 +0000 (19:48 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Fri, 19 Apr 2024 10:31:08 +0000 (18:31 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Fri, 19 Apr 2024 10:31:04 +0000 (18:31 +0800)]
设置训练目标达标弹窗，测试弹窗功能成功
问题：
设置目标的GetIndex的组件函数没有生效
亮屏函数没有生效
彭磊 [Fri, 19 Apr 2024 10:11:44 +0000 (10:11 +0000)]
Merge #53 into xts_origin from refs/changes/53/head
优化运动切换与静态模式切换，优化动态心率计算，添加抬腕亮屏开关
* refs/changes/53/head: (1 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/53
penglei [Fri, 19 Apr 2024 10:07:41 +0000 (18:07 +0800)]
优化运动切换与静态模式切换，优化动态心率计算，添加抬腕亮屏开关
DXY [Fri, 19 Apr 2024 10:04:05 +0000 (18:04 +0800)]
1.优化支付宝和ble服务之间控制的流程 2.暂时不需要切换广播数据
luozheng [Fri, 19 Apr 2024 09:15:07 +0000 (17:15 +0800)]
将通话音量CALL_VOLUME_MAX从15调整为100
luozheng [Fri, 19 Apr 2024 07:06:03 +0000 (15:06 +0800)]
优化声音与设置视图
hcj [Fri, 19 Apr 2024 03:49:25 +0000 (11:49 +0800)]
蓝牙设置用户数据设置获取步数目标及添加通讯录读取到开关机
hcj [Fri, 19 Apr 2024 03:29:06 +0000 (11:29 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Fri, 19 Apr 2024 02:00:49 +0000 (10:00 +0800)]
优化佩戴模式切换@penglei
Caisking [Fri, 19 Apr 2024 01:54:43 +0000 (09:54 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
DXY [Fri, 19 Apr 2024 01:52:36 +0000 (09:52 +0800)]
打开支付UI控制广播接口
Caisking [Fri, 19 Apr 2024 01:31:22 +0000 (09:31 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Fri, 19 Apr 2024 01:29:16 +0000 (09:29 +0800)]
增加训练控制蓝牙协议接口
SnickerSun [Fri, 19 Apr 2024 01:04:35 +0000 (09:04 +0800)]
1、由于插vbus重启无法检测vbus存在，临时取消关闭充电的步骤。
2、更新邓工的蓝牙相关提交，alipay和bleService共存。
3、启动常亮时间从25秒改为15秒
SnickerSun [Thu, 18 Apr 2024 13:08:26 +0000 (21:08 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
罗正 [Thu, 18 Apr 2024 12:45:56 +0000 (12:45 +0000)]
Merge #46 into xts_origin from refs/changes/46/head
Code review from 罗正
* refs/changes/46/head: (4 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/46
luozheng [Thu, 18 Apr 2024 10:46:23 +0000 (18:46 +0800)]
修改天气视图：解决天气子地区显示错误问题
luozheng [Thu, 18 Apr 2024 10:28:19 +0000 (18:28 +0800)]
修改声音与震动视图
Caisking [Thu, 18 Apr 2024 09:25:04 +0000 (17:25 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Thu, 18 Apr 2024 09:25:00 +0000 (17:25 +0800)]
实现训练目标类型以及训练目标数据传递
luozheng [Thu, 18 Apr 2024 08:44:08 +0000 (16:44 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Thu, 18 Apr 2024 08:43:58 +0000 (16:43 +0800)]
添加抬腕亮屏功能
hcj [Thu, 18 Apr 2024 08:22:45 +0000 (16:22 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Thu, 18 Apr 2024 08:16:50 +0000 (16:16 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
snickersun@163.com [Thu, 18 Apr 2024 08:16:33 +0000 (08:16 +0000)]
Merge #45 into xts_origin from refs/changes/45/head
Code review from snickersun@163.com
* refs/changes/45/head: (4 commits squashed)
- 添加custom_cmd_service task，解决cat1 开机后cat1 Vote 无法消除的问题。
- 修改acc 25Hz 让系统可以休眠
- Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
- 修复ppg与cywee算法冲突问题
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/45
SnickerSun [Thu, 18 Apr 2024 08:15:47 +0000 (16:15 +0800)]
修复ppg与cywee算法冲突问题
Caisking [Thu, 18 Apr 2024 08:01:30 +0000 (16:01 +0800)]
优化目标设置界面交互
Caisking [Thu, 18 Apr 2024 07:50:51 +0000 (15:50 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Thu, 18 Apr 2024 07:50:44 +0000 (15:50 +0800)]
增加设置步数SubView，删除原Slice
penglei [Thu, 18 Apr 2024 07:42:35 +0000 (15:42 +0800)]
添加蓝牙产测通讯录功能
SnickerSun [Thu, 18 Apr 2024 07:39:43 +0000 (15:39 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
snickersun@163.com [Thu, 18 Apr 2024 07:39:21 +0000 (07:39 +0000)]
Merge #43 into xts_origin from refs/changes/43/head
Code review from snickersun@163.com
* refs/changes/43/head: (2 commits squashed)
- 添加custom_cmd_service task，解决cat1 开机后cat1 Vote 无法消除的问题。
- 修改acc 25Hz 让系统可以休眠
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/43
SnickerSun [Thu, 18 Apr 2024 07:37:05 +0000 (15:37 +0800)]
修改acc 25Hz 让系统可以休眠
Caisking [Thu, 18 Apr 2024 07:30:11 +0000 (15:30 +0800)]
增加距离设置SubView，删除原Slice
SnickerSun [Thu, 18 Apr 2024 07:26:39 +0000 (15:26 +0800)]
添加custom_cmd_service task，解决cat1 开机后cat1 Vote 无法消除的问题。
Caisking [Thu, 18 Apr 2024 07:09:12 +0000 (15:09 +0800)]
设置目标界面增加步数以及距离
luozheng [Thu, 18 Apr 2024 07:01:02 +0000 (15:01 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Thu, 18 Apr 2024 07:00:52 +0000 (15:00 +0800)]
1.优化亮度调节的ChangeBrightness函数
2.同步选择的亮屏时长在屏幕与亮度显示
3.修改设置视图的OnDrag函数
Caisking [Thu, 18 Apr 2024 06:41:06 +0000 (14:41 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Thu, 18 Apr 2024 06:41:01 +0000 (14:41 +0800)]
增加设置时长SubView，删除原Slice
Caisking [Thu, 18 Apr 2024 06:13:59 +0000 (14:13 +0800)]
增加设置卡路里SubView，删除原Slice;删除GPS训练Slice
胡传军 [Thu, 18 Apr 2024 04:04:53 +0000 (04:04 +0000)]
Merge #39 into xts_origin from refs/changes/39/head
Code review from 胡传军
* refs/changes/39/head: (6 commits squashed)
- 多包数据发送修改及通讯录AT指令添加修改
- 修改编译错误
- Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
- Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
- Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
- 蓝牙设置语言及关机重启
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/39
penglei [Thu, 18 Apr 2024 03:58:41 +0000 (11:58 +0800)]
优化运动服务接收函数，优化血氧驱动，解决测血氧时容易死机的问题，添加抬腕亮屏与马达震动接口
hcj [Thu, 18 Apr 2024 02:12:03 +0000 (10:12 +0800)]
蓝牙设置语言及关机重启
hcj [Thu, 18 Apr 2024 01:59:10 +0000 (09:59 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
罗正 [Thu, 18 Apr 2024 00:46:22 +0000 (00:46 +0000)]
Merge #38 into xts_origin from refs/changes/38/head
暂时屏蔽进入歌单界面
* refs/changes/38/head: (1 commits squashed)
- 暂时屏蔽进入歌单界面
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/38
luozheng [Wed, 17 Apr 2024 13:32:52 +0000 (21:32 +0800)]
暂时屏蔽进入歌单界面
Caisking [Wed, 17 Apr 2024 13:18:19 +0000 (21:18 +0800)]
消除魔法数，接口改成类
Caisking [Wed, 17 Apr 2024 12:56:06 +0000 (20:56 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Wed, 17 Apr 2024 12:55:58 +0000 (20:55 +0800)]
增加训练接口函数
Caisking [Wed, 17 Apr 2024 12:46:43 +0000 (20:46 +0800)]
省电模式加入applist
luozheng [Wed, 17 Apr 2024 12:45:11 +0000 (20:45 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Wed, 17 Apr 2024 12:45:02 +0000 (20:45 +0800)]
1.更改路径/user/update.fwpkg为"/update/update.fwpkg"
2.关闭build_brandy_update.py 的资源升级
Caisking [Wed, 17 Apr 2024 12:42:14 +0000 (20:42 +0800)]
增加训练目标以及训练目标类型接口
Caisking [Wed, 17 Apr 2024 10:20:26 +0000 (18:20 +0800)]
运动心率增加打印以及有效过滤
Caisking [Wed, 17 Apr 2024 08:50:29 +0000 (16:50 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Wed, 17 Apr 2024 08:43:20 +0000 (16:43 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
penglei [Wed, 17 Apr 2024 08:41:29 +0000 (16:41 +0800)]
优化佩戴模式与非佩戴模式的切换
Caisking [Wed, 17 Apr 2024 08:41:02 +0000 (16:41 +0800)]
删除训练强度介绍Slice
Caisking [Wed, 17 Apr 2024 08:36:32 +0000 (16:36 +0800)]
增加动态心率数据
SnickerSun [Wed, 17 Apr 2024 08:12:31 +0000 (16:12 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
snickersun@163.com [Wed, 17 Apr 2024 08:11:55 +0000 (08:11 +0000)]
Merge #31 into xts_origin from refs/changes/31/head
修复睡眠唤醒lcd背光会被修改的问题
* refs/changes/31/head: (1 commits squashed)
- 修复睡眠唤醒lcd背光会被修改的问题
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/31
袁清梦 [Wed, 17 Apr 2024 08:11:35 +0000 (08:11 +0000)]
Merge #30 into xts_origin from refs/changes/30/head
Code review from 袁清梦
* refs/changes/30/head: (2 commits squashed)
- 优化训练back逻辑
- 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/30
SnickerSun [Wed, 17 Apr 2024 08:08:35 +0000 (16:08 +0800)]
修复睡眠唤醒lcd背光会被修改的问题
Caisking [Wed, 17 Apr 2024 07:51:06 +0000 (15:51 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Wed, 17 Apr 2024 07:48:16 +0000 (15:48 +0800)]
优化训练back逻辑
luozheng [Wed, 17 Apr 2024 07:26:48 +0000 (15:26 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Wed, 17 Apr 2024 07:26:42 +0000 (15:26 +0800)]
1.优化NativeAbility::GetInstance().Back();函数在后退栈为空时退到主界面
2.添加根据ConfigModel开机设置屏幕亮度和亮屏时间函数
hcj [Wed, 17 Apr 2024 06:41:59 +0000 (14:41 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
罗正 [Wed, 17 Apr 2024 06:39:42 +0000 (06:39 +0000)]
Merge #28 into xts_origin from refs/changes/28/head
Code review from 罗正
* refs/changes/28/head: (5 commits squashed)
- 实现导航历史栈功能：
1.当从一个Slice进入另一个Slice时调用NativeAbility::GetInstance().EnterSlice(sliceId)
2.NativeAbility::GetInstance().Back 处理后退操作
3.ChangeSlice不压栈
- 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
- 1.优化亮屏时长视图，增加30，60,300秒时长
2.ConfigModel 增加设置亮屏时长函数
3.优化Ability.h的EnterSlice和Back函数
- 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/28
luozheng [Wed, 17 Apr 2024 04:01:39 +0000 (12:01 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Wed, 17 Apr 2024 04:01:32 +0000 (12:01 +0800)]
1.优化亮屏时长视图，增加30，60,300秒时长
2.ConfigModel 增加设置亮屏时长函数
3.优化Ability.h的EnterSlice和Back函数
Caisking [Wed, 17 Apr 2024 03:32:00 +0000 (11:32 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Wed, 17 Apr 2024 03:28:24 +0000 (11:28 +0800)]
优化下拉界面数据刷新，还需要接口
hcj [Wed, 17 Apr 2024 03:12:48 +0000 (11:12 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
胡传军 [Wed, 17 Apr 2024 03:09:24 +0000 (03:09 +0000)]
Merge #25 into xts_origin from refs/changes/25/head
多包数据发送修改及通讯录AT指令添加修改
* refs/changes/25/head: (2 commits squashed)
- 多包数据发送修改及通讯录AT指令添加修改
- 修改编译错误
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/25
SnickerSun [Wed, 17 Apr 2024 03:03:14 +0000 (11:03 +0800)]
支付宝绑定验证通过
hcj [Wed, 17 Apr 2024 02:46:41 +0000 (10:46 +0800)]
修改编译错误
hcj [Wed, 17 Apr 2024 02:41:12 +0000 (10:41 +0800)]
多包数据发送修改及通讯录AT指令添加修改
SnickerSun [Wed, 17 Apr 2024 02:20:35 +0000 (10:20 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
snickersun@163.com [Wed, 17 Apr 2024 02:20:20 +0000 (02:20 +0000)]
Merge #24 into xts_origin from refs/changes/24/head
修复bleservice 不能开启的问，恢复keepon timeout 比较参数
* refs/changes/24/head: (1 commits squashed)
- 修复bleservice 不能开启的问，恢复keepon timeout 比较参数
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/24
projects / mirrors / FD230.git / log