mirrors/FD230.git
2 years agoMerge #761 into sdk602patch0626 from refs/changes/761/head 763/target/1 764/target/1
彭磊 [Thu, 22 Aug 2024 09:34:56 +0000 (09:34 +0000)]
Merge #761 into sdk602patch0626 from refs/changes/761/head

Code review from 彭磊

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

  - 优化蓝牙产测lcd tp button 测试

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

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/761
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 762/1 762/head
hcj [Thu, 22 Aug 2024 09:31:17 +0000 (17:31 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago修复ios无法 扫码添加设备
hcj [Thu, 22 Aug 2024 09:31:06 +0000 (17:31 +0800)]
修复ios无法 扫码添加设备

2 years ago暂时关闭密码锁回主界面 760/5 760/head 761/target/1 762/target/1
Caisking [Thu, 22 Aug 2024 09:10:35 +0000 (17:10 +0800)]
暂时关闭密码锁回主界面

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 760/4
Caisking [Thu, 22 Aug 2024 09:05:59 +0000 (17:05 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago增加在密码锁界面回退到主界面
Caisking [Thu, 22 Aug 2024 09:04:56 +0000 (17:04 +0800)]
增加在密码锁界面回退到主界面

2 years ago补交头文件 760/3
Caisking [Thu, 22 Aug 2024 08:55:31 +0000 (16:55 +0800)]
补交头文件

2 years ago同步屏蔽按键进入AI
Caisking [Thu, 22 Aug 2024 08:54:49 +0000 (16:54 +0800)]
同步屏蔽按键进入AI

2 years ago屏蔽密码锁状态下进入AI 760/2
Caisking [Thu, 22 Aug 2024 08:48:33 +0000 (16:48 +0800)]
屏蔽密码锁状态下进入AI

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 760/1
Caisking [Thu, 22 Aug 2024 08:05:56 +0000 (16:05 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago增加密码锁的锁屏逻辑
Caisking [Thu, 22 Aug 2024 08:05:48 +0000 (16:05 +0800)]
增加密码锁的锁屏逻辑

2 years ago增加密码锁runtime
Caisking [Thu, 22 Aug 2024 08:05:19 +0000 (16:05 +0800)]
增加密码锁runtime

2 years ago增加密码锁Slice
Caisking [Thu, 22 Aug 2024 08:04:59 +0000 (16:04 +0800)]
增加密码锁Slice

2 years ago组件工具 增加UILabelButton的初始化函数
Caisking [Thu, 22 Aug 2024 08:04:35 +0000 (16:04 +0800)]
组件工具 增加UILabelButton的初始化函数

2 years ago修改蓝牙协议的密码字符串
Caisking [Thu, 22 Aug 2024 08:04:06 +0000 (16:04 +0800)]
修改蓝牙协议的密码字符串

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 759/1 759/head 760/target/2
hcj [Thu, 22 Aug 2024 07:36:36 +0000 (15:36 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago修复产测代码线程干扰问题
hcj [Thu, 22 Aug 2024 07:36:20 +0000 (15:36 +0800)]
修复产测代码线程干扰问题

2 years agoMerge #757 into sdk602patch0626 from refs/changes/757/head 759/target/1 760/target/1
胡传军 [Thu, 22 Aug 2024 03:53:53 +0000 (03:53 +0000)]
Merge #757 into sdk602patch0626 from refs/changes/757/head

Code review from 胡传军

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

  - 日程bug修复

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

  - 日程bug修复

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/757
2 years ago更新 z1 resource 源文件,修复main clock 的背景图 758/1 758/head
SnickerSun [Thu, 22 Aug 2024 03:53:11 +0000 (11:53 +0800)]
更新 z1 resource 源文件,修复main clock 的背景图

2 years ago日程bug修复 757/2 757/head
hcj [Thu, 22 Aug 2024 03:23:13 +0000 (11:23 +0800)]
日程bug修复

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 757/1
hcj [Thu, 22 Aug 2024 03:11:51 +0000 (11:11 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago日程bug修复
hcj [Thu, 22 Aug 2024 03:11:23 +0000 (11:11 +0800)]
日程bug修复

2 years agoMerge #755 into sdk602patch0626 from refs/changes/755/head 757/target/1 758/target/1
罗正 [Thu, 22 Aug 2024 02:13:21 +0000 (02:13 +0000)]
Merge #755 into sdk602patch0626 from refs/changes/755/head

Code review from 罗正

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

  - 1. 优化连接中的gif动画,由原来的20帧修改为现在的20帧

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

  - 修改连接动画为60帧

  - 添加手机同步歌曲到手表,手表音乐列表同步刷新。

  - 音乐列表刷新机制优化在每次切换到音乐列表刷新一次,list高度会根据歌曲数量自适应

  - 显示方式界面添加弧形列表样式,并添加对应资源

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

  - 倒计时界面配置多国语言

  - 1.运动识别弹窗根据弹窗汇总设置显示时长为10s,并添加震动
    2.修复开始按钮的视图Id

  - 倒计时界面优化修改

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

  - 倒计时优化修改

  - 倒计时配置多国语言

  - APPlist应用顺序按照KUMI已经重新排列,放入设置中的四个Slice暂未屏蔽等之后加入后再屏蔽

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

  - 1.音乐播放器在切换通道时添加主动连接和断开手机a2dp功能
    2.播放器添加连接动画,手表连接手机音乐超时时间设置为5s

  - 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

  - AI语音添加取消当前AI对话功能

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

  - 修改进入AI的按键逻辑,现在已经确定是(不在AI界面)双击进入AI,单击切换模型(在AI界面)

  - 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/755
2 years agoMerge #756 into sdk602patch0626 from refs/changes/756/head
邓雪英 [Thu, 22 Aug 2024 02:08:38 +0000 (02:08 +0000)]
Merge #756 into sdk602patch0626 from refs/changes/756/head

Code review from 邓雪英

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

  - CAT1的TCP文件传输

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

  - 修改文件名

  - 删除文件名

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/756
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 754/1 754/head
hcj [Wed, 21 Aug 2024 09:03:53 +0000 (17:03 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago优化安卓连接流程
hcj [Wed, 21 Aug 2024 09:03:41 +0000 (17:03 +0800)]
优化安卓连接流程

2 years agoMerge #752 into sdk602patch0626 from refs/changes/752/head 754/target/1 755/target/1 756/target/1
袁清梦 [Wed, 21 Aug 2024 07:48:02 +0000 (07:48 +0000)]
Merge #752 into sdk602patch0626 from refs/changes/752/head

Code review from 袁清梦

* refs/changes/752/head: (3 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/752
2 years ago关闭测试宏 752/2 752/head
Caisking [Wed, 21 Aug 2024 07:13:04 +0000 (15:13 +0800)]
关闭测试宏

2 years agoimage 753/1 753/head
cheng [Wed, 21 Aug 2024 07:09:20 +0000 (15:09 +0800)]
image

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
cheng [Wed, 21 Aug 2024 07:06:20 +0000 (15:06 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

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

2 years ago更新心率曲线刷新以及显示效果调优
Caisking [Wed, 21 Aug 2024 07:01:49 +0000 (15:01 +0800)]
更新心率曲线刷新以及显示效果调优

2 years agoz1同步fd230资源 751/1 751/head 752/target/1 753/target/1
SnickerSun [Wed, 21 Aug 2024 04:46:33 +0000 (12:46 +0800)]
z1同步fd230资源

2 years agoMerge #750 into sdk602patch0626 from refs/changes/750/head 751/target/1
罗正 [Wed, 21 Aug 2024 03:50:58 +0000 (03:50 +0000)]
Merge #750 into sdk602patch0626 from refs/changes/750/head

Code review from 罗正

* refs/changes/750/head: (21 commits squashed)

  - 1. 优化连接中的gif动画,由原来的20帧修改为现在的20帧

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

  - 修改连接动画为60帧

  - 添加手机同步歌曲到手表,手表音乐列表同步刷新。

  - 音乐列表刷新机制优化在每次切换到音乐列表刷新一次,list高度会根据歌曲数量自适应

  - 显示方式界面添加弧形列表样式,并添加对应资源

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

  - 倒计时界面配置多国语言

  - 1.运动识别弹窗根据弹窗汇总设置显示时长为10s,并添加震动
    2.修复开始按钮的视图Id

  - 倒计时界面优化修改

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

  - 倒计时优化修改

  - 倒计时配置多国语言

  - APPlist应用顺序按照KUMI已经重新排列,放入设置中的四个Slice暂未屏蔽等之后加入后再屏蔽

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

  - 1.音乐播放器在切换通道时添加主动连接和断开手机a2dp功能
    2.播放器添加连接动画,手表连接手机音乐超时时间设置为5s

  - 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

  - AI语音添加取消当前AI对话功能

  - 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/750
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 749/1 749/head
penglei [Wed, 21 Aug 2024 03:12:39 +0000 (11:12 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化睡眠模式时间戳计算,不使用心率数据输入睡眠算法。
penglei [Wed, 21 Aug 2024 03:12:28 +0000 (11:12 +0800)]
优化睡眠模式时间戳计算,不使用心率数据输入睡眠算法。

2 years agoMerge #747 into sdk602patch0626 from refs/changes/747/head 749/target/1 750/target/1
程羽飞 [Wed, 21 Aug 2024 03:09:32 +0000 (03:09 +0000)]
Merge #747 into sdk602patch0626 from refs/changes/747/head

Code review from 程羽飞

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

  - 更新睡眠监测模式判别接口;优化睡眠监测模式下相关功能

  - 添加注释

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

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

  - 优化代码

Signed-off-by: dingtalk_kaxuzp <2393524978@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/747
2 years agoMerge #746 into sdk602patch0626 from refs/changes/746/head
彭磊 [Wed, 21 Aug 2024 03:08:30 +0000 (03:08 +0000)]
Merge #746 into sdk602patch0626 from refs/changes/746/head

Code review from 彭磊

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

  - 降低前端mic灵敏度,改善回声

  - 音频参数改动,改善音质,去回声

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/746
2 years ago同步遥控拍照UI与U6保持一致 748/2 748/head
Caisking [Wed, 21 Aug 2024 02:59:08 +0000 (10:59 +0800)]
同步遥控拍照UI与U6保持一致

2 years ago同步训练结果UI更新 748/1
Caisking [Wed, 21 Aug 2024 02:50:34 +0000 (10:50 +0800)]
同步训练结果UI更新

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Wed, 21 Aug 2024 02:35:09 +0000 (10:35 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago更新applist中的训练->运动
Caisking [Wed, 21 Aug 2024 02:35:03 +0000 (10:35 +0800)]
更新applist中的训练->运动

2 years ago优化代码 747/1 747/head
cheng [Wed, 21 Aug 2024 02:17:36 +0000 (10:17 +0800)]
优化代码

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
cheng [Wed, 21 Aug 2024 02:10:54 +0000 (10:10 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago音频参数改动,改善音质,去回声 746/1 746/head
penglei [Wed, 21 Aug 2024 02:06:24 +0000 (10:06 +0800)]
音频参数改动,改善音质,去回声

2 years ago降低前端mic灵敏度,改善回声
penglei [Wed, 21 Aug 2024 02:04:56 +0000 (10:04 +0800)]
降低前端mic灵敏度,改善回声

2 years agorelease V1.1.35 745/2 745/head 746/target/1 747/target/1 748/target/1
SnickerSun [Wed, 21 Aug 2024 01:49:02 +0000 (09:49 +0800)]
release V1.1.35

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
SnickerSun [Wed, 21 Aug 2024 01:48:48 +0000 (09:48 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoVETO 列表显示名称 745/1
SnickerSun [Tue, 20 Aug 2024 13:52:31 +0000 (21:52 +0800)]
VETO 列表显示名称

2 years ago优化运动数据燃脂时间计算。 744/1 744/head 745/target/2
penglei [Tue, 20 Aug 2024 11:32:26 +0000 (19:32 +0800)]
优化运动数据燃脂时间计算。
睡眠监测切换时初始化小睡与睡眠状态。

2 years ago更新modem版本为 EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240628-1718
SnickerSun [Tue, 20 Aug 2024 11:24:33 +0000 (19:24 +0800)]
更新modem版本为 EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312_20240628-1718
python app 版本 PY_SRV_11

2 years agoMerge #742 into sdk602patch0626 from refs/changes/742/head 744/target/1 745/target/1
罗正 [Tue, 20 Aug 2024 11:14:49 +0000 (11:14 +0000)]
Merge #742 into sdk602patch0626 from refs/changes/742/head

Code review from 罗正

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

  - 1. 优化连接中的gif动画,由原来的20帧修改为现在的20帧

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

  - 修改连接动画为60帧

  - 添加手机同步歌曲到手表,手表音乐列表同步刷新。

  - 音乐列表刷新机制优化在每次切换到音乐列表刷新一次,list高度会根据歌曲数量自适应

  - 显示方式界面添加弧形列表样式,并添加对应资源

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

  - 倒计时界面配置多国语言

  - 1.运动识别弹窗根据弹窗汇总设置显示时长为10s,并添加震动
    2.修复开始按钮的视图Id

  - 倒计时界面优化修改

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

  - 倒计时优化修改

  - 倒计时配置多国语言

  - APPlist应用顺序按照KUMI已经重新排列,放入设置中的四个Slice暂未屏蔽等之后加入后再屏蔽

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

  - 1.音乐播放器在切换通道时添加主动连接和断开手机a2dp功能
    2.播放器添加连接动画,手表连接手机音乐超时时间设置为5s

  - 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/742
2 years agoMerge #743 into sdk602patch0626 from refs/changes/743/head
程羽飞 [Tue, 20 Aug 2024 11:11:10 +0000 (11:11 +0000)]
Merge #743 into sdk602patch0626 from refs/changes/743/head

Code review from 程羽飞

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

  - 更新睡眠监测模式判别接口;优化睡眠监测模式下相关功能

  - 添加注释

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

Signed-off-by: dingtalk_kaxuzp <2393524978@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/743
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 739/3 739/head
Caisking [Tue, 20 Aug 2024 10:52:01 +0000 (18:52 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago通过消息进行UI更新主界面状态显示
Caisking [Tue, 20 Aug 2024 10:51:55 +0000 (18:51 +0800)]
通过消息进行UI更新主界面状态显示

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 743/1 743/head
cheng [Tue, 20 Aug 2024 10:11:03 +0000 (18:11 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago添加注释
cheng [Tue, 20 Aug 2024 10:06:26 +0000 (18:06 +0800)]
添加注释

2 years agoMerge #740 into sdk602patch0626 from refs/changes/740/head 739/target/2 742/target/1 743/target/1
程羽飞 [Tue, 20 Aug 2024 10:06:09 +0000 (10:06 +0000)]
Merge #740 into sdk602patch0626 from refs/changes/740/head

更新睡眠监测模式判别接口;优化睡眠监测模式下相关功能

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

  - 更新睡眠监测模式判别接口;优化睡眠监测模式下相关功能

Signed-off-by: dingtalk_kaxuzp <2393524978@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/740
2 years ago修复异常造成mount user 分区失败问题 741/1 741/head
SnickerSun [Tue, 20 Aug 2024 10:01:33 +0000 (18:01 +0800)]
修复异常造成mount user 分区失败问题

2 years ago更新睡眠监测模式判别接口;优化睡眠监测模式下相关功能 740/1 740/head
cheng [Tue, 20 Aug 2024 09:54:59 +0000 (17:54 +0800)]
更新睡眠监测模式判别接口;优化睡眠监测模式下相关功能

2 years ago优化表盘状态管理接口 739/2
Caisking [Tue, 20 Aug 2024 09:44:36 +0000 (17:44 +0800)]
优化表盘状态管理接口

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 739/1
Caisking [Tue, 20 Aug 2024 09:22:14 +0000 (17:22 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化省电模式退出动效
Caisking [Tue, 20 Aug 2024 09:22:10 +0000 (17:22 +0800)]
优化省电模式退出动效

2 years ago优化卡片管理第一次初始化
Caisking [Tue, 20 Aug 2024 09:08:39 +0000 (17:08 +0800)]
优化卡片管理第一次初始化

2 years ago优化省电模式中充电退出逻辑
Caisking [Tue, 20 Aug 2024 09:08:04 +0000 (17:08 +0800)]
优化省电模式中充电退出逻辑

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 738/1 738/head 739/target/1 740/target/1 741/target/1
hcj [Tue, 20 Aug 2024 08:10:29 +0000 (16:10 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years agoMerge #737 into sdk602patch0626 from refs/changes/737/head 738/target/1
胡传军 [Tue, 20 Aug 2024 08:10:05 +0000 (08:10 +0000)]
Merge #737 into sdk602patch0626 from refs/changes/737/head

Code review from 胡传军

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

  - 电话单例修改

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

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/737
2 years ago增加在APP同步完数据后连接 pabp 操作
hcj [Tue, 20 Aug 2024 08:05:14 +0000 (16:05 +0800)]
增加在APP同步完数据后连接 pabp 操作

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 737/1 737/head
hcj [Tue, 20 Aug 2024 07:58:44 +0000 (15:58 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago电话单例修改
hcj [Tue, 20 Aug 2024 07:58:05 +0000 (15:58 +0800)]
电话单例修改

2 years ago优化睡眠监测,添加睡眠监测模式状态以及正在睡眠状态 736/1 736/head
penglei [Tue, 20 Aug 2024 07:54:18 +0000 (15:54 +0800)]
优化睡眠监测,添加睡眠监测模式状态以及正在睡眠状态

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Tue, 20 Aug 2024 07:42:50 +0000 (15:42 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 735/2 735/head 736/target/1 737/target/1
Caisking [Tue, 20 Aug 2024 07:34:26 +0000 (15:34 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago删除缓存文件
Caisking [Tue, 20 Aug 2024 07:34:18 +0000 (15:34 +0800)]
删除缓存文件

2 years ago删除不必要的注释 735/1
Caisking [Tue, 20 Aug 2024 07:19:37 +0000 (15:19 +0800)]
删除不必要的注释

2 years ago取消心率检测的超时处理
Caisking [Tue, 20 Aug 2024 07:16:53 +0000 (15:16 +0800)]
取消心率检测的超时处理

2 years ago调优卡片管理界面的表冠反应效果
Caisking [Tue, 20 Aug 2024 07:16:14 +0000 (15:16 +0800)]
调优卡片管理界面的表冠反应效果

2 years ago修复第一次卡片设置出现错误的卡片显示
Caisking [Tue, 20 Aug 2024 07:06:28 +0000 (15:06 +0800)]
修复第一次卡片设置出现错误的卡片显示

2 years ago电话UI修改 734/2 734/head 735/target/2
hcj [Tue, 20 Aug 2024 07:02:30 +0000 (15:02 +0800)]
电话UI修改

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 734/1
hcj [Tue, 20 Aug 2024 06:55:40 +0000 (14:55 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago电话bug修复
hcj [Tue, 20 Aug 2024 06:55:17 +0000 (14:55 +0800)]
电话bug修复

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Tue, 20 Aug 2024 06:48:37 +0000 (14:48 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Tue, 20 Aug 2024 06:32:15 +0000 (14:32 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago增加表盘管理状态:勿扰 睡眠 密码锁
Caisking [Tue, 20 Aug 2024 06:32:08 +0000 (14:32 +0800)]
增加表盘管理状态:勿扰 睡眠 密码锁

2 years ago灭屏修改亮度值;睡眠模式下不屏蔽闹钟 733/1 733/head 734/target/1 735/target/1
cheng [Tue, 20 Aug 2024 03:55:23 +0000 (11:55 +0800)]
灭屏修改亮度值;睡眠模式下不屏蔽闹钟

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
cheng [Tue, 20 Aug 2024 03:35:50 +0000 (11:35 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Tue, 20 Aug 2024 03:20:27 +0000 (11:20 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #731 into sdk602patch0626 from refs/changes/731/head 733/target/1
程羽飞 [Tue, 20 Aug 2024 03:18:48 +0000 (03:18 +0000)]
Merge #731 into sdk602patch0626 from refs/changes/731/head

统一部分接口;翻腕亮灭屏设置开关时同步使能功能

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

  - 统一部分接口;翻腕亮灭屏设置开关时同步使能功能

Signed-off-by: dingtalk_kaxuzp <2393524978@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/731
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 732/1 732/head
hcj [Tue, 20 Aug 2024 03:11:57 +0000 (11:11 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years agopabp服务添加
hcj [Tue, 20 Aug 2024 03:11:38 +0000 (11:11 +0800)]
pabp服务添加

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Tue, 20 Aug 2024 01:21:19 +0000 (09:21 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago统一部分接口;翻腕亮灭屏设置开关时同步使能功能 731/1 731/head
cheng [Mon, 19 Aug 2024 12:14:18 +0000 (20:14 +0800)]
统一部分接口;翻腕亮灭屏设置开关时同步使能功能

2 years ago临时添加按键relese事件日志,方便跟踪按键无法退回mainclock的问题 730/1 730/head 731/target/1 732/target/1
SnickerSun [Mon, 19 Aug 2024 11:53:58 +0000 (19:53 +0800)]
临时添加按键relese事件日志,方便跟踪按键无法退回mainclock的问题

2 years ago检查心率不停止 729/2 729/head 730/target/1
Caisking [Mon, 19 Aug 2024 11:31:19 +0000 (19:31 +0800)]
检查心率不停止

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

2 years ago优化主界面心率卡片;优化心率刷新
Caisking [Mon, 19 Aug 2024 11:20:05 +0000 (19:20 +0800)]
优化主界面心率卡片;优化心率刷新

2 years agoMerge #728 into sdk602patch0626 from refs/changes/728/head 729/target/1
罗正 [Mon, 19 Aug 2024 11:19:40 +0000 (11:19 +0000)]
Merge #728 into sdk602patch0626 from refs/changes/728/head

Code review from 罗正

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

  - 1. 优化连接中的gif动画,由原来的20帧修改为现在的20帧

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

  - 修改连接动画为60帧

  - 添加手机同步歌曲到手表,手表音乐列表同步刷新。

  - 音乐列表刷新机制优化在每次切换到音乐列表刷新一次,list高度会根据歌曲数量自适应

  - 显示方式界面添加弧形列表样式,并添加对应资源

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/728
2 years ago优化省电模式退出
Caisking [Mon, 19 Aug 2024 11:19:34 +0000 (19:19 +0800)]
优化省电模式退出

2 years agoMerge #726 into sdk602patch0626 from refs/changes/726/head
彭磊 [Mon, 19 Aug 2024 11:06:23 +0000 (11:06 +0000)]
Merge #726 into sdk602patch0626 from refs/changes/726/head

解决运动数据步幅为0的问题

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

  - 解决运动数据步幅为0的问题

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/726
2 years agosleep mode 727/1 727/head
cheng [Mon, 19 Aug 2024 08:40:59 +0000 (16:40 +0800)]
sleep mode