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

  - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

  - 设置视图优化表冠控制

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

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

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

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

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

  - Merge branch 'sdk602patch0626' 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 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 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

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

2 years ago修复训练设置距离目标死机
Caisking [Sat, 20 Jul 2024 01:27:25 +0000 (09:27 +0800)]
修复训练设置距离目标死机

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
SnickerSun [Sat, 20 Jul 2024 00:53:54 +0000 (08:53 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修复手表不接屏幕死机问题 555/1 555/head 556/target/1
penglei [Fri, 19 Jul 2024 10:30:45 +0000 (18:30 +0800)]
修复手表不接屏幕死机问题

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Fri, 19 Jul 2024 09:15:01 +0000 (17:15 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 547/6 547/head 555/target/1
luozheng [Fri, 19 Jul 2024 09:01:11 +0000 (17:01 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修改喝水提醒弹窗的计算错误问题
luozheng [Fri, 19 Jul 2024 09:01:05 +0000 (17:01 +0800)]
修改喝水提醒弹窗的计算错误问题

2 years agoble 取消下载及血氧bug修复 547/target/5 554/1 554/head
hcj [Fri, 19 Jul 2024 08:37:44 +0000 (16:37 +0800)]
ble 取消下载及血氧bug修复

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
SnickerSun [Fri, 19 Jul 2024 08:15:13 +0000 (16:15 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 547/5
luozheng [Fri, 19 Jul 2024 08:09:11 +0000 (16:09 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化喝水提醒的时间段判断
luozheng [Fri, 19 Jul 2024 08:08:46 +0000 (16:08 +0800)]
优化喝水提醒的时间段判断

2 years agoMerge #552 into sdk602patch0626 from refs/changes/552/head 547/target/4 554/target/1
袁清梦 [Fri, 19 Jul 2024 07:21:27 +0000 (07:21 +0000)]
Merge #552 into sdk602patch0626 from refs/changes/552/head

默认表盘文件修复

* refs/changes/552/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/552
2 years ago添加tcp线程控制,降低待机功耗 553/1 553/head
penglei [Fri, 19 Jul 2024 06:57:12 +0000 (14:57 +0800)]
添加tcp线程控制,降低待机功耗

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 547/4
luozheng [Fri, 19 Jul 2024 06:53:38 +0000 (14:53 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago解决喝水提醒跨天设置问题
luozheng [Fri, 19 Jul 2024 06:53:32 +0000 (14:53 +0800)]
解决喝水提醒跨天设置问题

2 years ago默认表盘文件修复 552/1 552/head
Caisking [Fri, 19 Jul 2024 06:50:57 +0000 (14:50 +0800)]
默认表盘文件修复

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
SnickerSun [Fri, 19 Jul 2024 05:48:50 +0000 (13:48 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
SnickerSun [Fri, 19 Jul 2024 05:03:39 +0000 (13:03 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修复电量显示异常 547/target/3 551/3 551/head 552/target/1 553/target/1
Caisking [Fri, 19 Jul 2024 03:52:15 +0000 (11:52 +0800)]
修复电量显示异常

2 years ago实现喝水提醒功能(隔天的还有问题)
luozheng [Fri, 19 Jul 2024 03:19:24 +0000 (11:19 +0800)]
实现喝水提醒功能(隔天的还有问题)

2 years ago修改水母,运动表盘背景 551/2
Caisking [Fri, 19 Jul 2024 03:02:45 +0000 (11:02 +0800)]
修改水母,运动表盘背景

2 years ago删除缓存文件 551/1
Caisking [Fri, 19 Jul 2024 01:29:54 +0000 (09:29 +0800)]
删除缓存文件

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Fri, 19 Jul 2024 01:29:15 +0000 (09:29 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago同步资源文件更改
Caisking [Fri, 19 Jul 2024 01:28:27 +0000 (09:28 +0800)]
同步资源文件更改

2 years ago 回退Id更改
Caisking [Fri, 19 Jul 2024 01:27:52 +0000 (09:27 +0800)]
 回退Id更改

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
SnickerSun [Thu, 18 Jul 2024 22:49:43 +0000 (06:49 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #549 into sdk602patch0626 from refs/changes/549/head 551/target/1
袁清梦 [Thu, 18 Jul 2024 22:45:00 +0000 (22:45 +0000)]
Merge #549 into sdk602patch0626 from refs/changes/549/head

修改表盘资源

* refs/changes/549/head: (9 commits squashed)

  - 修改表盘资源

  - 删除项目中的缓存文件

  - 优化部分缩略图

  - 同步lzma配置

  - 删除不必要的复制

  - 修改默认表盘

  - 同步默认表盘map配置

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

  - 更新宇航员表盘lzma

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/549
2 years ago支付宝UI修改 550/1 550/head
hcj [Thu, 18 Jul 2024 12:39:26 +0000 (20:39 +0800)]
支付宝UI修改

2 years ago更新宇航员表盘lzma 549/5 549/head
Caisking [Thu, 18 Jul 2024 11:51:24 +0000 (19:51 +0800)]
更新宇航员表盘lzma

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 549/4
Caisking [Thu, 18 Jul 2024 09:45:50 +0000 (17:45 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago同步默认表盘map配置
Caisking [Thu, 18 Jul 2024 09:45:43 +0000 (17:45 +0800)]
同步默认表盘map配置

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 547/3
luozheng [Thu, 18 Jul 2024 09:11:11 +0000 (17:11 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago指南针界面修改修改方向和度数居中
luozheng [Thu, 18 Jul 2024 09:09:17 +0000 (17:09 +0800)]
指南针界面修改修改方向和度数居中

2 years ago修改默认表盘
Caisking [Thu, 18 Jul 2024 09:04:56 +0000 (17:04 +0800)]
修改默认表盘

2 years ago删除不必要的复制 549/3
Caisking [Thu, 18 Jul 2024 09:00:16 +0000 (17:00 +0800)]
删除不必要的复制

2 years ago同步lzma配置 549/2
Caisking [Thu, 18 Jul 2024 08:37:55 +0000 (16:37 +0800)]
同步lzma配置

2 years ago优化部分缩略图
Caisking [Thu, 18 Jul 2024 07:02:47 +0000 (15:02 +0800)]
优化部分缩略图

2 years ago删除fd230app有关set_desktop文件
luozheng [Thu, 18 Jul 2024 06:50:05 +0000 (14:50 +0800)]
删除fd230app有关set_desktop文件

2 years ago删除项目中的缓存文件
Caisking [Thu, 18 Jul 2024 06:39:30 +0000 (14:39 +0800)]
删除项目中的缓存文件

2 years ago修改表盘资源 549/1
Caisking [Thu, 18 Jul 2024 06:32:47 +0000 (14:32 +0800)]
修改表盘资源

2 years ago喝水提醒优化修改
luozheng [Thu, 18 Jul 2024 04:00:51 +0000 (12:00 +0800)]
喝水提醒优化修改

2 years ago关闭自动回连 547/target/2 548/1 548/head 549/target/2 550/target/1
hcj [Thu, 18 Jul 2024 03:59:31 +0000 (11:59 +0800)]
关闭自动回连

2 years ago删除喝水提醒弹窗的多余代码
luozheng [Thu, 18 Jul 2024 03:49:43 +0000 (11:49 +0800)]
删除喝水提醒弹窗的多余代码

2 years ago全局状态进入开机和重启界面优化:进入后如果不想重启或关机,优化退出和按键返回,遵循:从那来回那去
luozheng [Thu, 18 Jul 2024 03:38:26 +0000 (11:38 +0800)]
全局状态进入开机和重启界面优化:进入后如果不想重启或关机,优化退出和按键返回,遵循:从那来回那去

2 years ago喝水提醒优化修改:不在提醒时间段内且计数器大于0就重置计数器
luozheng [Thu, 18 Jul 2024 03:33:44 +0000 (11:33 +0800)]
喝水提醒优化修改:不在提醒时间段内且计数器大于0就重置计数器