mirrors/FD230.git
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 884/1 884/head 885/target/1
penglei [Thu, 5 Sep 2024 11:07:07 +0000 (19:07 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化佩戴检测:小睡模式开启纯佩戴 睡眠模式开启活体佩戴 。
penglei [Thu, 5 Sep 2024 11:07:02 +0000 (19:07 +0800)]
优化佩戴检测:小睡模式开启纯佩戴 睡眠模式开启活体佩戴 。
纯佩戴检测Timer修改为5分钟。

2 years agoMerge #882 into sdk602patch0626 from refs/changes/882/head 884/target/1
罗正 [Thu, 5 Sep 2024 11:06:51 +0000 (11:06 +0000)]
Merge #882 into sdk602patch0626 from refs/changes/882/head

Code review from 罗正

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

  - 关闭a2dp连接的时候强制改变音乐播放器的音源,音乐来源只能通过用户设置才能切换

  - 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/882
2 years ago增加最新版手电筒功能(未完成部分:1.自定义颜色选择;2.保存设置的信息到config) 883/1 883/head
cheng [Thu, 5 Sep 2024 10:39:58 +0000 (18:39 +0800)]
增加最新版手电筒功能(未完成部分:1.自定义颜色选择;2.保存设置的信息到config)

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
cheng [Thu, 5 Sep 2024 10:35:19 +0000 (18:35 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #880 into sdk602patch0626 from refs/changes/880/head 882/target/1 883/target/1
彭磊 [Thu, 5 Sep 2024 10:27:28 +0000 (10:27 +0000)]
Merge #880 into sdk602patch0626 from refs/changes/880/head

Code review from 彭磊

* refs/changes/880/head: (11 commits squashed)

  - 更新dsp_main.bin 解决蓝牙通话音量小的问题

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/880
2 years ago#110,解决:手表,音乐,音乐来源选择手机后,切换到表盘界面,在回到音乐界面,音源图标会变为本地音源bug 881/1 881/head
luozheng [Thu, 5 Sep 2024 10:09:21 +0000 (18:09 +0800)]
#110,解决:手表,音乐,音乐来源选择手机后,切换到表盘界面,在回到音乐界面,音源图标会变为本地音源bug

2 years ago更新dsp_main.bin 解决蓝牙通话音量小的问题 880/1 880/head
penglei [Thu, 5 Sep 2024 10:00:10 +0000 (18:00 +0800)]
更新dsp_main.bin 解决蓝牙通话音量小的问题

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
cheng [Thu, 5 Sep 2024 09:28:16 +0000 (17:28 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Thu, 5 Sep 2024 08:50:24 +0000 (16:50 +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 [Thu, 5 Sep 2024 08:44:06 +0000 (16:44 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 879/1 879/head 880/target/1 881/target/1
luozheng [Thu, 5 Sep 2024 08:36:51 +0000 (16:36 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago多国语言文件更新:包含手电筒,表盘,蓝牙耳机各个界面的多国语言配置
luozheng [Thu, 5 Sep 2024 08:36:45 +0000 (16:36 +0800)]
多国语言文件更新:包含手电筒,表盘,蓝牙耳机各个界面的多国语言配置
蓝牙耳机界面的连接成功和失败弹窗添加多国语言

2 years agoMerge #877 into sdk602patch0626 from refs/changes/877/head 879/target/1
袁清梦 [Thu, 5 Sep 2024 08:03:11 +0000 (08:03 +0000)]
Merge #877 into sdk602patch0626 from refs/changes/877/head

Code review from 袁清梦

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

  - #455运动准备界面,运动名称往上移一点,所有的运动界面都这样

  - #475设置-跟换表盘 开关按钮太大,全是黑色背景没有区分框

  - #414手表,睡眠,作息时间,时间字体颜色需要变更为一致

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

  - 修复nextday的消息发送

  - 修改心率周期检测频率为30min

  - 取消多余的遥控拍照的资源释放

  - 修复省电模式的电池框资源路径

  - 增加血氧数据的nextday清空以及UI更新

  - 增加心率血氧 健康数据的nextday清空接口

  - 删除applist的心率值的notify 统一由model管理

  - 增加心率数据的nextday清空以及UI更新

  - nextday进行睡眠数据,心率数据,血氧数据管理更新

  - 心率增加0数据传递,报0显示“--“

  - 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/877
2 years agoMerge #876 into sdk602patch0626 from refs/changes/876/head
程羽飞 [Thu, 5 Sep 2024 07:44:41 +0000 (07:44 +0000)]
Merge #876 into sdk602patch0626 from refs/changes/876/head

Code review from 程羽飞

* refs/changes/876/head: (4 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

  - 解决APP同步闹钟异常、移除默认内置闹钟、增加第一个闹钟可删除功能

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/876
2 years agoMerge #875 into sdk602patch0626 from refs/changes/875/head
彭磊 [Thu, 5 Sep 2024 07:41:07 +0000 (07:41 +0000)]
Merge #875 into sdk602patch0626 from refs/changes/875/head

Code review from 彭磊

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

  - 修复BUG #551 &quot;运动,放桌子上不动,卡路里会增加&quot;

  - 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 &quot;天气 JSON解析错误 导致系统开机死机&quot;

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

  - 适配 DS_ZB25LQ128C_HRT NORFLASH

  - cywee更改为DML分离模式 ,优化睡眠模式绝对静止处理
    优化睡眠数据文件存储
    修改蓝牙广播间隔为150
    修复BUG #463 &quot;血氧脱腕测量提示响应慢,脱腕很久才会提示&quot;

  - Merge branch &#39;sdk602patch0626&#39; 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/875
2 years ago修复button release可能不上报的问题 878/1 878/head
SnickerSun [Thu, 5 Sep 2024 07:34:59 +0000 (15:34 +0800)]
修复button release可能不上报的问题

2 years ago解决APP同步闹钟异常、移除默认内置闹钟、增加第一个闹钟可删除功能 876/1 876/head
cheng [Thu, 5 Sep 2024 07:12:08 +0000 (15:12 +0800)]
解决APP同步闹钟异常、移除默认内置闹钟、增加第一个闹钟可删除功能

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
cheng [Thu, 5 Sep 2024 06:59:52 +0000 (14:59 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 875/1 875/head
penglei [Thu, 5 Sep 2024 03:42:06 +0000 (11:42 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agocywee更改为DML分离模式 ,优化睡眠模式绝对静止处理
penglei [Thu, 5 Sep 2024 03:41:55 +0000 (11:41 +0800)]
cywee更改为DML分离模式 ,优化睡眠模式绝对静止处理
优化睡眠数据文件存储
修改蓝牙广播间隔为150
修复BUG #463 "血氧脱腕测量提示响应慢,脱腕很久才会提示"

2 years ago界面退出改为按键按下 874/1 874/head 875/target/1 876/target/1 877/target/1 878/target/1
luozheng [Thu, 5 Sep 2024 02:01:23 +0000 (10:01 +0800)]
界面退出改为按键按下

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Thu, 5 Sep 2024 01:39:42 +0000 (09:39 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago蓝牙耳机基本修改完成 871/1 871/head
luozheng [Wed, 4 Sep 2024 12:26:10 +0000 (20:26 +0800)]
蓝牙耳机基本修改完成

2 years agorelease V1.1.42 873/1 873/head 874/target/1
SnickerSun [Wed, 4 Sep 2024 09:51:40 +0000 (17:51 +0800)]
release V1.1.42

2 years agoMerge #871 into sdk602patch0626 from refs/changes/871/head 873/target/1
罗正 [Wed, 4 Sep 2024 14:00:40 +0000 (14:00 +0000)]
Merge #871 into sdk602patch0626 from refs/changes/871/head

蓝牙耳机基本修改完成

* refs/changes/871/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/871
2 years ago添加客户提供的铃声资源文件/music/ring/ring.mp3 872/1 872/head
SnickerSun [Wed, 4 Sep 2024 09:48:50 +0000 (17:48 +0800)]
添加客户提供的铃声资源文件/music/ring/ring.mp3

2 years ago解决 user 离线日志版本编译问题
SnickerSun [Wed, 4 Sep 2024 09:48:10 +0000 (17:48 +0800)]
解决 user 离线日志版本编译问题

2 years agoMerge #870 into sdk602patch0626 from refs/changes/870/head 872/target/1
袁清梦 [Wed, 4 Sep 2024 13:21:32 +0000 (13:21 +0000)]
Merge #870 into sdk602patch0626 from refs/changes/870/head

Code review from 袁清梦

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

  - #455运动准备界面,运动名称往上移一点,所有的运动界面都这样

  - #475设置-跟换表盘 开关按钮太大,全是黑色背景没有区分框

  - #414手表,睡眠,作息时间,时间字体颜色需要变更为一致

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/870
2 years agoMerge #868 into sdk602patch0626 from refs/changes/868/head
彭磊 [Wed, 4 Sep 2024 13:18:16 +0000 (13:18 +0000)]
Merge #868 into sdk602patch0626 from refs/changes/868/head

Code review from 彭磊

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

  - 修复BUG #551 &quot;运动,放桌子上不动,卡路里会增加&quot;

  - 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 &quot;天气 JSON解析错误 导致系统开机死机&quot;

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

  - 适配 DS_ZB25LQ128C_HRT NORFLASH

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/868
2 years ago移动入库版本号更改为固定Watch Soar V1.0 869/2 869/head
DXY [Wed, 4 Sep 2024 08:42:24 +0000 (16:42 +0800)]
移动入库版本号更改为固定Watch Soar V1.0

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
cheng [Wed, 4 Sep 2024 06:32:18 +0000 (14:32 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago适配 DS_ZB25LQ128C_HRT NORFLASH 868/2 868/head
penglei [Wed, 4 Sep 2024 03:52:36 +0000 (11:52 +0800)]
适配 DS_ZB25LQ128C_HRT NORFLASH

2 years ago优化CAT1文件传输 869/1
DXY [Wed, 4 Sep 2024 03:23:42 +0000 (11:23 +0800)]
优化CAT1文件传输

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 868/1
penglei [Wed, 4 Sep 2024 02:41:11 +0000 (10:41 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修复BUG "天气 JSON解析错误 导致系统开机死机"
penglei [Wed, 4 Sep 2024 02:40:59 +0000 (10:40 +0800)]
修复BUG "天气 JSON解析错误 导致系统开机死机"

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 867/1 867/head 868/target/1 869/target/1 870/target/1 871/target/1
luozheng [Tue, 3 Sep 2024 12:38:58 +0000 (20:38 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago音乐蓝牙连接失败视图优化修改:视图中添加蓝牙耳机名称
luozheng [Tue, 3 Sep 2024 12:38:52 +0000 (20:38 +0800)]
音乐蓝牙连接失败视图优化修改:视图中添加蓝牙耳机名称

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Tue, 3 Sep 2024 11:59:45 +0000 (19:59 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agorelease V1.1.41 866/1 866/head 867/target/1
SnickerSun [Tue, 3 Sep 2024 11:49:58 +0000 (19:49 +0800)]
release V1.1.41

2 years agoMerge #865 into sdk602patch0626 from refs/changes/865/head 866/target/1
彭磊 [Tue, 3 Sep 2024 11:47:51 +0000 (11:47 +0000)]
Merge #865 into sdk602patch0626 from refs/changes/865/head

Code review from 彭磊

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

  - 修复BUG #551 &quot;运动,放桌子上不动,卡路里会增加&quot;

  - Merge branch &#39;sdk602patch0626&#39; 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/865
2 years ago切换手机音乐取消主动去连接a2dp 864/3 864/head
luozheng [Tue, 3 Sep 2024 11:40:04 +0000 (19:40 +0800)]
切换手机音乐取消主动去连接a2dp

2 years ago音乐界面优化,调整了蓝牙耳机连接状态标签的字体大小与figma一致 864/2
luozheng [Tue, 3 Sep 2024 11:08:14 +0000 (19:08 +0800)]
音乐界面优化,调整了蓝牙耳机连接状态标签的字体大小与figma一致
蓝牙耳机 :搜索设备界面动画修改为figma一致

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 865/1 865/head
penglei [Tue, 3 Sep 2024 10:19:41 +0000 (18:19 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修复BUG #551 "运动,放桌子上不动,卡路里会增加"
penglei [Tue, 3 Sep 2024 10:19:29 +0000 (18:19 +0800)]
修复BUG #551 "运动,放桌子上不动,卡路里会增加"

2 years ago增加天气card回退索引 864/1
luozheng [Tue, 3 Sep 2024 10:08:04 +0000 (18:08 +0800)]
增加天气card回退索引

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Tue, 3 Sep 2024 09:51:54 +0000 (17: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... 863/2 863/head 864/target/1 865/target/1
Caisking [Tue, 3 Sep 2024 09:35:37 +0000 (17:35 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago增加previousCardId成员变量;增加心率卡片到其他Slice关闭心率检测
Caisking [Tue, 3 Sep 2024 09:34:52 +0000 (17:34 +0800)]
增加previousCardId成员变量;增加心率卡片到其他Slice关闭心率检测

2 years ago重命名MMC5603为CUSTOM_MMC5603 解决与DML新版本库编译冲突问题。(补) 862/3 862/head 863/target/2
penglei [Tue, 3 Sep 2024 09:17:45 +0000 (17:17 +0800)]
重命名MMC5603为CUSTOM_MMC5603 解决与DML新版本库编译冲突问题。(补)

2 years ago更新cywee dml 版本为2.20.0.0 。 862/2
penglei [Tue, 3 Sep 2024 08:44:49 +0000 (16:44 +0800)]
更新cywee dml 版本为2.20.0.0 。
重命名MMC5603为CUSTOM_MMC5603 解决与DML新版本库编译冲突问题。

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 863/1
Caisking [Tue, 3 Sep 2024 08:40:58 +0000 (16:40 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化主界面card管理;增加睡眠card回退索引
Caisking [Tue, 3 Sep 2024 08:40:10 +0000 (16:40 +0800)]
优化主界面card管理;增加睡眠card回退索引

2 years ago优化睡眠card处理
Caisking [Tue, 3 Sep 2024 08:39:33 +0000 (16:39 +0800)]
优化睡眠card处理

2 years ago修改睡眠状态存储数组长度为50,添加AT指令打印睡眠存储信息 862/1
penglei [Tue, 3 Sep 2024 08:20:46 +0000 (16:20 +0800)]
修改睡眠状态存储数组长度为50,添加AT指令打印睡眠存储信息
about watch 添加cywee算法版本

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Tue, 3 Sep 2024 08:18:51 +0000 (16:18 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago手机音乐和手表音乐切换添加动画
luozheng [Tue, 3 Sep 2024 08:18:41 +0000 (16:18 +0800)]
手机音乐和手表音乐切换添加动画

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

2 years ago解决:音乐处于手机音乐播放歌曲,手表重启,会默认恢复为手表音乐,但是这时候手机点击播放,手表会发出声音bug #473
luozheng [Tue, 3 Sep 2024 03:53:59 +0000 (11:53 +0800)]
解决:音乐处于手机音乐播放歌曲,手表重启,会默认恢复为手表音乐,但是这时候手机点击播放,手表会发出声音bug #473

2 years ago增加key事件监控打印
Caisking [Tue, 3 Sep 2024 03:39:22 +0000 (11:39 +0800)]
增加key事件监控打印

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 861/1 861/head 862/target/1 863/target/1
hcj [Tue, 3 Sep 2024 03:12:28 +0000 (11:12 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago修复#567
hcj [Tue, 3 Sep 2024 03:12:03 +0000 (11:12 +0800)]
修复#567

2 years ago解决:手表音乐,播放中,点击音量再退出和点击音乐模式按钮,播放中的音乐会被暂停,播放进度会重新开始bug #590
luozheng [Tue, 3 Sep 2024 03:03:03 +0000 (11:03 +0800)]
解决:手表音乐,播放中,点击音量再退出和点击音乐模式按钮,播放中的音乐会被暂停,播放进度会重新开始bug #590

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Tue, 3 Sep 2024 02:37:37 +0000 (10:37 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago解決:蓝牙服务界面开关加载动画可以手动上下滑动bug #383
luozheng [Tue, 3 Sep 2024 02:37:30 +0000 (10:37 +0800)]
解決:蓝牙服务界面开关加载动画可以手动上下滑动bug #383

2 years ago屏蔽睡眠时间戳为0的数据不做字符串处理 860/3 860/head 861/target/1
Caisking [Tue, 3 Sep 2024 02:20:04 +0000 (10:20 +0800)]
屏蔽睡眠时间戳为0的数据不做字符串处理

2 years ago修复睡眠进度条显示异常 860/2
Caisking [Tue, 3 Sep 2024 02:05:07 +0000 (10:05 +0800)]
修复睡眠进度条显示异常

2 years ago修复下拉电池框与自定义表盘电池框显示 860/1
Caisking [Tue, 3 Sep 2024 01:58:04 +0000 (09:58 +0800)]
修复下拉电池框与自定义表盘电池框显示

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Tue, 3 Sep 2024 01:41:55 +0000 (09:41 +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 [Tue, 3 Sep 2024 01:21:29 +0000 (09:21 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 859/1 859/head 860/target/1
SnickerSun [Mon, 2 Sep 2024 12:56:08 +0000 (20:56 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago时间变更,同时更新 NEXTDAY alarm。防止消息不正确造成的午夜计步重置失效。 858/2
SnickerSun [Mon, 2 Sep 2024 12:54:53 +0000 (20:54 +0800)]
时间变更,同时更新 NEXTDAY alarm。防止消息不正确造成的午夜计步重置失效。

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Mon, 2 Sep 2024 12:52:41 +0000 (20:52 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agorelease V1.1.40 858/1 858/3 858/head 859/target/1
SnickerSun [Mon, 2 Sep 2024 12:49:34 +0000 (20:49 +0800)]
release V1.1.40

2 years agoMerge #857 into sdk602patch0626 from refs/changes/857/head 858/target/1
罗正 [Mon, 2 Sep 2024 12:48:55 +0000 (12:48 +0000)]
Merge #857 into sdk602patch0626 from refs/changes/857/head

Code review from 罗正

* refs/changes/857/head: (27 commits squashed)

  - 秒表界面计数条数去掉数字0

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

  - 1.倒计时界面取消长亮屏,并在倒计时结束时添加一个亮屏5s操作
    2.优化自定义倒计时时间总时长文字不居中

  - 解决闹钟界面右滑容易退出问题

  - 补交闹钟少提交文件

  - 倒计时界面使用%02d解决计数少于两位数补零

  - 闹钟退出逻辑改为OnDragEnd

  - 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

  - 修复下拉界面关闭4g开关,而4G开关界面中没有同步关闭问题  #406

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

  - 天气动画改为Imageinfo保存和释放

  - AI语音优化修改:
    1.动画改为imageinfo创建和释放改善内存泄漏
    2.添加对应回应类型的错误弹窗

  - 查找手机和配对动画改成Imageinfo减少内存泄漏

  - 开机动画使用Imageinfo创建和释放,解决动画内存泄漏

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

  - 查找手机界面屏蔽未连接界面,与figma上设计统一

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

  - 查找手机界面UI优化,解决内存泄漏

  - 录音界面添加录音超出限制提醒弹窗,录音排序待优化

  - 绑定动画资源添加

  - 配对弹窗优化,添加一个动画,并适配多国语言

  - 解绑弹窗UI优化修改,适配多国语言

  - 解绑确认弹窗添加,并添加对应多国语言资源

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

  - 通过设置图像大小为固定为视图大小。解决在拖动scrolView过程中动画上下移动问题

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/857
2 years ago#561手表,未绑定时,放置在不平整的面上,心率测量灯也会定期测量, 855/2 855/head
Caisking [Mon, 2 Sep 2024 12:15:01 +0000 (20:15 +0800)]
#561手表,未绑定时,放置在不平整的面上,心率测量灯也会定期测量,

2 years ago通过设置图像大小为固定为视图大小。解决在拖动scrolView过程中动画上下移动问题 857/1 857/head
luozheng [Mon, 2 Sep 2024 12:07:37 +0000 (20:07 +0800)]
通过设置图像大小为固定为视图大小。解决在拖动scrolView过程中动画上下移动问题

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Mon, 2 Sep 2024 12:04:12 +0000 (20:04 +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 [Mon, 2 Sep 2024 11:48:27 +0000 (19:48 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修复bug#331 隔天计步不清零 855/target/2 856/1 856/head 857/target/1
SnickerSun [Mon, 2 Sep 2024 11:42:23 +0000 (19:42 +0800)]
修复bug#331 隔天计步不清零

2 years ago关闭消息index打印 855/1
Caisking [Mon, 2 Sep 2024 11:41:56 +0000 (19:41 +0800)]
关闭消息index打印

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

2 years ago#461 表盘,消息红点提示下面有遮挡,未显示全
Caisking [Mon, 2 Sep 2024 11:37:39 +0000 (19:37 +0800)]
#461 表盘,消息红点提示下面有遮挡,未显示全

2 years ago#594 APP iOS 表盘下载安装后,已安装表盘只显示默认五个表盘
Caisking [Mon, 2 Sep 2024 10:55:06 +0000 (18:55 +0800)]
#594 APP iOS 表盘下载安装后,已安装表盘只显示默认五个表盘

2 years ago#191KUMU表盘,时间显示不居中;#461表盘,消息红点提示下面有遮挡,未显示全
Caisking [Mon, 2 Sep 2024 10:48:05 +0000 (18:48 +0800)]
#191KUMU表盘,时间显示不居中;#461表盘,消息红点提示下面有遮挡,未显示全

2 years agoMerge #853 into sdk602patch0626 from refs/changes/853/head 855/target/1 856/target/1
胡传军 [Mon, 2 Sep 2024 10:32:24 +0000 (10:32 +0000)]
Merge #853 into sdk602patch0626 from refs/changes/853/head

Code review from 胡传军

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

  - 修改动画出现的内存泄漏

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

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

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

  - 修改拨打电话,通讯录,UI显示

  - 修复#487 #485 #520 #498 #496

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/853
2 years agoMerge #851 into sdk602patch0626 from refs/changes/851/head
程羽飞 [Mon, 2 Sep 2024 10:30:39 +0000 (10:30 +0000)]
Merge #851 into sdk602patch0626 from refs/changes/851/head

闹钟增加点击时间进入编辑和左滑按钮删除功能

* refs/changes/851/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/851
2 years agoMerge #854 into sdk602patch0626 from refs/changes/854/head
罗正 [Mon, 2 Sep 2024 10:25:59 +0000 (10:25 +0000)]
Merge #854 into sdk602patch0626 from refs/changes/854/head

Code review from 罗正

* refs/changes/854/head: (25 commits squashed)

  - 秒表界面计数条数去掉数字0

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

  - 1.倒计时界面取消长亮屏,并在倒计时结束时添加一个亮屏5s操作
    2.优化自定义倒计时时间总时长文字不居中

  - 解决闹钟界面右滑容易退出问题

  - 补交闹钟少提交文件

  - 倒计时界面使用%02d解决计数少于两位数补零

  - 闹钟退出逻辑改为OnDragEnd

  - 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

  - 修复下拉界面关闭4g开关,而4G开关界面中没有同步关闭问题  #406

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

  - 天气动画改为Imageinfo保存和释放

  - AI语音优化修改:
    1.动画改为imageinfo创建和释放改善内存泄漏
    2.添加对应回应类型的错误弹窗

  - 查找手机和配对动画改成Imageinfo减少内存泄漏

  - 开机动画使用Imageinfo创建和释放,解决动画内存泄漏

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

  - 查找手机界面屏蔽未连接界面,与figma上设计统一

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

  - 查找手机界面UI优化,解决内存泄漏

  - 录音界面添加录音超出限制提醒弹窗,录音排序待优化

  - 绑定动画资源添加

  - 配对弹窗优化,添加一个动画,并适配多国语言

  - 解绑弹窗UI优化修改,适配多国语言

  - 解绑确认弹窗添加,并添加对应多国语言资源

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/854
2 years ago调整电池资源文件;增加黑色电池框
Caisking [Mon, 2 Sep 2024 10:04:51 +0000 (18:04 +0800)]
调整电池资源文件;增加黑色电池框

2 years ago解绑确认弹窗添加,并添加对应多国语言资源 854/1 854/head
luozheng [Mon, 2 Sep 2024 09:43:47 +0000 (17:43 +0800)]
解绑确认弹窗添加,并添加对应多国语言资源

2 years ago修复#487 #485 #520 #498 #496 853/2 853/head
hcj [Mon, 2 Sep 2024 09:38:00 +0000 (17:38 +0800)]
修复#487 #485 #520 #498 #496

2 years ago修改拨打电话,通讯录,UI显示 853/1
hcj [Mon, 2 Sep 2024 09:34:01 +0000 (17:34 +0800)]
修改拨打电话,通讯录,UI显示

2 years ago修复自定义表盘读取配置异常bug
Caisking [Mon, 2 Sep 2024 08:58:50 +0000 (16:58 +0800)]
修复自定义表盘读取配置异常bug

2 years ago修复密码锁icon显示不透明
Caisking [Mon, 2 Sep 2024 08:58:19 +0000 (16:58 +0800)]
修复密码锁icon显示不透明

2 years ago解绑弹窗UI优化修改,适配多国语言
luozheng [Mon, 2 Sep 2024 07:45:03 +0000 (15:45 +0800)]
解绑弹窗UI优化修改,适配多国语言

2 years ago屏蔽训练中的佩戴检测;减少训练卡顿
Caisking [Mon, 2 Sep 2024 07:25:19 +0000 (15:25 +0800)]
屏蔽训练中的佩戴检测;减少训练卡顿

2 years ago配对弹窗优化,添加一个动画,并适配多国语言
luozheng [Mon, 2 Sep 2024 07:03:09 +0000 (15:03 +0800)]
配对弹窗优化,添加一个动画,并适配多国语言

2 years ago移动、电信入库软件要求 版本号固定 852/1 852/head
SnickerSun [Mon, 2 Sep 2024 06:56:07 +0000 (14:56 +0800)]
移动、电信入库软件要求 版本号固定

2 years ago绑定动画资源添加
luozheng [Mon, 2 Sep 2024 04:00:48 +0000 (12:00 +0800)]
绑定动画资源添加

2 years ago闹钟增加点击时间进入编辑和左滑按钮删除功能 851/1 851/head
cheng [Mon, 2 Sep 2024 03:57:51 +0000 (11:57 +0800)]
闹钟增加点击时间进入编辑和左滑按钮删除功能