mirrors/FD230.git
2 years ago增加距离设置SubView,删除原Slice 42/1
Caisking [Thu, 18 Apr 2024 07:30:11 +0000 (15:30 +0800)]
增加距离设置SubView,删除原Slice

2 years ago设置目标界面增加步数以及距离
Caisking [Thu, 18 Apr 2024 07:09:12 +0000 (15:09 +0800)]
设置目标界面增加步数以及距离

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
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

2 years ago增加设置时长SubView,删除原Slice
Caisking [Thu, 18 Apr 2024 06:41:01 +0000 (14:41 +0800)]
增加设置时长SubView,删除原Slice

2 years ago增加设置卡路里SubView,删除原Slice;删除GPS训练Slice
Caisking [Thu, 18 Apr 2024 06:13:59 +0000 (14:13 +0800)]
增加设置卡路里SubView,删除原Slice;删除GPS训练Slice

2 years agoMerge #39 into xts_origin from refs/changes/39/head 41/target/1 42/target/1 43/target/1
胡传军 [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
2 years ago优化运动服务接收函数,优化血氧驱动,解决测血氧时容易死机的问题,添加抬腕亮屏与马达震动接口 40/1 40/head
penglei [Thu, 18 Apr 2024 03:58:41 +0000 (11:58 +0800)]
优化运动服务接收函数,优化血氧驱动,解决测血氧时容易死机的问题,添加抬腕亮屏与马达震动接口

2 years agoMerge #38 into xts_origin from refs/changes/38/head 39/target/1 40/target/1
罗正 [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
2 years ago消除魔法数,接口改成类 37/2 37/head
Caisking [Wed, 17 Apr 2024 13:18:19 +0000 (21:18 +0800)]
消除魔法数,接口改成类

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 37/1
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

2 years ago增加训练接口函数
Caisking [Wed, 17 Apr 2024 12:55:58 +0000 (20:55 +0800)]
增加训练接口函数

2 years ago省电模式加入applist
Caisking [Wed, 17 Apr 2024 12:46:43 +0000 (20:46 +0800)]
省电模式加入applist

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 36/1 36/head 37/target/1 38/target/1
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

2 years ago1.更改路径/user/update.fwpkg为"/update/update.fwpkg"
luozheng [Wed, 17 Apr 2024 12:45:02 +0000 (20:45 +0800)]
1.更改路径/user/update.fwpkg为"/update/update.fwpkg"
2.关闭build_brandy_update.py 的资源升级

2 years ago增加训练目标以及训练目标类型接口
Caisking [Wed, 17 Apr 2024 12:42:14 +0000 (20:42 +0800)]
增加训练目标以及训练目标类型接口

2 years ago运动心率增加打印以及有效过滤 35/1 35/head 36/target/1
Caisking [Wed, 17 Apr 2024 10:20:26 +0000 (18:20 +0800)]
运动心率增加打印以及有效过滤

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 34/2 34/head 35/target/1
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

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 34/1
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

2 years ago优化佩戴模式与非佩戴模式的切换 33/1 33/head 34/target/2
penglei [Wed, 17 Apr 2024 08:41:29 +0000 (16:41 +0800)]
优化佩戴模式与非佩戴模式的切换

2 years ago删除训练强度介绍Slice
Caisking [Wed, 17 Apr 2024 08:41:02 +0000 (16:41 +0800)]
删除训练强度介绍Slice

2 years ago增加动态心率数据
Caisking [Wed, 17 Apr 2024 08:36:32 +0000 (16:36 +0800)]
增加动态心率数据

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 32/1 32/head 33/target/1 34/target/1
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

2 years agoMerge #31 into xts_origin from refs/changes/31/head 32/target/1
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
2 years agoMerge #30 into xts_origin from refs/changes/30/head
袁清梦 [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 &#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/30
2 years ago修复睡眠唤醒lcd背光会被修改的问题 31/1 31/head
SnickerSun [Wed, 17 Apr 2024 08:08:35 +0000 (16:08 +0800)]
修复睡眠唤醒lcd背光会被修改的问题

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 30/1 30/head
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

2 years ago优化训练back逻辑
Caisking [Wed, 17 Apr 2024 07:48:16 +0000 (15:48 +0800)]
优化训练back逻辑

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 29/1 29/head
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

2 years ago1.优化NativeAbility::GetInstance().Back();函数在后退栈为空时退到主界面
luozheng [Wed, 17 Apr 2024 07:26:42 +0000 (15:26 +0800)]
1.优化NativeAbility::GetInstance().Back();函数在后退栈为空时退到主界面
2.添加根据ConfigModel开机设置屏幕亮度和亮屏时间函数

2 years agoMerge #28 into xts_origin from refs/changes/28/head 29/target/1 30/target/1 31/target/1
罗正 [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 &#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

  - 1.优化亮屏时长视图,增加30,60,300秒时长
    2.ConfigModel 增加设置亮屏时长函数
    3.优化Ability.h的EnterSlice和Back函数

  - 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/28
2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 28/1 28/head
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

2 years ago1.优化亮屏时长视图,增加30,60,300秒时长
luozheng [Wed, 17 Apr 2024 04:01:32 +0000 (12:01 +0800)]
1.优化亮屏时长视图,增加30,60,300秒时长
2.ConfigModel 增加设置亮屏时长函数
3.优化Ability.h的EnterSlice和Back函数

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 27/1 27/head
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

2 years ago优化下拉界面数据刷新,还需要接口
Caisking [Wed, 17 Apr 2024 03:28:24 +0000 (11:28 +0800)]
优化下拉界面数据刷新,还需要接口

2 years agoMerge #25 into xts_origin from refs/changes/25/head 27/target/1 28/target/1
胡传军 [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
2 years ago支付宝绑定验证通过 26/1 26/head
SnickerSun [Wed, 17 Apr 2024 03:03:14 +0000 (11:03 +0800)]
支付宝绑定验证通过

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...
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

2 years agoMerge #24 into xts_origin from refs/changes/24/head 25/target/1 26/target/1
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
2 years ago修复bleservice 不能开启的问,恢复keepon timeout 比较参数 24/1 24/head
SnickerSun [Wed, 17 Apr 2024 02:19:13 +0000 (10:19 +0800)]
修复bleservice 不能开启的问,恢复keepon timeout 比较参数

2 years ago优化ui产测入口 23/1 23/head
hcj [Wed, 17 Apr 2024 01:42:18 +0000 (09:42 +0800)]
优化ui产测入口

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
luozheng [Wed, 17 Apr 2024 01:32:03 +0000 (09:32 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago优化蓝牙bleservice和alipay service之间切换逻辑、支付宝启动屏幕常亮 22/1 22/head 23/target/1 24/target/1
SnickerSun [Wed, 17 Apr 2024 01:30:02 +0000 (09:30 +0800)]
优化蓝牙bleservice和alipay service之间切换逻辑、支付宝启动屏幕常亮

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

2 years ago修复屏幕常亮函数无效问题 21/1 21/head 22/target/1
SnickerSun [Wed, 17 Apr 2024 01:24:03 +0000 (09:24 +0800)]
修复屏幕常亮函数无效问题
添加Calander,关机记录时间。

2 years ago修复编译问题 20/1 20/head 21/target/1
SnickerSun [Wed, 17 Apr 2024 00:29:38 +0000 (08:29 +0800)]
修复编译问题

2 years agoMerge #17 into xts_origin from refs/changes/17/head 20/target/1
袁清梦 [Tue, 16 Apr 2024 13:21:27 +0000 (13:21 +0000)]
Merge #17 into xts_origin from refs/changes/17/head

Code review from 袁清梦

* refs/changes/17/head: (7 commits squashed)

  - 修改主界面上拉界面UI;删除视频表盘panda;优化训练结束以及弹窗UI;搭建训练结束数据处理

  - 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: 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/17
2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 19/1 19/head
penglei [Tue, 16 Apr 2024 13:15:23 +0000 (21:15 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修改充电状态消息发送,优化蓝牙产测,自动灭屏时间函数
penglei [Tue, 16 Apr 2024 13:15:09 +0000 (21:15 +0800)]
修改充电状态消息发送,优化蓝牙产测,自动灭屏时间函数

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
penglei [Tue, 16 Apr 2024 13:13:07 +0000 (21:13 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #15 into xts_origin from refs/changes/15/head 19/target/1
邓雪英 [Tue, 16 Apr 2024 13:13:05 +0000 (13:13 +0000)]
Merge #15 into xts_origin from refs/changes/15/head

通讯录协议对接完成

* refs/changes/15/head: (3 commits squashed)

  - test

  - 1.通许录协议对接已完成
    2.更改时间 天气 训练目标解析返回值传参出错的问题

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

Signed-off-by: d15521469561 <1731678236@qq.com>
Commented-by: d15521469561 <1731678236@qq.com>
Commented-by: Caisking <3449750381@qq.com>
Commented-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/15
2 years agoMerge #18 into xts_origin from refs/changes/18/head
罗正 [Tue, 16 Apr 2024 13:12:16 +0000 (13:12 +0000)]
Merge #18 into xts_origin from refs/changes/18/head

实现导航历史栈功能:

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

  - 实现导航历史栈功能:
    1.当从一个Slice进入另一个Slice时调用NativeAbility::GetInstance().EnterSlice(sliceId)
    2.NativeAbility::GetInstance().Back 处理后退操作
    3.ChangeSlice不压栈

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/18
2 years agoMerge #16 into xts_origin from refs/changes/16/head
彭磊 [Tue, 16 Apr 2024 13:08:42 +0000 (13:08 +0000)]
Merge #16 into xts_origin from refs/changes/16/head

Code review from 彭磊

* refs/changes/16/head: (3 commits squashed)

  - 修改心率驱动,解决佩戴模式不能获得佩戴状态的问题,

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

  - 优化心率驱动,解决佩戴模式不能正确获取佩戴状态的问题,添加动态心率,优化运动模式切换流程

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Commented-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/16
2 years ago实现导航历史栈功能: 18/1 18/head
luozheng [Tue, 16 Apr 2024 12:49:06 +0000 (20:49 +0800)]
实现导航历史栈功能:
1.当从一个Slice进入另一个Slice时调用NativeAbility::GetInstance().EnterSlice(sliceId)
2.NativeAbility::GetInstance().Back 处理后退操作
3.ChangeSlice不压栈

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 17/1 17/head
Caisking [Tue, 16 Apr 2024 11:15:33 +0000 (19:15 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago增加训练数据获取;通用函数增加时间获取;删除快速访问结构体
Caisking [Tue, 16 Apr 2024 11:15:24 +0000 (19:15 +0800)]
增加训练数据获取;通用函数增加时间获取;删除快速访问结构体

2 years ago优化心率驱动,解决佩戴模式不能正确获取佩戴状态的问题,添加动态心率,优化运动模式切换流程 16/1 16/head
penglei [Tue, 16 Apr 2024 10:08:53 +0000 (18:08 +0800)]
优化心率驱动,解决佩戴模式不能正确获取佩戴状态的问题,添加动态心率,优化运动模式切换流程

2 years ago将亮度调节修改为slice并添加到applist上 14/2 14/head 17/target/1 18/target/1
luozheng [Tue, 16 Apr 2024 09:39:19 +0000 (17:39 +0800)]
将亮度调节修改为slice并添加到applist上

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 14/1
luozheng [Tue, 16 Apr 2024 03:44:35 +0000 (11:44 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago优化勿扰模式,用ConfigModel保存勿扰模式状态
luozheng [Tue, 16 Apr 2024 03:44:29 +0000 (11:44 +0800)]
优化勿扰模式,用ConfigModel保存勿扰模式状态

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
penglei [Tue, 16 Apr 2024 03:21:33 +0000 (11:21 +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, 16 Apr 2024 03:11:28 +0000 (11:11 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years agoMerge #13 into xts_origin from refs/changes/13/head 14/target/1 15/target/1 16/target/1
袁清梦 [Tue, 16 Apr 2024 03:09:42 +0000 (03:09 +0000)]
Merge #13 into xts_origin from refs/changes/13/head

Code review from 袁清梦

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

  - 修改主界面上拉界面UI;删除视频表盘panda;优化训练结束以及弹窗UI;搭建训练结束数据处理

  - 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/13
2 years ago训练同步部分结束数据 13/1 13/head
Caisking [Tue, 16 Apr 2024 03:02:17 +0000 (11:02 +0800)]
训练同步部分结束数据

2 years agoapplist增加手电筒,查找手机,勿扰模式
luozheng [Tue, 16 Apr 2024 02:48:06 +0000 (10:48 +0800)]
applist增加手电筒,查找手机,勿扰模式

2 years ago优化部分交互逻辑
Caisking [Tue, 16 Apr 2024 02:30:51 +0000 (10:30 +0800)]
优化部分交互逻辑

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
Caisking [Tue, 16 Apr 2024 02:24:43 +0000 (10:24 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修改主界面上拉界面UI;删除视频表盘panda;优化训练结束以及弹窗UI;搭建训练结束数据处理
Caisking [Tue, 16 Apr 2024 02:24:28 +0000 (10:24 +0800)]
修改主界面上拉界面UI;删除视频表盘panda;优化训练结束以及弹窗UI;搭建训练结束数据处理

2 years ago根据“图标代码对照表”修改天气视图,现在会返回正确的天气icon图片 12/1 12/head
luozheng [Tue, 16 Apr 2024 02:19:21 +0000 (10:19 +0800)]
根据“图标代码对照表”修改天气视图,现在会返回正确的天气icon图片

2 years ago解決”关于手表“视图4G Modem标签 和IMEI不能显示的问题 11/1 11/head 12/target/1 13/target/1
luozheng [Mon, 15 Apr 2024 11:34:25 +0000 (19:34 +0800)]
解決”关于手表“视图4G Modem标签 和IMEI不能显示的问题

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 10/1 10/head 11/target/1
luozheng [Mon, 15 Apr 2024 08:18:44 +0000 (16:18 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修改心率驱动,解决佩戴模式不能获得佩戴状态的问题, 9/1 9/head
penglei [Mon, 15 Apr 2024 08:01:20 +0000 (16:01 +0800)]
修改心率驱动,解决佩戴模式不能获得佩戴状态的问题,

2 years ago天气视图优化
luozheng [Mon, 15 Apr 2024 07:28:17 +0000 (15:28 +0800)]
天气视图优化

2 years ago添加通讯录及相关函数 10/target/1 7/1 7/head 8/target/1 9/target/1
hcj [Mon, 15 Apr 2024 07:14:37 +0000 (15:14 +0800)]
添加通讯录及相关函数

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 6/1 6/head 7/target/1
SnickerSun [Mon, 15 Apr 2024 07:01:42 +0000 (15:01 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago解决语言第一次烧录启动失效问题。
SnickerSun [Mon, 15 Apr 2024 07:01:34 +0000 (15:01 +0800)]
解决语言第一次烧录启动失效问题。

2 years ago更新TrainingModel消息同步处理 5/1 5/head 6/target/1
Caisking [Mon, 15 Apr 2024 06:33:14 +0000 (14:33 +0800)]
更新TrainingModel消息同步处理

2 years ago手动对比 同步 regular_origin 提交 9ae001f4ab8e29de501d80ebe5d44246bd1f6c5b 的代码,并根据源码作者评审... 4/1 4/head 5/target/1
SnickerSun [Mon, 15 Apr 2024 03:44:56 +0000 (11:44 +0800)]
手动对比 同步  regular_origin 提交   9ae001f4ab8e29de501d80ebe5d44246bd1f6c5b 的代码,并根据源码作者评审,更新到当下最新。

2 years ago删除130x130天气图片改用65x65天气图片
luozheng [Sat, 13 Apr 2024 11:32:32 +0000 (19:32 +0800)]
删除130x130天气图片改用65x65天气图片

2 years ago天气界面优化,采用imagecash管理图片
luozheng [Sat, 13 Apr 2024 10:54:50 +0000 (18:54 +0800)]
天气界面优化,采用imagecash管理图片

2 years ago测试 2/target/1 4/target/1
Caisking [Sat, 13 Apr 2024 10:52:33 +0000 (18:52 +0800)]
测试

2 years agotest
dxy [Sat, 13 Apr 2024 10:50:41 +0000 (18:50 +0800)]
test

2 years ago蓝牙协议指令优化
dxy [Sat, 13 Apr 2024 10:16:48 +0000 (18:16 +0800)]
蓝牙协议指令优化

2 years ago天气视图修改,未来天气需要修改为list还需优化
luozheng [Sat, 13 Apr 2024 09:31:34 +0000 (17:31 +0800)]
天气视图修改,未来天气需要修改为list还需优化

2 years ago合并UI 1/target/1
Caisking [Sat, 13 Apr 2024 09:04:26 +0000 (17:04 +0800)]
合并UI

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
Caisking [Sat, 13 Apr 2024 08:48:58 +0000 (16:48 +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 [Sat, 13 Apr 2024 08:48:49 +0000 (16:48 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago没有乘车码,UI暂时关闭
SnickerSun [Sat, 13 Apr 2024 07:29:28 +0000 (15:29 +0800)]
没有乘车码,UI暂时关闭

2 years ago加打印查看是否有成功清配对信息
dxy [Sat, 13 Apr 2024 07:37:00 +0000 (15:37 +0800)]
加打印查看是否有成功清配对信息

2 years ago蓝牙开关界面暂时屏蔽开关蓝牙服务
dxy [Sat, 13 Apr 2024 06:25:55 +0000 (14:25 +0800)]
蓝牙开关界面暂时屏蔽开关蓝牙服务

2 years ago删除不必要测试数据
dxy [Sat, 13 Apr 2024 06:22:09 +0000 (14:22 +0800)]
删除不必要测试数据

2 years ago增加开始结束训练时间戳打印
Caisking [Sat, 13 Apr 2024 06:13:19 +0000 (14:13 +0800)]
增加开始结束训练时间戳打印

2 years ago优化绑定流程加界面显示
dxy [Sat, 13 Apr 2024 03:52:24 +0000 (11:52 +0800)]
优化绑定流程加界面显示

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
luozheng [Sat, 13 Apr 2024 03:33:44 +0000 (11:33 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago毁设备绑定视图时添加停止定时器
luozheng [Sat, 13 Apr 2024 03:33:37 +0000 (11:33 +0800)]
毁设备绑定视图时添加停止定时器

2 years agoMerge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...
SnickerSun [Sat, 13 Apr 2024 03:02:18 +0000 (11:02 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修复ConfigModel字符串数据存储获取函数
SnickerSun [Sat, 13 Apr 2024 03:01:45 +0000 (11:01 +0800)]
修复ConfigModel字符串数据存储获取函数
添加startup_post_init ,根据配置信息,开启和关闭对应的服务,设备电源等

2 years ago“精简运动模式消息发送函数以及topic数量”
penglei [Sat, 13 Apr 2024 02:51:18 +0000 (10:51 +0800)]
“精简运动模式消息发送函数以及topic数量”

2 years agoMerge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
Caisking [Fri, 12 Apr 2024 12:40:35 +0000 (20:40 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin

2 years ago修复训练结束弹窗bug
Caisking [Fri, 12 Apr 2024 12:37:40 +0000 (20:37 +0800)]
修复训练结束弹窗bug

2 years ago删除ConfigModel文件中无用的ImageAnimator类
luozheng [Fri, 12 Apr 2024 12:23:35 +0000 (20:23 +0800)]
删除ConfigModel文件中无用的ImageAnimator类