mirrors/FD230.git
2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 176/1
luozheng [Fri, 17 May 2024 10:18:59 +0000 (18:18 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago增加喝水提醒ui还未对接协议
luozheng [Fri, 17 May 2024 10:18:49 +0000 (18:18 +0800)]
增加喝水提醒ui还未对接协议

2 years ago修改读取通讯录时的异常判断(2) 175/1 175/head 176/target/1
hcj_ [Thu, 16 May 2024 23:57:20 +0000 (07:57 +0800)]
修改读取通讯录时的异常判断(2)

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
hcj_ [Thu, 16 May 2024 23:54:17 +0000 (07:54 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修改读取通讯录时的异常判断
hcj_ [Thu, 16 May 2024 23:53:24 +0000 (07:53 +0800)]
修改读取通讯录时的异常判断

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 168/3 168/head 175/target/1
Caisking [Thu, 16 May 2024 16:49:52 +0000 (00:49 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago通过json数据适配训练记录
Caisking [Thu, 16 May 2024 16:45:24 +0000 (00:45 +0800)]
通过json数据适配训练记录

2 years ago1、优化内存,解决蓝牙和音乐task启动失败问题 168/target/3 174/1 174/head
SnickerSun [Thu, 16 May 2024 16:22:06 +0000 (00:22 +0800)]
1、优化内存,解决蓝牙和音乐task启动失败问题
2、优化getUserInfo 蓝牙协议,解决同步死机问题

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
Caisking [Thu, 16 May 2024 13:15:08 +0000 (21:15 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago重构ble通讯协议接收代码,增加 ota文件接收,实现ota升级能力 173/1 173/head 174/target/1
SnickerSun [Thu, 16 May 2024 12:32:51 +0000 (20:32 +0800)]
重构ble通讯协议接收代码,增加 ota文件接收,实现ota升级能力

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...
SnickerSun [Thu, 16 May 2024 07:29:32 +0000 (15:29 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago补交 172/2 172/head 173/target/1
penglei [Thu, 16 May 2024 06:11:03 +0000 (14:11 +0800)]
补交

2 years ago解决cywee中断不触发的问题 172/1
penglei [Thu, 16 May 2024 03:36:58 +0000 (11:36 +0800)]
解决cywee中断不触发的问题

2 years ago修改部分变量名称,优化打印信息,方便代码分析。
SnickerSun [Wed, 15 May 2024 08:55:57 +0000 (16:55 +0800)]
修改部分变量名称,优化打印信息,方便代码分析。
添加OTA json数据接收和解析。

2 years ago给编译脚本增加固件参数。版本号根据蓝牙协议改为三位major,mid,minor。通过修改autobuild.sh 中DEFAULT_CUSTOM_FW_VERSION... 171/1 171/head 172/target/1
SnickerSun [Tue, 14 May 2024 11:43:48 +0000 (19:43 +0800)]
给编译脚本增加固件参数。版本号根据蓝牙协议改为三位major,mid,minor。通过修改autobuild.sh 中DEFAULT_CUSTOM_FW_VERSION=1.0.0 来改变版本号。

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 168/2
Caisking [Tue, 14 May 2024 10:06:12 +0000 (18:06 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago增加训练json文件读取
Caisking [Tue, 14 May 2024 10:05:54 +0000 (18:05 +0800)]
增加训练json文件读取

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
hcj_ [Tue, 14 May 2024 08:28:07 +0000 (16:28 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 168/target/2 170/1 170/head 171/target/1
DXY [Tue, 14 May 2024 08:02:12 +0000 (16:02 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago优化蓝牙相关协议内存死机问题:还有一个问题需要胡传军看一下这个函数set_user_data会大概率死机
DXY [Tue, 14 May 2024 08:01:35 +0000 (16:01 +0800)]
优化蓝牙相关协议内存死机问题:还有一个问题需要胡传军看一下这个函数set_user_data会大概率死机

2 years ago修改sprintf为sprintf_s 169/1 169/head
hcj_ [Tue, 14 May 2024 07:52:25 +0000 (15:52 +0800)]
修改sprintf为sprintf_s

2 years ago优化sprintf函数 168/1
Caisking [Tue, 14 May 2024 06:47:19 +0000 (14:47 +0800)]
优化sprintf函数

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
hcj_ [Tue, 14 May 2024 06:32:27 +0000 (14:32 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
Caisking [Tue, 14 May 2024 05:28:13 +0000 (13:28 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago开机重置一次充电IC, 尝试确保电压过低系统无法正常完整启动的情况下,可以正常充电。 167/1 167/head 168/target/1 169/target/1 170/target/1
SnickerSun [Tue, 14 May 2024 02:57:51 +0000 (10:57 +0800)]
开机重置一次充电IC, 尝试确保电压过低系统无法正常完整启动的情况下,可以正常充电。

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 166/1 166/head 167/target/1
SnickerSun [Tue, 14 May 2024 01:33:10 +0000 (09:33 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago更新lcd驱动,修复蜂窝显示切屏问题
SnickerSun [Mon, 13 May 2024 08:31:44 +0000 (16:31 +0800)]
更新lcd驱动,修复蜂窝显示切屏问题

2 years ago恢复出厂设置中补充蓝牙连接的处理
SnickerSun [Mon, 13 May 2024 03:02:17 +0000 (11:02 +0800)]
恢复出厂设置中补充蓝牙连接的处理

2 years ago修复ble死机问题:修改蓝牙名称大写显示
DXY [Mon, 13 May 2024 12:32:54 +0000 (20:32 +0800)]
修复ble死机问题:修改蓝牙名称大写显示

2 years ago增加手表二维码slice 165/1 165/head 166/target/1
luozheng [Mon, 13 May 2024 10:19:03 +0000 (18:19 +0800)]
增加手表二维码slice

2 years agodebug 1 164/target/1
DXY [Sat, 11 May 2024 11:43:30 +0000 (19:43 +0800)]
debug 1

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...
DXY [Sat, 11 May 2024 09:47:00 +0000 (17:47 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...
DXY [Sat, 11 May 2024 09:46:51 +0000 (17:46 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 163/2 163/head 165/target/1
SnickerSun [Sat, 11 May 2024 07:43:38 +0000 (15:43 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #162 into xts_origin from refs/changes/162/head 163/target/2
彭磊 [Sat, 11 May 2024 07:41:29 +0000 (07:41 +0000)]
Merge #162 into xts_origin from refs/changes/162/head

修改gsensor为定时器模式,优化cywee运动模式与静态模式消息发送

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

  - 修改gsensor为定时器模式,优化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/162
2 years agoMerge #161 into xts_origin from refs/changes/161/head
袁清梦 [Sat, 11 May 2024 07:40:29 +0000 (07:40 +0000)]
Merge #161 into xts_origin from refs/changes/161/head

增加训练记录json服务

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

  - 增加训练记录json服务

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/161
2 years agoMerge #159 into xts_origin from refs/changes/159/head
胡传军 [Sat, 11 May 2024 07:39:51 +0000 (07:39 +0000)]
Merge #159 into xts_origin from refs/changes/159/head

Code review from 胡传军

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

  - 喝水及睡眠协议对接

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

  - 合并冲突

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

  - ota升级

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

  - ota升级

  - 重构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/159
2 years ago修改message queue 只有创建queue后才能wirte进去,解决 gsensor 和 cat1 中断 造成的系统不休眠问题。(特定中断开机会执行queue错误... 163/1
SnickerSun [Sat, 11 May 2024 07:19:08 +0000 (15:19 +0800)]
修改message queue 只有创建queue后才能wirte进去,解决 gsensor 和 cat1 中断 造成的系统不休眠问题。(特定中断开机会执行queue错误写入,从而造成nvwritetask 无线循环)

2 years ago上传gif图片图片 160/1 160/head
luozheng [Fri, 10 May 2024 12:10:32 +0000 (20:10 +0800)]
上传gif图片图片

2 years ago优化蓝牙数据接收:更改蓝牙名称为WatchSoar
DXY [Fri, 10 May 2024 09:51:33 +0000 (17:51 +0800)]
优化蓝牙数据接收:更改蓝牙名称为WatchSoar

2 years ago重构OTA升级 159/2 159/head
hcj_ [Fri, 10 May 2024 09:31:22 +0000 (17:31 +0800)]
重构OTA升级

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
luozheng [Fri, 10 May 2024 09:13:22 +0000 (17:13 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修改传统蓝牙,查找手机,勿扰模式适配多国语言,需要重新下载字体资源
luozheng [Fri, 10 May 2024 09:06:24 +0000 (17:06 +0800)]
修改传统蓝牙,查找手机,勿扰模式适配多国语言,需要重新下载字体资源

2 years agoota升级 159/1
hcj_ [Fri, 10 May 2024 06:45:33 +0000 (14:45 +0800)]
ota升级

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
hcj_ [Fri, 10 May 2024 06:44:31 +0000 (14:44 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoota升级
hcj_ [Fri, 10 May 2024 06:44:10 +0000 (14:44 +0800)]
ota升级

2 years ago优化蓝牙产测,解决cywee I2C异常问题,完善运动模式功能。 158/1 158/head 159/target/1 160/target/1 161/target/1 162/target/1 163/target/1
penglei [Fri, 10 May 2024 04:29:48 +0000 (12:29 +0800)]
优化蓝牙产测,解决cywee I2C异常问题,完善运动模式功能。

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
penglei [Fri, 10 May 2024 04:18:43 +0000 (12:18 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 157/1 157/head 158/target/1
SnickerSun [Fri, 10 May 2024 04:07:08 +0000 (12:07 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago经典蓝牙状态同步,修复a2dp snk 不能工作等问题。
SnickerSun [Fri, 10 May 2024 04:07:00 +0000 (12:07 +0800)]
经典蓝牙状态同步,修复a2dp snk 不能工作等问题。

2 years agoMerge #156 into xts_origin from refs/changes/156/head 157/target/1
罗正 [Fri, 10 May 2024 04:04:36 +0000 (04:04 +0000)]
Merge #156 into xts_origin from refs/changes/156/head

Code review from 罗正

* refs/changes/156/head: (4 commits squashed)

  - 优化下拉界面的数据更新逻辑
    如果当前是下拉界面,先更新一次下拉窗口的数据包括,电池电量时间,信号强度等等数据,然后开启一个每2秒更新数据的定时器。
    如果不在下拉界面了停止定时器。
    遗留一个问题:如果在下拉界面息屏时候停止了定时器,亮屏后需要手动上拉界面再下拉回到下拉界面才能更新数据。

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

  - 1.优化天气显示主界面和applist已经同步显示
    遗留问题,手机app同步天气数据时候如果当前界面再天气界面,需要先退出界面在进入才能刷新数据。
    2.多国语言包更新需要重新下载资源

  - Merge branch &#39;xts_origin&#39; 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/156
2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
penglei [Fri, 10 May 2024 04:01:15 +0000 (12:01 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago打包文件统一管理生成ui头文件 155/2 155/head
Caisking [Fri, 10 May 2024 03:56:28 +0000 (11:56 +0800)]
打包文件统一管理生成ui头文件

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 156/1 156/head
luozheng [Fri, 10 May 2024 03:40:33 +0000 (11:40 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago1.优化天气显示主界面和applist已经同步显示
luozheng [Fri, 10 May 2024 03:40:27 +0000 (11:40 +0800)]
1.优化天气显示主界面和applist已经同步显示
遗留问题,手机app同步天气数据时候如果当前界面再天气界面,需要先退出界面在进入才能刷新数据。
2.多国语言包更新需要重新下载资源

2 years agoUI同步省电模式接口
Caisking [Fri, 10 May 2024 03:00:38 +0000 (11:00 +0800)]
UI同步省电模式接口

2 years ago建立统一的UI组件工具;【uicomponents/Uicomponents.h】
Caisking [Fri, 10 May 2024 02:44:34 +0000 (10:44 +0800)]
建立统一的UI组件工具;【uicomponents/Uicomponents.h】

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
Caisking [Thu, 9 May 2024 11:57:00 +0000 (19:57 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 155/1
Caisking [Thu, 9 May 2024 10:26:55 +0000 (18:26 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago遥控拍照资源[user/res/takephotos/]
Caisking [Thu, 9 May 2024 10:26:51 +0000 (18:26 +0800)]
遥控拍照资源[user/res/takephotos/]

2 years ago主界面Presenter增加内存函数接口
Caisking [Thu, 9 May 2024 10:26:15 +0000 (18:26 +0800)]
主界面Presenter增加内存函数接口

2 years ago优化多国语言变量字符串更新
Caisking [Thu, 9 May 2024 10:25:45 +0000 (18:25 +0800)]
优化多国语言变量字符串更新

2 years ago同步遥控拍照协议
Caisking [Thu, 9 May 2024 10:25:10 +0000 (18:25 +0800)]
同步遥控拍照协议

2 years ago1、runtime增加蓝牙各种状态,目前已经实现手机连接,耳机和经典蓝牙状态同步未完成。另pullupdownview还未正常更新 154/1 154/head 155/target/1 156/target/1
SnickerSun [Thu, 9 May 2024 09:36:17 +0000 (17:36 +0800)]
1、runtime增加蓝牙各种状态,目前已经实现手机连接,耳机和经典蓝牙状态同步未完成。另pullupdownview还未正常更新
2、修改USE_CAT1_SLEEP_TIMER宏的有用法

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
Caisking [Thu, 9 May 2024 08:03:14 +0000 (16:03 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修改训练存储以及读取
Caisking [Thu, 9 May 2024 08:03:11 +0000 (16:03 +0800)]
修改训练存储以及读取

2 years agoMerge #153 into xts_origin from refs/changes/153/head 154/target/1
罗正 [Thu, 9 May 2024 07:58:50 +0000 (07:58 +0000)]
Merge #153 into xts_origin from refs/changes/153/head

Code review from 罗正

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

  - 优化下拉界面的数据更新逻辑
    如果当前是下拉界面,先更新一次下拉窗口的数据包括,电池电量时间,信号强度等等数据,然后开启一个每2秒更新数据的定时器。
    如果不在下拉界面了停止定时器。
    遗留一个问题:如果在下拉界面息屏时候停止了定时器,亮屏后需要手动上拉界面再下拉回到下拉界面才能更新数据。

  - Merge branch &#39;xts_origin&#39; 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/153
2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 153/1 153/head
luozheng [Thu, 9 May 2024 03:29:56 +0000 (11:29 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago优化下拉界面的数据更新逻辑
luozheng [Thu, 9 May 2024 03:29:51 +0000 (11:29 +0800)]
优化下拉界面的数据更新逻辑
如果当前是下拉界面,先更新一次下拉窗口的数据包括,电池电量时间,信号强度等等数据,然后开启一个每2秒更新数据的定时器。
如果不在下拉界面了停止定时器。
遗留一个问题:如果在下拉界面息屏时候停止了定时器,亮屏后需要手动上拉界面再下拉回到下拉界面才能更新数据。

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 152/1 152/head
DXY [Thu, 9 May 2024 01:24:59 +0000 (09:24 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
penglei [Thu, 9 May 2024 01:15:46 +0000 (09:15 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
hcj_ [Wed, 8 May 2024 15:12:43 +0000 (23:12 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoGSensor恢复中断为DEDGE双边触发,修复无法休眠问题 151/1 151/head 152/target/1 153/target/1
SnickerSun [Wed, 8 May 2024 15:11:39 +0000 (23:11 +0800)]
GSensor恢复中断为DEDGE双边触发,修复无法休眠问题

2 years ago合并冲突
hcj_ [Wed, 8 May 2024 14:57:49 +0000 (22:57 +0800)]
合并冲突

2 years ago修正 ConfigModel默认设置,保证每个enum都配对设置默认值。 150/1 150/head 151/target/1
SnickerSun [Wed, 8 May 2024 13:37:43 +0000 (21:37 +0800)]
修正 ConfigModel默认设置,保证每个enum都配对设置默认值。

2 years ago修复cat1默认关闭时,开机状态不正确问题。
SnickerSun [Wed, 8 May 2024 13:36:55 +0000 (21:36 +0800)]
修复cat1默认关闭时,开机状态不正确问题。
优化cat1休眠投票处理机制

2 years ago优化OTA下载流程,先关闭文件再执行callback,加快下载响应速度。
SnickerSun [Wed, 8 May 2024 13:35:08 +0000 (21:35 +0800)]
优化OTA下载流程,先关闭文件再执行callback,加快下载响应速度。

2 years agoMerge #148 into xts_origin from refs/changes/148/head 150/target/1
邓雪英 [Wed, 8 May 2024 12:43:03 +0000 (12:43 +0000)]
Merge #148 into xts_origin from refs/changes/148/head

Code review from 邓雪英

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

  - 快捷辅助功能参数协议对接完成:修复协议下发声音与振动UI不更新问题:修改亮度调节实时更新协议:优化安卓ancs存储问题:增加拍照topic

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

Signed-off-by: d15521469561 <1731678236@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/148
2 years agoMerge #149 into xts_origin from refs/changes/149/head
彭磊 [Wed, 8 May 2024 12:28:11 +0000 (12:28 +0000)]
Merge #149 into xts_origin from refs/changes/149/head

优化产测代码,添加alipay测试,优化睡眠模式

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

  - 优化产测代码,添加alipay测试,优化睡眠模式

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/149
2 years ago优化产测代码,添加alipay测试,优化睡眠模式 149/1 149/head
penglei [Wed, 8 May 2024 12:20:09 +0000 (20:20 +0800)]
优化产测代码,添加alipay测试,优化睡眠模式

2 years ago修改多国语言多一个相同id名称问题 147/2 147/head
luozheng [Wed, 8 May 2024 12:19:41 +0000 (20:19 +0800)]
修改多国语言多一个相同id名称问题

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 148/1 148/head
DXY [Wed, 8 May 2024 11:12:10 +0000 (19:12 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago快捷辅助功能参数协议对接完成:修复协议下发声音与振动UI不更新问题:修改亮度调节实时更新协议:优化安卓ancs存储问题:增加拍照topic
DXY [Wed, 8 May 2024 11:08:07 +0000 (19:08 +0800)]
快捷辅助功能参数协议对接完成:修复协议下发声音与振动UI不更新问题:修改亮度调节实时更新协议:优化安卓ancs存储问题:增加拍照topic

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 147/1
luozheng [Wed, 8 May 2024 10:29:51 +0000 (18:29 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修改连接状态视图适配多国语言
luozheng [Wed, 8 May 2024 10:24:35 +0000 (18:24 +0800)]
修改连接状态视图适配多国语言

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 146/1 146/head 147/target/1 148/target/1 149/target/1
Caisking [Wed, 8 May 2024 10:17:28 +0000 (18:17 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago增加遥控拍照Slice(还需要同步UI)
Caisking [Wed, 8 May 2024 10:17:16 +0000 (18:17 +0800)]
增加遥控拍照Slice(还需要同步UI)

2 years ago修复训练stw_task死机
Caisking [Wed, 8 May 2024 10:00:45 +0000 (18:00 +0800)]
修复训练stw_task死机

2 years ago修复cat1 server,5秒获取一次信号强度就无法休眠的问题 145/1 145/head 146/target/1
SnickerSun [Wed, 8 May 2024 09:13:48 +0000 (17:13 +0800)]
修复cat1 server,5秒获取一次信号强度就无法休眠的问题

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
Caisking [Wed, 8 May 2024 09:12:10 +0000 (17:12 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #144 into xts_origin from refs/changes/144/head 145/target/1
罗正 [Wed, 8 May 2024 09:11:53 +0000 (09:11 +0000)]
Merge #144 into xts_origin from refs/changes/144/head

采用定时器更新下拉控制视图的状态显示,包括时间,电池,信号强度

* refs/changes/144/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/144
2 years agoMerge #143 into xts_origin from refs/changes/143/head
袁清梦 [Wed, 8 May 2024 09:11:43 +0000 (09:11 +0000)]
Merge #143 into xts_origin from refs/changes/143/head

Code review from 袁清梦

* refs/changes/143/head: (21 commits squashed)

  - 替换结构体成员变量

  - 更新多国语言xml以及font文件

  - 更新训练Slice的多国语言配置

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

  - 优化设置训练频率

  - 适配心率Slice多国语言

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

  - 多国语言支持变量适配(updateLabel)

  - 增加佩戴状态下的无效数控制

  - 更新字体文件

  - 优化心率血氧time的更新显示逻辑

  - 适配血氧Slice多国语言

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

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

  - 适配信息通知Slice多国语言

  - 适配训练记录Slice多国语言

  - 增加label适配多国语言函数

  - 删除部分打印

  - 增加训练记录列表

  - 训练记录同步make

  - Merge branch &#39;xts_origin&#39; 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/143
2 years agoMerge #142 into xts_origin from refs/changes/142/head
胡传军 [Wed, 8 May 2024 09:11:32 +0000 (09:11 +0000)]
Merge #142 into xts_origin from refs/changes/142/head

喝水及睡眠协议对接

* refs/changes/142/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/142
2 years ago采用定时器更新下拉控制视图的状态显示,包括时间,电池,信号强度 144/1 144/head
luozheng [Wed, 8 May 2024 08:35:07 +0000 (16:35 +0800)]
采用定时器更新下拉控制视图的状态显示,包括时间,电池,信号强度

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 143/1 143/head
Caisking [Wed, 8 May 2024 07:59:16 +0000 (15:59 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago训练记录同步make
Caisking [Wed, 8 May 2024 07:32:39 +0000 (15:32 +0800)]
训练记录同步make

2 years ago增加训练记录列表
Caisking [Wed, 8 May 2024 07:30:15 +0000 (15:30 +0800)]
增加训练记录列表

2 years ago删除部分打印
Caisking [Wed, 8 May 2024 07:29:54 +0000 (15:29 +0800)]
删除部分打印

2 years ago增加label适配多国语言函数
Caisking [Wed, 8 May 2024 07:28:27 +0000 (15:28 +0800)]
增加label适配多国语言函数

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
hcj_ [Wed, 8 May 2024 05:20:55 +0000 (13:20 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin