mirrors/FD230.git
2 years agoMerge #590 into sdk602patch0626 from refs/changes/590/head 591/target/1 592/target/1 593/target/1
彭磊 [Fri, 26 Jul 2024 08:50:41 +0000 (08:50 +0000)]
Merge #590 into sdk602patch0626 from refs/changes/590/head

优化a5133驱动,去除无效字段

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

  - 优化a5133驱动,去除无效字段

  - 修复编译问题

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/590
2 years ago增加 2AE6文件传输 增加自定义表盘文件传输 修复通讯录不显示多个电话BUG 589/1 589/head
hcj [Fri, 26 Jul 2024 08:39:29 +0000 (16:39 +0800)]
增加 2AE6文件传输 增加自定义表盘文件传输 修复通讯录不显示多个电话BUG

2 years ago开机兼容a5133配置 587/5 587/head 589/target/1 590/target/1
penglei [Fri, 26 Jul 2024 07:36:50 +0000 (15:36 +0800)]
开机兼容a5133配置

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Fri, 26 Jul 2024 07:35:56 +0000 (15:35 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago增加训练状态到runtime;训练过程中不能进行读写文件操作 587/target/2 588/3 588/head
Caisking [Fri, 26 Jul 2024 07:13:55 +0000 (15:13 +0800)]
增加训练状态到runtime;训练过程中不能进行读写文件操作

2 years agoTrainingSlice适配按键事件 588/2
Caisking [Fri, 26 Jul 2024 04:04:48 +0000 (12:04 +0800)]
TrainingSlice适配按键事件

2 years ago修复训练上拉界面错误绘制 588/1
Caisking [Fri, 26 Jul 2024 03:59:07 +0000 (11:59 +0800)]
修复训练上拉界面错误绘制

2 years ago优化心率计算,添加UI运动识别与底层对接 587/4
penglei [Fri, 26 Jul 2024 02:07:25 +0000 (10:07 +0800)]
优化心率计算,添加UI运动识别与底层对接

2 years ago优化开机恢复系统时间 587/3
penglei [Thu, 25 Jul 2024 11:24:06 +0000 (19:24 +0800)]
优化开机恢复系统时间

2 years ago老化测试补交 587/2
penglei [Thu, 25 Jul 2024 11:07:04 +0000 (19:07 +0800)]
老化测试补交

2 years ago优化蓝牙产测,添加老化测试,优化心率计算,添加静息心率,优化a5133驱动 587/1
penglei [Thu, 25 Jul 2024 10:46:21 +0000 (18:46 +0800)]
优化蓝牙产测,添加老化测试,优化心率计算,添加静息心率,优化a5133驱动

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Thu, 25 Jul 2024 10:43:19 +0000 (18:43 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修复主界面训练卡片点击迟缓 586/1 586/head 587/target/1 588/target/1
Caisking [Thu, 25 Jul 2024 09:56:41 +0000 (17:56 +0800)]
修复主界面训练卡片点击迟缓

2 years ago#121 设置训练卡片界面索引为数据界面
Caisking [Thu, 25 Jul 2024 08:11:55 +0000 (16:11 +0800)]
#121 设置训练卡片界面索引为数据界面

2 years ago#113 暂时优化心率数据出数据慢
Caisking [Thu, 25 Jul 2024 08:08:21 +0000 (16:08 +0800)]
#113  暂时优化心率数据出数据慢

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Thu, 25 Jul 2024 07:59:08 +0000 (15:59 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago增加表盘艺术字文件以及配置
Caisking [Thu, 25 Jul 2024 07:59:05 +0000 (15:59 +0800)]
增加表盘艺术字文件以及配置

2 years ago消息返回逻辑优化
Caisking [Thu, 25 Jul 2024 07:58:28 +0000 (15:58 +0800)]
消息返回逻辑优化

2 years ago#87 消息实现动态刷新
Caisking [Thu, 25 Jul 2024 07:58:02 +0000 (15:58 +0800)]
#87 消息实现动态刷新

2 years ago修复消息弹窗和睡眠弹窗不息屏
Caisking [Thu, 25 Jul 2024 07:36:45 +0000 (15:36 +0800)]
修复消息弹窗和睡眠弹窗不息屏

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Thu, 25 Jul 2024 07:35:08 +0000 (15:35 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修复睡眠设置出错 585/3 585/head 586/target/1
hcj [Thu, 25 Jul 2024 06:45:00 +0000 (14:45 +0800)]
修复睡眠设置出错

2 years ago修复通讯录内存泄漏 585/2
hcj [Thu, 25 Jul 2024 06:40:21 +0000 (14:40 +0800)]
修复通讯录内存泄漏

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 585/1
hcj [Thu, 25 Jul 2024 03:58:45 +0000 (11:58 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago修复起床设置时间异常BUG
hcj [Thu, 25 Jul 2024 03:58:38 +0000 (11:58 +0800)]
修复起床设置时间异常BUG

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 584/1 584/head 585/target/1
SnickerSun [Thu, 25 Jul 2024 03:56:37 +0000 (11:56 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoAbout窗口添加硬件版本
SnickerSun [Thu, 25 Jul 2024 03:56:29 +0000 (11:56 +0800)]
About窗口添加硬件版本

2 years agoMerge #581 into sdk602patch0626 from refs/changes/581/head 584/target/1
罗正 [Thu, 25 Jul 2024 03:33:56 +0000 (03:33 +0000)]
Merge #581 into sdk602patch0626 from refs/changes/581/head

Code review from 罗正

* refs/changes/581/head: (23 commits squashed)

  - 修改恢复出厂设置适配多国语言

  - 1.优化设置视图:添加了表冠控制但效果不佳
    2.滑动关机和重启视图添加按键注册功能
    3.现在设置视图进入关机和重启为“滑动关机重启Slice”

  - 优化屏幕与亮度Slice:
    1.添加了scrollview的表冠控制,
    2.标签断行模式为LINE_BREAK_OSCILLATION改为LINE_BREAK_OSCILLATION
    3.亮屏时长视图实现点击按钮该变亮屏时长单选按钮选中状态

  - 解决手表解绑后恢复出厂设置,如果手机是直接与手表配对成功未选择语言,进入主界面后发现手表缺少字体问题。
    1.如果手机与手表先绑定成功,未选择语言,需选择语言才进入主界面。
    2.如果已选择语言,这时手机与手表绑定成功将自动进入主界面。

  - 传统蓝牙Slice优化修改

  -  喝水提醒尾部括号字符移除(原因:特殊字符不显示故删除)

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

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

  - 设置视图优化表冠控制

  - 解决天气界面没有时间显示的bug,并优化时间刷新
    1.目前主界面天气刷新:如果在天气卡片,天气数据有效,就刷新时间
    2.如果是Slice天气:滑到第一个界面,时间就会更新

  - 解决左滑进入指南针卡片,手持手表,左上角度数被遮挡bug

  - 解决左滑进入指南针卡片,与预览图不一致问题q

  - 解决手表第一次启动:如果选择完语言后重启未配对会直接进入到主界面bug

  - 通过下拉,刷新蓝牙连接状态,解决手机关闭蓝牙后手机还显示已连接问题需要等待一会才会显示断开连接

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

  - 注释KeyInputListener中power键长按进入开关机界面(该界面已经弃用)

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

  - QRcode界面取消设置常亮屏

  - 声音与震动Slice优化:
    1.解决如果是点击设置音量退出Slice未将音量值保存的问题
    2.优化了如果是拖拽设置致使多次调用OnChange,实际上我们只要我们手指离开屏幕最后设置的值。

  - 运动识别优化修改

  - 增加蓝牙耳机连接状态显示

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

  - 显示方式界面优化:适配多国语言和表冠

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/581
2 years agoMerge #583 into sdk602patch0626 from refs/changes/583/head
胡传军 [Thu, 25 Jul 2024 03:22:49 +0000 (03:22 +0000)]
Merge #583 into sdk602patch0626 from refs/changes/583/head

增加充电中UI

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

  - 增加充电中UI

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/583
2 years ago增加充电中UI 583/1 583/head
hcj [Thu, 25 Jul 2024 01:31:21 +0000 (09:31 +0800)]
增加充电中UI

2 years ago修复电量颜色更新缓慢 582/1 582/head
Caisking [Wed, 24 Jul 2024 12:50:27 +0000 (20:50 +0800)]
修复电量颜色更新缓慢

2 years ago#68 修复电量进度条异常显示红色
Caisking [Wed, 24 Jul 2024 11:01:15 +0000 (19:01 +0800)]
#68 修复电量进度条异常显示红色

2 years ago同步默认KUMI表盘更改
Caisking [Wed, 24 Jul 2024 10:28:24 +0000 (18:28 +0800)]
同步默认KUMI表盘更改

2 years ago修复运动表盘切换失败
Caisking [Wed, 24 Jul 2024 10:27:00 +0000 (18:27 +0800)]
修复运动表盘切换失败

2 years ago同步lzma文件更新
Caisking [Wed, 24 Jul 2024 10:25:51 +0000 (18:25 +0800)]
同步lzma文件更新

2 years ago#18 显示中文表盘名称
Caisking [Wed, 24 Jul 2024 10:01:26 +0000 (18:01 +0800)]
#18 显示中文表盘名称

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Wed, 24 Jul 2024 07:43:21 +0000 (15:43 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Wed, 24 Jul 2024 06:14:57 +0000 (14:14 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修改mkota脚本,支持直接用指令制作ota_diff 的ota包。同时修改ota包文件名前缀,更直白的表达清楚本包的制作参数。 580/2 580/head 581/target/1 582/target/1 583/target/1
SnickerSun [Wed, 24 Jul 2024 04:13:25 +0000 (12:13 +0800)]
修改mkota脚本,支持直接用指令制作ota_diff 的ota包。同时修改ota包文件名前缀,更直白的表达清楚本包的制作参数。

2 years agorelease V1.1.25 580/1
SnickerSun [Wed, 24 Jul 2024 03:50:40 +0000 (11:50 +0800)]
release V1.1.25

2 years ago修改默认KUMI配置
Caisking [Wed, 24 Jul 2024 03:47:17 +0000 (11:47 +0800)]
修改默认KUMI配置

2 years agoA5133 接收RSU数据参数调整 579/1 579/head 580/target/1
SnickerSun [Wed, 24 Jul 2024 02:43:21 +0000 (10:43 +0800)]
A5133 接收RSU数据参数调整

2 years ago增加自定义表盘路径接口函数 578/2 578/head 579/target/1
Caisking [Wed, 24 Jul 2024 01:46:12 +0000 (09:46 +0800)]
增加自定义表盘路径接口函数

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 578/1
Caisking [Wed, 24 Jul 2024 01:43:53 +0000 (09:43 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago同步字体资源
Caisking [Wed, 24 Jul 2024 01:42:55 +0000 (09:42 +0800)]
同步字体资源

2 years agoMerge #577 into sdk602patch0626 from refs/changes/577/head 578/target/1
罗正 [Wed, 24 Jul 2024 01:42:47 +0000 (01:42 +0000)]
Merge #577 into sdk602patch0626 from refs/changes/577/head

Code review from 罗正

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

  - 修改恢复出厂设置适配多国语言

  - 1.优化设置视图:添加了表冠控制但效果不佳
    2.滑动关机和重启视图添加按键注册功能
    3.现在设置视图进入关机和重启为“滑动关机重启Slice”

  - 优化屏幕与亮度Slice:
    1.添加了scrollview的表冠控制,
    2.标签断行模式为LINE_BREAK_OSCILLATION改为LINE_BREAK_OSCILLATION
    3.亮屏时长视图实现点击按钮该变亮屏时长单选按钮选中状态

  - 解决手表解绑后恢复出厂设置,如果手机是直接与手表配对成功未选择语言,进入主界面后发现手表缺少字体问题。
    1.如果手机与手表先绑定成功,未选择语言,需选择语言才进入主界面。
    2.如果已选择语言,这时手机与手表绑定成功将自动进入主界面。

  - 传统蓝牙Slice优化修改

  -  喝水提醒尾部括号字符移除(原因:特殊字符不显示故删除)

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

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

  - 设置视图优化表冠控制

  - 解决天气界面没有时间显示的bug,并优化时间刷新
    1.目前主界面天气刷新:如果在天气卡片,天气数据有效,就刷新时间
    2.如果是Slice天气:滑到第一个界面,时间就会更新

  - 解决左滑进入指南针卡片,手持手表,左上角度数被遮挡bug

  - 解决左滑进入指南针卡片,与预览图不一致问题q

  - 解决手表第一次启动:如果选择完语言后重启未配对会直接进入到主界面bug

  - 通过下拉,刷新蓝牙连接状态,解决手机关闭蓝牙后手机还显示已连接问题需要等待一会才会显示断开连接

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

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/577
2 years ago增加Gilroy字体配置。增加使用字体示例
Caisking [Wed, 24 Jul 2024 01:42:42 +0000 (09:42 +0800)]
增加Gilroy字体配置。增加使用字体示例

2 years ago增加活动数据刷新 与步数同步刷新 576/2 576/head
hcj [Tue, 23 Jul 2024 10:25:13 +0000 (18:25 +0800)]
增加活动数据刷新 与步数同步刷新

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 576/1
hcj [Tue, 23 Jul 2024 09:53:18 +0000 (17:53 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago增加闹钟刷新model UI还需更改
hcj [Tue, 23 Jul 2024 09:52:53 +0000 (17:52 +0800)]
增加闹钟刷新model UI还需更改

2 years ago增加飞鸟lzma文件
Caisking [Tue, 23 Jul 2024 08:56:57 +0000 (16:56 +0800)]
增加飞鸟lzma文件

2 years ago修复app健走异常
Caisking [Tue, 23 Jul 2024 08:47:34 +0000 (16:47 +0800)]
修复app健走异常

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Tue, 23 Jul 2024 06:14:28 +0000 (14:14 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agorelease V1.1.24 575/1 575/head 576/target/1 577/target/1
SnickerSun [Tue, 23 Jul 2024 06:12:41 +0000 (14:12 +0800)]
release V1.1.24

2 years agoMerge #574 into sdk602patch0626 from refs/changes/574/head 575/target/1
彭磊 [Tue, 23 Jul 2024 06:11:19 +0000 (06:11 +0000)]
Merge #574 into sdk602patch0626 from refs/changes/574/head

优化a5133驱动

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

  - 优化a5133驱动

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/574
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Tue, 23 Jul 2024 06:11:02 +0000 (14:11 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化a5133驱动 574/1 574/head
penglei [Tue, 23 Jul 2024 06:09:29 +0000 (14:09 +0800)]
优化a5133驱动

2 years ago增加活动数据过滤0不存(补) 573/2 573/head
hcj [Tue, 23 Jul 2024 03:17:42 +0000 (11:17 +0800)]
增加活动数据过滤0不存(补)

2 years ago增加活动数据过滤0不存 573/1
hcj [Tue, 23 Jul 2024 03:15:17 +0000 (11:15 +0800)]
增加活动数据过滤0不存

2 years agoMerge #570 into sdk602patch0626 from refs/changes/570/head 573/target/1 574/target/1
罗正 [Tue, 23 Jul 2024 01:58:55 +0000 (01:58 +0000)]
Merge #570 into sdk602patch0626 from refs/changes/570/head

Code review from 罗正

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

  - 修改恢复出厂设置适配多国语言

  - 1.优化设置视图:添加了表冠控制但效果不佳
    2.滑动关机和重启视图添加按键注册功能
    3.现在设置视图进入关机和重启为“滑动关机重启Slice”

  - 优化屏幕与亮度Slice:
    1.添加了scrollview的表冠控制,
    2.标签断行模式为LINE_BREAK_OSCILLATION改为LINE_BREAK_OSCILLATION
    3.亮屏时长视图实现点击按钮该变亮屏时长单选按钮选中状态

  - 解决手表解绑后恢复出厂设置,如果手机是直接与手表配对成功未选择语言,进入主界面后发现手表缺少字体问题。
    1.如果手机与手表先绑定成功,未选择语言,需选择语言才进入主界面。
    2.如果已选择语言,这时手机与手表绑定成功将自动进入主界面。

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/570
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Tue, 23 Jul 2024 01:53:34 +0000 (09:53 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #572 into sdk602patch0626 from refs/changes/572/head
袁清梦 [Tue, 23 Jul 2024 01:51:20 +0000 (01:51 +0000)]
Merge #572 into sdk602patch0626 from refs/changes/572/head

Code review from 袁清梦

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

  - 优化动态心率显示算法保证数据较为稳定

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

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

  - 增加飞鸟表盘

  - 增加自定义表盘配置

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

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/572
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 572/1 572/head
Caisking [Mon, 22 Jul 2024 11:16:46 +0000 (19:16 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago增加自定义表盘配置
Caisking [Mon, 22 Jul 2024 11:16:41 +0000 (19:16 +0800)]
增加自定义表盘配置

2 years ago增加飞鸟表盘
Caisking [Mon, 22 Jul 2024 10:40:12 +0000 (18:40 +0800)]
增加飞鸟表盘

2 years ago电话增加特殊符号* + # (补) 571/2 571/head
hcj [Mon, 22 Jul 2024 04:03:05 +0000 (12:03 +0800)]
电话增加特殊符号* + # (补)

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 571/1
hcj [Mon, 22 Jul 2024 03:47:38 +0000 (11:47 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago电话增加特殊符号* + #
hcj [Mon, 22 Jul 2024 03:47:28 +0000 (11:47 +0800)]
电话增加特殊符号* + #

2 years ago实现:恢复出厂设置后必须绑定二维码才能进入主界面 569/1 569/head 570/target/1 571/target/1 572/target/1
luozheng [Sat, 20 Jul 2024 11:23:23 +0000 (19:23 +0800)]
实现:恢复出厂设置后必须绑定二维码才能进入主界面

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Sat, 20 Jul 2024 11:08:02 +0000 (19:08 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Sat, 20 Jul 2024 10:51:40 +0000 (18:51 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 568/1 568/head 569/target/1
hcj [Sat, 20 Jul 2024 10:47:08 +0000 (18:47 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years agoble 状态改变提交
hcj [Sat, 20 Jul 2024 10:46:35 +0000 (18:46 +0800)]
ble 状态改变提交

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Sat, 20 Jul 2024 10:44:49 +0000 (18:44 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #566 into sdk602patch0626 from refs/changes/566/head 568/target/1
罗正 [Sat, 20 Jul 2024 10:41:58 +0000 (10:41 +0000)]
Merge #566 into sdk602patch0626 from refs/changes/566/head

Code review from 罗正

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

  - 添加滑动关机和重启功能:
    恢复出厂设置未加
    目前是长按才是滑动关机和重启

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

  - 滑动关机和重启添加恢复出厂设置功能

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

  - 滑动关机和重启界面多国语言修改

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

  - QRcode 添加版本号,title改为设别名

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

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/566
2 years agoMerge #565 into sdk602patch0626 from refs/changes/565/head
袁清梦 [Sat, 20 Jul 2024 10:41:06 +0000 (10:41 +0000)]
Merge #565 into sdk602patch0626 from refs/changes/565/head

Code review from 袁清梦

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

  - 优化动态心率显示算法保证数据较为稳定

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

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/565
2 years ago电话界面优化,applist中的通话记录改为通讯录 567/1 567/head
hcj [Sat, 20 Jul 2024 10:12:06 +0000 (18:12 +0800)]
电话界面优化,applist中的通话记录改为通讯录

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 566/1 566/head
luozheng [Sat, 20 Jul 2024 09:08:39 +0000 (17:08 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoQRcode 添加版本号,title改为设别名
luozheng [Sat, 20 Jul 2024 09:06:55 +0000 (17:06 +0800)]
QRcode 添加版本号,title改为设别名

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 563/2 563/head 566/target/1 567/target/1
hcj [Sat, 20 Jul 2024 08:43:14 +0000 (16:43 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago表冠测试修改
hcj [Sat, 20 Jul 2024 08:43:00 +0000 (16:43 +0800)]
表冠测试修改

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 565/1 565/head
Caisking [Sat, 20 Jul 2024 08:24:50 +0000 (16:24 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化动态心率显示算法保证数据较为稳定
Caisking [Sat, 20 Jul 2024 08:22:55 +0000 (16:22 +0800)]
优化动态心率显示算法保证数据较为稳定

2 years agoMerge #561 into sdk602patch0626 from refs/changes/561/head 563/target/2 565/target/1
罗正 [Sat, 20 Jul 2024 08:21:17 +0000 (08:21 +0000)]
Merge #561 into sdk602patch0626 from refs/changes/561/head

Code review from 罗正

* refs/changes/561/head: (5 commits squashed)

  - 添加滑动关机和重启功能:
    恢复出厂设置未加
    目前是长按才是滑动关机和重启

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

  - 滑动关机和重启添加恢复出厂设置功能

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

  - 滑动关机和重启界面多国语言修改

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/561
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Sat, 20 Jul 2024 08:17:05 +0000 (16:17 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 564/1 564/head
Caisking [Sat, 20 Jul 2024 08:15:19 +0000 (16:15 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修复语言脚本
Caisking [Sat, 20 Jul 2024 08:15:12 +0000 (16:15 +0800)]
修复语言脚本

2 years ago滑动关机和重启界面多国语言修改 561/2 561/head
luozheng [Sat, 20 Jul 2024 08:10:36 +0000 (16:10 +0800)]
滑动关机和重启界面多国语言修改

2 years ago每日目标,燃脂数据修改,增加获取站立次数 563/1
hcj [Sat, 20 Jul 2024 08:01:18 +0000 (16:01 +0800)]
每日目标,燃脂数据修改,增加获取站立次数

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Sat, 20 Jul 2024 07:48:14 +0000 (15:48 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago滑动关机和重启添加恢复出厂设置功能
luozheng [Sat, 20 Jul 2024 07:48:08 +0000 (15:48 +0800)]
滑动关机和重启添加恢复出厂设置功能

2 years ago重写产测部分代码,优化结构,更方便后续更改和添加 561/target/2 562/1 562/head 563/target/1 564/target/1
hcj [Sat, 20 Jul 2024 04:05:16 +0000 (12:05 +0800)]
重写产测部分代码,优化结构,更方便后续更改和添加

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 561/1
luozheng [Sat, 20 Jul 2024 03:58:43 +0000 (11:58 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago添加滑动关机和重启功能:
luozheng [Sat, 20 Jul 2024 03:58:36 +0000 (11:58 +0800)]
添加滑动关机和重启功能:
恢复出厂设置未加
目前是长按才是滑动关机和重启

2 years agorelease V1.1.23 560/1 560/head 561/target/1 562/target/1
SnickerSun [Sat, 20 Jul 2024 02:33:34 +0000 (10:33 +0800)]
release V1.1.23

2 years ago添加A5133驱动支持 559/1 559/head 560/target/1
SnickerSun [Sat, 20 Jul 2024 02:32:20 +0000 (10:32 +0800)]
添加A5133驱动支持

2 years ago增加 连接状态改变(补) 558/2 558/head 559/target/1
hcj [Sat, 20 Jul 2024 01:59:45 +0000 (09:59 +0800)]
增加 连接状态改变(补)

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 558/1
hcj [Sat, 20 Jul 2024 01:47:53 +0000 (09:47 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago增加 连接状态改变
hcj [Sat, 20 Jul 2024 01:47:22 +0000 (09:47 +0800)]
增加 连接状态改变

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 557/1 557/head 558/target/1
SnickerSun [Sat, 20 Jul 2024 01:43:10 +0000 (09:43 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626