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函数
胡传军 [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)]
支付宝绑定验证通过
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
SnickerSun [Wed, 17 Apr 2024 02:19:13 +0000 (10:19 +0800)]
修复bleservice 不能开启的问，恢复keepon timeout 比较参数
hcj [Wed, 17 Apr 2024 01:42:18 +0000 (09:42 +0800)]
优化ui产测入口
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
SnickerSun [Wed, 17 Apr 2024 01:30:02 +0000 (09:30 +0800)]
优化蓝牙bleservice和alipay service之间切换逻辑、支付宝启动屏幕常亮
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
SnickerSun [Wed, 17 Apr 2024 01:24:03 +0000 (09:24 +0800)]
修复屏幕常亮函数无效问题
添加Calander，关机记录时间。
SnickerSun [Wed, 17 Apr 2024 00:29:38 +0000 (08:29 +0800)]
修复编译问题
袁清梦 [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 '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
- 增加训练数据获取；通用函数增加时间获取；删除快速访问结构体
- 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/17
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
penglei [Tue, 16 Apr 2024 13:15:09 +0000 (21:15 +0800)]
修改充电状态消息发送，优化蓝牙产测，自动灭屏时间函数
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
邓雪英 [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 'xts_origin' 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
罗正 [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
彭磊 [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 'xts_origin' 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
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不压栈
penglei [Tue, 16 Apr 2024 10:08:53 +0000 (18:08 +0800)]
优化心率驱动，解决佩戴模式不能正确获取佩戴状态的问题，添加动态心率，优化运动模式切换流程
luozheng [Tue, 16 Apr 2024 09:39:19 +0000 (17:39 +0800)]
将亮度调节修改为slice并添加到applist上
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
luozheng [Tue, 16 Apr 2024 03:44:29 +0000 (11:44 +0800)]
优化勿扰模式，用ConfigModel保存勿扰模式状态
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
袁清梦 [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 '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/13
luozheng [Tue, 16 Apr 2024 02:48:06 +0000 (10:48 +0800)]
applist增加手电筒，查找手机，勿扰模式
luozheng [Tue, 16 Apr 2024 02:19:21 +0000 (10:19 +0800)]
根据“图标代码对照表”修改天气视图，现在会返回正确的天气icon图片
luozheng [Mon, 15 Apr 2024 11:34:25 +0000 (19:34 +0800)]
解決”关于手表“视图4G Modem标签 和IMEI不能显示的问题
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
penglei [Mon, 15 Apr 2024 08:01:20 +0000 (16:01 +0800)]
修改心率驱动，解决佩戴模式不能获得佩戴状态的问题，
luozheng [Mon, 15 Apr 2024 07:28:17 +0000 (15:28 +0800)]
天气视图优化
hcj [Mon, 15 Apr 2024 07:14:37 +0000 (15:14 +0800)]
添加通讯录及相关函数
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
SnickerSun [Mon, 15 Apr 2024 07:01:34 +0000 (15:01 +0800)]
解决语言第一次烧录启动失效问题。
Caisking [Mon, 15 Apr 2024 06:33:14 +0000 (14:33 +0800)]
更新TrainingModel消息同步处理
SnickerSun [Mon, 15 Apr 2024 03:44:56 +0000 (11:44 +0800)]
手动对比 同步 regular_origin 提交
9ae001f4ab8e29de501d80ebe5d44246bd1f6c5b 的代码，并根据源码作者评审，更新到当下最新。
luozheng [Sat, 13 Apr 2024 11:32:32 +0000 (19:32 +0800)]
删除130x130天气图片改用65x65天气图片
luozheng [Sat, 13 Apr 2024 10:54:50 +0000 (18:54 +0800)]
天气界面优化，采用imagecash管理图片
Caisking [Sat, 13 Apr 2024 10:52:33 +0000 (18:52 +0800)]
测试
dxy [Sat, 13 Apr 2024 10:50:41 +0000 (18:50 +0800)]
test
dxy [Sat, 13 Apr 2024 10:16:48 +0000 (18:16 +0800)]
蓝牙协议指令优化
luozheng [Sat, 13 Apr 2024 09:31:34 +0000 (17:31 +0800)]
天气视图修改，未来天气需要修改为list还需优化
Caisking [Sat, 13 Apr 2024 09:04:26 +0000 (17:04 +0800)]
合并UI
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
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
SnickerSun [Sat, 13 Apr 2024 07:29:28 +0000 (15:29 +0800)]
没有乘车码，UI暂时关闭
dxy [Sat, 13 Apr 2024 07:37:00 +0000 (15:37 +0800)]
加打印查看是否有成功清配对信息
dxy [Sat, 13 Apr 2024 06:25:55 +0000 (14:25 +0800)]
蓝牙开关界面暂时屏蔽开关蓝牙服务
dxy [Sat, 13 Apr 2024 06:22:09 +0000 (14:22 +0800)]
删除不必要测试数据
Caisking [Sat, 13 Apr 2024 06:13:19 +0000 (14:13 +0800)]
增加开始结束训练时间戳打印
dxy [Sat, 13 Apr 2024 03:52:24 +0000 (11:52 +0800)]
优化绑定流程加界面显示
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
luozheng [Sat, 13 Apr 2024 03:33:37 +0000 (11:33 +0800)]
毁设备绑定视图时添加停止定时器
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
SnickerSun [Sat, 13 Apr 2024 03:01:45 +0000 (11:01 +0800)]
修复ConfigModel字符串数据存储获取函数
添加startup_post_init ，根据配置信息，开启和关闭对应的服务，设备电源等
penglei [Sat, 13 Apr 2024 02:51:18 +0000 (10:51 +0800)]
“精简运动模式消息发送函数以及topic数量”
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
Caisking [Fri, 12 Apr 2024 12:37:40 +0000 (20:37 +0800)]
修复训练结束弹窗bug
luozheng [Fri, 12 Apr 2024 12:23:35 +0000 (20:23 +0800)]
删除ConfigModel文件中无用的ImageAnimator类
luozheng [Fri, 12 Apr 2024 12:11:04 +0000 (20:11 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
luozheng [Fri, 12 Apr 2024 12:10:56 +0000 (20:10 +0800)]
天气视图优化
配对弹窗的定时器启动放到显示视图时启动
SnickerSun [Fri, 12 Apr 2024 10:52:56 +0000 (18:52 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Fri, 12 Apr 2024 10:52:47 +0000 (18:52 +0800)]
修复ConfigModel返回值错误
Caisking [Fri, 12 Apr 2024 10:38:13 +0000 (18:38 +0800)]
训练结束弹窗Slice删除
Caisking [Fri, 12 Apr 2024 10:25:50 +0000 (18:25 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Fri, 12 Apr 2024 10:25:34 +0000 (18:25 +0800)]
cywee实现文件读写函数移植
Caisking [Fri, 12 Apr 2024 10:24:37 +0000 (18:24 +0800)]
训练卡片同步训练类型
SnickerSun [Fri, 12 Apr 2024 10:23:25 +0000 (18:23 +0800)]
ota脚本增加 删除文件和路径的例子
SnickerSun [Fri, 12 Apr 2024 10:22:24 +0000 (18:22 +0800)]
Topic总数从32增加为64
SnickerSun [Fri, 12 Apr 2024 10:21:48 +0000 (18:21 +0800)]
同步nativelauncher中alipay的更新
SnickerSun [Fri, 12 Apr 2024 10:21:15 +0000 (18:21 +0800)]
重构ConfigModel，修改相关UI调用
Caisking [Fri, 12 Apr 2024 10:07:17 +0000 (18:07 +0800)]
更新训练卡片UI
Caisking [Fri, 12 Apr 2024 08:26:29 +0000 (16:26 +0800)]
训练增加退出弹窗界面
dxy [Fri, 12 Apr 2024 03:50:08 +0000 (11:50 +0800)]
合并冲突bleEvent.c
dxy [Fri, 12 Apr 2024 03:44:59 +0000 (11:44 +0800)]
先屏蔽绑定和解绑界面
luozheng [Fri, 12 Apr 2024 03:42:38 +0000 (11:42 +0800)]
设置配对弹窗超时30s销毁
luozheng [Fri, 12 Apr 2024 01:08:40 +0000 (09:08 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
penglei [Thu, 11 Apr 2024 11:19:46 +0000 (19:19 +0800)]
解决运动模式不能切换的问题
luozheng [Thu, 11 Apr 2024 11:15:39 +0000 (19:15 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Thu, 11 Apr 2024 11:14:17 +0000 (19:14 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Thu, 11 Apr 2024 11:14:12 +0000 (19:14 +0800)]
更新applist的icon
luozheng [Thu, 11 Apr 2024 11:10:32 +0000 (19:10 +0800)]
修改天气视图UI,将UILabel改为UILabelExt
SnickerSun [Thu, 11 Apr 2024 10:48:42 +0000 (18:48 +0800)]
Merge branch 'xts_origin' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into xts_origin
SnickerSun [Thu, 11 Apr 2024 10:47:50 +0000 (18:47 +0800)]
提交落下的ConfigModel Write bool函数调用
penglei [Thu, 11 Apr 2024 10:45:48 +0000 (18:45 +0800)]
补交优化运动模式切换函数，添加静态模式切换函数
penglei [Thu, 11 Apr 2024 10:34:20 +0000 (18:34 +0800)]
补交优化运动模式切换函数，添加静态模式切换函数
penglei [Thu, 11 Apr 2024 10:32:26 +0000 (18:32 +0800)]
补交优化运动模式切换函数，添加静态模式切换函数
Caisking [Thu, 11 Apr 2024 10:27:17 +0000 (18:27 +0800)]
注释经典蓝牙使用不存在函数
Caisking [Thu, 11 Apr 2024 10:11:10 +0000 (18:11 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Thu, 11 Apr 2024 10:10:44 +0000 (18:10 +0800)]
订阅训练消息
SnickerSun [Thu, 11 Apr 2024 09:41:42 +0000 (17:41 +0800)]
去除ConfigModel中的模板函数
Caisking [Thu, 11 Apr 2024 09:06:23 +0000 (17:06 +0800)]
applist增加32种icon，注意后续更新
Caisking [Thu, 11 Apr 2024 08:35:47 +0000 (16:35 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
Caisking [Thu, 11 Apr 2024 08:35:43 +0000 (16:35 +0800)]
解决主界面组件析构问题
penglei [Thu, 11 Apr 2024 08:28:49 +0000 (16:28 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
penglei [Thu, 11 Apr 2024 08:28:44 +0000 (16:28 +0800)]
解决运动模式结构体命名冲突问题
hcj [Thu, 11 Apr 2024 08:03:35 +0000 (16:03 +0800)]
APP通讯录协议对接
penglei [Thu, 11 Apr 2024 07:48:39 +0000 (15:48 +0800)]
Merge branch 'xts_origin' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into xts_origin
projects / mirrors / FD230.git / log