mirrors/FD230.git
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 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

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

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

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... 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 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 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修正 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修改多国语言多一个相同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... 140/2 140/head 143/target/1 144/target/1
luozheng [Wed, 8 May 2024 02:55:29 +0000 (10:55 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #139 into xts_origin from refs/changes/139/head 140/target/2
袁清梦 [Wed, 8 May 2024 02:35:04 +0000 (02:35 +0000)]
Merge #139 into xts_origin from refs/changes/139/head

Code review from 袁清梦

* refs/changes/139/head: (16 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多国语言

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/139
2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
luozheng [Wed, 8 May 2024 01:07:32 +0000 (09:07 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修复cat1时间同步错误。 141/1 141/head 142/target/1
SnickerSun [Tue, 7 May 2024 14:58:45 +0000 (22:58 +0800)]
修复cat1时间同步错误。
优化httpclient 下载

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 140/1
luozheng [Tue, 7 May 2024 12:13:34 +0000 (20:13 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago增加系统更新icon显示
luozheng [Tue, 7 May 2024 12:13:03 +0000 (20:13 +0800)]
增加系统更新icon显示

2 years ago适配训练记录Slice多国语言 139/1 139/head
Caisking [Tue, 7 May 2024 11:20:42 +0000 (19:20 +0800)]
适配训练记录Slice多国语言

2 years ago适配信息通知Slice多国语言
Caisking [Tue, 7 May 2024 11:20:28 +0000 (19:20 +0800)]
适配信息通知Slice多国语言

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
Caisking [Tue, 7 May 2024 11:16:23 +0000 (19:16 +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, 7 May 2024 11:13:11 +0000 (19:13 +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... 138/1 138/head 139/target/1 140/target/1 141/target/1
SnickerSun [Tue, 7 May 2024 11:11:48 +0000 (19:11 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #137 into xts_origin from refs/changes/137/head 138/target/1
snickersun@163.com [Tue, 7 May 2024 11:11:32 +0000 (11:11 +0000)]
Merge #137 into xts_origin from refs/changes/137/head

更改升级服务器为 snicker.com.cn,去掉cat1里过多的日志,优化lwip参数

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

  - 更改升级服务器为 snicker.com.cn,去掉cat1里过多的日志,优化lwip参数

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/137
2 years ago适配血氧Slice多国语言
Caisking [Tue, 7 May 2024 11:10:39 +0000 (19:10 +0800)]
适配血氧Slice多国语言

2 years ago优化心率血氧time的更新显示逻辑
Caisking [Tue, 7 May 2024 11:10:11 +0000 (19:10 +0800)]
优化心率血氧time的更新显示逻辑

2 years ago更改升级服务器为 snicker.com.cn,去掉cat1里过多的日志,优化lwip参数 137/1 137/head
SnickerSun [Tue, 7 May 2024 11:08:22 +0000 (19:08 +0800)]
更改升级服务器为 snicker.com.cn,去掉cat1里过多的日志,优化lwip参数

2 years ago更新字体文件
Caisking [Tue, 7 May 2024 11:01:07 +0000 (19:01 +0800)]
更新字体文件

2 years ago增加佩戴状态下的无效数控制
Caisking [Tue, 7 May 2024 10:45:09 +0000 (18:45 +0800)]
增加佩戴状态下的无效数控制

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 136/1 136/head
DXY [Tue, 7 May 2024 09:31:12 +0000 (17:31 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago解绑 绑定界面加名字显示: 修复解绑界面死机问题:补充用户数据协议增加字段
DXY [Tue, 7 May 2024 09:31:07 +0000 (17:31 +0800)]
解绑 绑定界面加名字显示: 修复解绑界面死机问题:补充用户数据协议增加字段

2 years ago多国语言支持变量适配(updateLabel)
Caisking [Tue, 7 May 2024 09:27:40 +0000 (17:27 +0800)]
多国语言支持变量适配(updateLabel)

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

2 years ago添加系统更新Slice
luozheng [Tue, 7 May 2024 09:23:43 +0000 (17:23 +0800)]
添加系统更新Slice

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

2 years ago适配心率Slice多国语言
Caisking [Tue, 7 May 2024 08:58:10 +0000 (16:58 +0800)]
适配心率Slice多国语言

2 years ago优化设置训练频率
Caisking [Tue, 7 May 2024 08:23:23 +0000 (16:23 +0800)]
优化设置训练频率

2 years ago修改系统升级bug 135/1 135/head 136/target/1 137/target/1
hcj_ [Tue, 7 May 2024 07:14:05 +0000 (15:14 +0800)]
修改系统升级bug

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
Caisking [Tue, 7 May 2024 06:28:52 +0000 (14:28 +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... 134/1 134/head 135/target/1
luozheng [Tue, 7 May 2024 02:56:41 +0000 (10:56 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修改恢复出厂设置视图适配多国语言
luozheng [Tue, 7 May 2024 02:50:16 +0000 (10:50 +0800)]
修改恢复出厂设置视图适配多国语言

2 years ago优化ota升级界面,保证下载时cat1不休眠,且随时可以退出界面。 133/1 133/head 134/target/1
SnickerSun [Tue, 7 May 2024 02:20:14 +0000 (10:20 +0800)]
优化ota升级界面,保证下载时cat1不休眠,且随时可以退出界面。
优化http_client,支持下载文件进度提醒。
修复at下载指令。

2 years ago开启Cat1后5秒更新一次信号状态
SnickerSun [Tue, 7 May 2024 02:11:21 +0000 (10:11 +0800)]
开启Cat1后5秒更新一次信号状态
升级py脚本V6支持连接网络种类反馈
添加cat1持续唤醒接口,保证下载时的速度

2 years ago修改sjon_delete导致的死机 132/1 132/head 133/target/1
hcj_ [Mon, 6 May 2024 13:02:52 +0000 (21:02 +0800)]
修改sjon_delete导致的死机

2 years ago修改系统视图删除不必要的图片和代码,解决内存泄漏问题
luozheng [Mon, 6 May 2024 12:44:58 +0000 (20:44 +0800)]
修改系统视图删除不必要的图片和代码,解决内存泄漏问题

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 131/1 131/head 132/target/1
SnickerSun [Mon, 6 May 2024 11:24:09 +0000 (19:24 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #130 into xts_origin from refs/changes/130/head 131/target/1
snickersun@163.com [Mon, 6 May 2024 11:24:03 +0000 (11:24 +0000)]
Merge #130 into xts_origin from refs/changes/130/head

优化ota制作脚本,制作ota包时可自动添加附加资源文件。

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

  - 优化ota制作脚本,制作ota包时可自动添加附加资源文件。

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/130
2 years ago优化ota制作脚本,制作ota包时可自动添加附加资源文件。 130/1 130/head
SnickerSun [Mon, 6 May 2024 11:21:53 +0000 (19:21 +0800)]
优化ota制作脚本,制作ota包时可自动添加附加资源文件。

2 years ago更新训练Slice的多国语言配置
Caisking [Mon, 6 May 2024 10:14:19 +0000 (18:14 +0800)]
更新训练Slice的多国语言配置

2 years ago更新多国语言xml以及font文件
Caisking [Mon, 6 May 2024 10:13:53 +0000 (18:13 +0800)]
更新多国语言xml以及font文件

2 years ago修改运动识别Slice并适配多国语言
luozheng [Mon, 6 May 2024 09:57:39 +0000 (17:57 +0800)]
修改运动识别Slice并适配多国语言

2 years ago修改applist以适配多国语言
luozheng [Mon, 6 May 2024 09:39:38 +0000 (17:39 +0800)]
修改applist以适配多国语言

2 years ago修改训练数据读取bug 129/1 129/head
hcj_ [Mon, 6 May 2024 09:25:51 +0000 (17:25 +0800)]
修改训练数据读取bug

2 years ago合并
hcj_ [Mon, 6 May 2024 08:18:01 +0000 (16:18 +0800)]
合并

2 years agoMerge #128 into xts_origin from refs/changes/128/head 129/target/1 130/target/1
袁清梦 [Mon, 6 May 2024 08:09:35 +0000 (08:09 +0000)]
Merge #128 into xts_origin from refs/changes/128/head

替换结构体成员变量

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

  - 替换结构体成员变量

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/128
2 years ago替换结构体成员变量 128/1 128/head
Caisking [Mon, 6 May 2024 08:08:44 +0000 (16:08 +0800)]
替换结构体成员变量

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 127/1 127/head
DXY [Mon, 6 May 2024 07:49:34 +0000 (15:49 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago获取其他目标协议和UI对接已完成
DXY [Mon, 6 May 2024 07:48:56 +0000 (15:48 +0800)]
获取其他目标协议和UI对接已完成

2 years ago 修改声音与震动Slice以适配多国语言
luozheng [Mon, 6 May 2024 07:48:08 +0000 (15:48 +0800)]
 修改声音与震动Slice以适配多国语言

2 years ago修改蓝牙Slice以适配多国语言
luozheng [Mon, 6 May 2024 07:09:31 +0000 (15:09 +0800)]
修改蓝牙Slice以适配多国语言

2 years agoMerge #126 into xts_origin from refs/changes/126/head 127/target/1 128/target/1
胡传军 [Mon, 6 May 2024 06:55:24 +0000 (06:55 +0000)]
Merge #126 into xts_origin from refs/changes/126/head

Code review from 胡传军

* refs/changes/126/head: (6 commits squashed)

  - 将strtok改为strtok_r

  - 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

  - Merge branch &#39;xts_origin&#39; of https://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/126
2 years ago增加蓝牙设置闹钟和获取闹钟 126/1 126/head
hcj_ [Mon, 6 May 2024 06:51:34 +0000 (14:51 +0800)]
增加蓝牙设置闹钟和获取闹钟

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

2 years ago修改网络与通话Slice适配多国语言
luozheng [Mon, 6 May 2024 03:48:53 +0000 (11:48 +0800)]
修改网络与通话Slice适配多国语言

2 years ago屏幕与亮度适配多国语言
luozheng [Mon, 6 May 2024 03:24:41 +0000 (11:24 +0800)]
屏幕与亮度适配多国语言

2 years ago修复表盘时间更新 124/1 124/head
Caisking [Mon, 6 May 2024 02:57:22 +0000 (10:57 +0800)]
修复表盘时间更新

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...
DXY [Mon, 6 May 2024 02:47:06 +0000 (10:47 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #123 into xts_origin from refs/changes/123/head 124/target/1 126/target/1
邓雪英 [Mon, 6 May 2024 02:25:58 +0000 (02:25 +0000)]
Merge #123 into xts_origin from refs/changes/123/head

Code review from 邓雪英

* refs/changes/123/head: (6 commits squashed)

  -  解析协议相关内容

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

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

  - 查找手表弹窗对接协议已完成:声音与振动ui对接已完成 屏幕参数已完成

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

  - 还原文件修改bug

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/123
2 years ago还原文件修改bug 123/2 123/head
DXY [Mon, 6 May 2024 02:12:06 +0000 (10:12 +0800)]
还原文件修改bug

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 123/1
DXY [Mon, 6 May 2024 02:02:30 +0000 (10:02 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago查找手表弹窗对接协议已完成:声音与振动ui对接已完成 屏幕参数已完成
DXY [Mon, 6 May 2024 01:45:29 +0000 (09:45 +0800)]
查找手表弹窗对接协议已完成:声音与振动ui对接已完成 屏幕参数已完成

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 122/1 122/head
Caisking [Mon, 6 May 2024 01:17:21 +0000 (09:17 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修复解绑bug
Caisking [Mon, 6 May 2024 01:17:06 +0000 (09:17 +0800)]
修复解绑bug