mirrors/FD230.git
2 years ago修复天气json数据异常导致的死机问题(补) 1005/3
hcj [Tue, 24 Sep 2024 02:18:33 +0000 (10:18 +0800)]
修复天气json数据异常导致的死机问题(补)

2 years ago修复天气json数据异常导致的死机问题,更改sos协议,更改语言切换逻辑 1005/2
hcj [Tue, 24 Sep 2024 01:53:50 +0000 (09:53 +0800)]
修复天气json数据异常导致的死机问题,更改sos协议,更改语言切换逻辑

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1005/1
hcj [Mon, 23 Sep 2024 02:25:53 +0000 (10:25 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago修复蓝牙通话死机问题
hcj [Mon, 23 Sep 2024 02:25:22 +0000 (10:25 +0800)]
修复蓝牙通话死机问题

2 years ago添加drag控制指令,灵活控制UI X和Y的drag条件,可动态开启和关闭drag指令 1004/1 1004/head 1005/target/1 1006/target/1 1007/target/1 1008/target/1
SnickerSun [Sun, 22 Sep 2024 13:16:02 +0000 (21:16 +0800)]
添加drag控制指令,灵活控制UI X和Y的drag条件,可动态开启和关闭drag指令

2 years agorelease V1.1.53 1003/1 1003/head 1004/target/1
SnickerSun [Sat, 21 Sep 2024 14:09:01 +0000 (22:09 +0800)]
release V1.1.53

2 years agoMerge #999 into sdk602patch0626 from refs/changes/999/head 1003/target/1
袁清梦 [Sat, 21 Sep 2024 11:21:56 +0000 (11:21 +0000)]
Merge #999 into sdk602patch0626 from refs/changes/999/head

Code review from 袁清梦

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

  - 修改心率曲线图Y轴数字

  - #144 手表,心率测量开始测量的时候显示的心率值太大,需要优化开始显示的心率值

  - #678 心率初始出值不稳定,偏差太大。

  - #560 运动,徒步运动设置目标1KM,实际放桌子上未动,提示我目标达成

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/999
2 years agoMerge #1001 into sdk602patch0626 from refs/changes/1001/head
罗正 [Sat, 21 Sep 2024 11:21:06 +0000 (11:21 +0000)]
Merge #1001 into sdk602patch0626 from refs/changes/1001/head

Code review from 罗正

* refs/changes/1001/head: (30 commits squashed)

  - #524,解决:录音删除,删除后不是返回到录音列表界面,返回的是录音界面bug
    #658,解决,手表,录音频繁点击会有蓝色效果

  - #656,解决,手表,闹钟偶现0000闹钟提醒bug

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

  - 4G界面添加“注:启用4G,可能会加速消耗电量”提醒

  -  运动识别界面添加提醒标签,#192,解决,运动识别界面单一bug

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

  - 根据禅道上期望:APP查找手表和闹钟,勿扰睡眠静音模式下都有响铃和震动提醒
    #421解决, 睡眠模式,闹钟无响铃震动bug

  - 解决静音模式错误开启后会全局静音bug,根据禅道期望“来电铃声、短信消息提醒,勿扰睡眠静音模式下只有亮屏提醒”

  - #717,解决,设置界面向上滑有黑色空白,需优化bug

  - 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

  - #716,解决,设置屏幕与亮度界面右滑返回上一级界面,有上下晃动,优化退出晃动bug

  - #720,解决,手表默认通话音量过小,手表是恢复出厂设置后查看的bug

  - 修复msg_senter关于喝水提醒被覆盖代码

  - 1.添加APP在调节系统音量时候若当前界面在音乐的的声音调节视图则ui同步显示设置的音量值。
    2.解决音乐从本地音乐切换到手机音乐在切换到本地音乐切换不回来bug

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

  - 解决#748,关于手表界面,编码器旋转不起作用bug

  - 关机,恢复出厂增加震动效果,开机的震动还未加,震动强度会受设置中影响

  - #176,解决,4G能力开关名称修改成4G网络,界面单一bug

  - 1.解决语言界面内存泄漏问题
    2.解决.#741语言选择界面上滑时底部会有黑边,使用编码器时无此情况bug
    3.解决系统界面的内存泄漏问题,并使用一个辅助组件解决系统视图最后一个按钮被则挡住bug

  - 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

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

  - #747,解决声音与震动,显示方式,系统界面 下拉后无法恢复到原位置,有向下偏移bug

  - 解决设置视图右滑难退出问题

  - #575,解决,Al 安卓 文心一言 手表端不输出结果,手机输出结果bug,原因为文件路径不存在问题

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

  -  #217,解决,本地音乐选择手机音乐,手表在播放手机端的音乐时,调节手表端音量不起作用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/1001
2 years agoMerge #1002 into sdk602patch0626 from refs/changes/1002/head
胡传军 [Sat, 21 Sep 2024 11:17:12 +0000 (11:17 +0000)]
Merge #1002 into sdk602patch0626 from refs/changes/1002/head

Code review from 胡传军

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

  - 修复同步实时运动数据存在的BUG

  - 蓝牙文件取消传输修改

  - 电话bug综合修复

  - 电话bug综合修复(补)

  - 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/1002
2 years ago修复电话死机问题 1002/1 1002/head
hcj [Sat, 21 Sep 2024 11:07:10 +0000 (19:07 +0800)]
修复电话死机问题

2 years ago添加录音回环测试(补交),优化睡眠数据时间戳计算 1000/1 1000/head
penglei [Sat, 21 Sep 2024 10:01:46 +0000 (18:01 +0800)]
添加录音回环测试(补交),优化睡眠数据时间戳计算

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

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Sat, 21 Sep 2024 09:39:47 +0000 (17:39 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago关闭不必要的打印 1000/target/1 1001/target/1 1002/target/1 998/1 998/head 999/target/1
Caisking [Sat, 21 Sep 2024 06:33:32 +0000 (14:33 +0800)]
关闭不必要的打印

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Sat, 21 Sep 2024 06:28:00 +0000 (14:28 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago修改心率Slice的动画
Caisking [Sat, 21 Sep 2024 06:27:56 +0000 (14:27 +0800)]
修改心率Slice的动画

2 years agoMerge #996 into sdk602patch0626 from refs/changes/996/head 998/target/1
胡传军 [Sat, 21 Sep 2024 04:47:31 +0000 (04:47 +0000)]
Merge #996 into sdk602patch0626 from refs/changes/996/head

修复同步实时运动数据存在的BUG

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

  - 修复同步实时运动数据存在的BUG

  - 蓝牙文件取消传输修改

  - 电话bug综合修复

  - 电话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/996
2 years agoMerge #992 into sdk602patch0626 from refs/changes/992/head
罗正 [Sat, 21 Sep 2024 04:44:04 +0000 (04:44 +0000)]
Merge #992 into sdk602patch0626 from refs/changes/992/head

Code review from 罗正

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

  - #524,解决:录音删除,删除后不是返回到录音列表界面,返回的是录音界面bug
    #658,解决,手表,录音频繁点击会有蓝色效果

  - #656,解决,手表,闹钟偶现0000闹钟提醒bug

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

  - 4G界面添加“注:启用4G,可能会加速消耗电量”提醒

  -  运动识别界面添加提醒标签,#192,解决,运动识别界面单一bug

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

  - 根据禅道上期望:APP查找手表和闹钟,勿扰睡眠静音模式下都有响铃和震动提醒
    #421解决, 睡眠模式,闹钟无响铃震动bug

  - 解决静音模式错误开启后会全局静音bug,根据禅道期望“来电铃声、短信消息提醒,勿扰睡眠静音模式下只有亮屏提醒”

  - #717,解决,设置界面向上滑有黑色空白,需优化bug

  - 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

  - #716,解决,设置屏幕与亮度界面右滑返回上一级界面,有上下晃动,优化退出晃动bug

  - #720,解决,手表默认通话音量过小,手表是恢复出厂设置后查看的bug

  - 修复msg_senter关于喝水提醒被覆盖代码

  - 1.添加APP在调节系统音量时候若当前界面在音乐的的声音调节视图则ui同步显示设置的音量值。
    2.解决音乐从本地音乐切换到手机音乐在切换到本地音乐切换不回来bug

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

  - 解决#748,关于手表界面,编码器旋转不起作用bug

  - 关机,恢复出厂增加震动效果,开机的震动还未加,震动强度会受设置中影响

  - #176,解决,4G能力开关名称修改成4G网络,界面单一bug

  - 1.解决语言界面内存泄漏问题
    2.解决.#741语言选择界面上滑时底部会有黑边,使用编码器时无此情况bug
    3.解决系统界面的内存泄漏问题,并使用一个辅助组件解决系统视图最后一个按钮被则挡住bug

  - 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

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

  - #747,解决声音与震动,显示方式,系统界面 下拉后无法恢复到原位置,有向下偏移bug

  - 解决设置视图右滑难退出问题

  - #575,解决,Al 安卓 文心一言 手表端不输出结果,手机输出结果bug,原因为文件路径不存在问题

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/992
2 years ago#713 省电模式电量图标显示需要优化 997/4 997/head
Caisking [Sat, 21 Sep 2024 03:40:21 +0000 (11:40 +0800)]
#713 省电模式电量图标显示需要优化

2 years ago#137 手表,电量100%充满时,显示已充满 997/3
Caisking [Sat, 21 Sep 2024 02:49:16 +0000 (10:49 +0800)]
#137 手表,电量100%充满时,显示已充满

2 years ago#256 手表,充电满,充电显示100%,充电进度条显示不准
Caisking [Sat, 21 Sep 2024 02:48:37 +0000 (10:48 +0800)]
#256 手表,充电满,充电显示100%,充电进度条显示不准

2 years ago电话bug综合修复(补) 996/4 996/head
hcj [Sat, 21 Sep 2024 02:30:28 +0000 (10:30 +0800)]
电话bug综合修复(补)

2 years ago修复主界面心率卡片新动画的析构 997/2
Caisking [Sat, 21 Sep 2024 02:30:03 +0000 (10:30 +0800)]
修复主界面心率卡片新动画的析构

2 years ago#378 充电图标绿色圆圈有凸起
Caisking [Sat, 21 Sep 2024 02:29:45 +0000 (10:29 +0800)]
#378 充电图标绿色圆圈有凸起

2 years ago电话bug综合修复 996/3
hcj [Sat, 21 Sep 2024 02:26:29 +0000 (10:26 +0800)]
电话bug综合修复

2 years ago#768 运动界面,详细数据界面背景虚化,上下滑动有重影 997/1
Caisking [Fri, 20 Sep 2024 13:03:36 +0000 (21:03 +0800)]
#768 运动界面,详细数据界面背景虚化,上下滑动有重影

2 years ago修改心率的刷新配置;防止在后台进行UI刷新
Caisking [Fri, 20 Sep 2024 12:57:28 +0000 (20:57 +0800)]
修改心率的刷新配置;防止在后台进行UI刷新

2 years ago#449 运动超过五分钟提示运动量小,无法记录
Caisking [Fri, 20 Sep 2024 12:56:51 +0000 (20:56 +0800)]
#449 运动超过五分钟提示运动量小,无法记录

2 years ago#782 AIGC表盘电量图标
Caisking [Fri, 20 Sep 2024 12:51:04 +0000 (20:51 +0800)]
#782 AIGC表盘电量图标

2 years ago蓝牙文件取消传输修改 996/2
hcj [Fri, 20 Sep 2024 08:37:23 +0000 (16:37 +0800)]
蓝牙文件取消传输修改

2 years ago修复同步实时运动数据存在的BUG 996/1
hcj [Fri, 20 Sep 2024 06:46:36 +0000 (14:46 +0800)]
修复同步实时运动数据存在的BUG

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

2 years agoRevert "修改心率的显示最大最小值为实际值" 992/target/2 995/1 995/head 996/target/1 997/target/1
SnickerSun [Fri, 20 Sep 2024 04:04:53 +0000 (12:04 +0800)]
Revert "修改心率的显示最大最小值为实际值"

This reverts commit 9df02a668cc4579c5af24c5bf9be75cabab01b00.

2 years agoRevert "分区表配置修改,修正0911 patch不能下载问题。" 993/1 993/head 995/target/1
SnickerSun [Fri, 20 Sep 2024 00:39:03 +0000 (08:39 +0800)]
Revert "分区表配置修改,修正0911 patch不能下载问题。"

This reverts commit 1e6c77482576e45df294cf9a27396c14688563dd.

2 years agorelease V1.1.52 991/1 991/head 992/target/1 993/target/1
SnickerSun [Thu, 19 Sep 2024 23:36:56 +0000 (07:36 +0800)]
release V1.1.52

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

2 years agoRevert "Revert "Revert "更新sdk602 patch 0812 to 0911" 990/1 990/head 991/target/1
SnickerSun [Thu, 19 Sep 2024 14:16:54 +0000 (22:16 +0800)]
Revert "Revert "Revert "更新sdk602 patch 0812 to 0911"

This reverts commit 4641ba87348533c061e6c975504dd7885ba25300.

2 years agoRevert "Revert "Revert "给project cm,ct,z1,fd230,obu 同步0911的静态库 990/target/1
snickersun@163.com [Thu, 19 Sep 2024 14:02:00 +0000 (22:02 +0800)]
Revert "Revert "Revert "给project cm,ct,z1,fd230,obu 同步0911的静态库
"""

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

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1143/target/1 989/1 989/head
Caisking [Thu, 19 Sep 2024 09:56:28 +0000 (17:56 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago离线表盘:电量获取返回为ture
Caisking [Thu, 19 Sep 2024 09:56:15 +0000 (17:56 +0800)]
离线表盘:电量获取返回为ture

2 years ago心率:心率动画的关闭
Caisking [Thu, 19 Sep 2024 09:55:45 +0000 (17:55 +0800)]
心率:心率动画的关闭

2 years ago增加2ae0 传输出错文件,先统计看是否有出现(补) 988/4 988/head 989/target/1
hcj [Thu, 19 Sep 2024 09:36:26 +0000 (17:36 +0800)]
增加2ae0 传输出错文件,先统计看是否有出现(补)

2 years ago增加2ae0 传输出错文件,先统计看是否有出现 988/3
hcj [Thu, 19 Sep 2024 09:15:10 +0000 (17:15 +0800)]
增加2ae0 传输出错文件,先统计看是否有出现

2 years ago增加通话记录删除(补) 988/2
hcj [Thu, 19 Sep 2024 08:58:05 +0000 (16:58 +0800)]
增加通话记录删除(补)

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 988/1
hcj [Thu, 19 Sep 2024 07:45:14 +0000 (15:45 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago增加通话记录删除
hcj [Thu, 19 Sep 2024 07:45:06 +0000 (15:45 +0800)]
增加通话记录删除

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

2 years agoMerge #985 into sdk602patch0626 from refs/changes/985/head 988/target/1
罗正 [Wed, 18 Sep 2024 13:05:46 +0000 (13:05 +0000)]
Merge #985 into sdk602patch0626 from refs/changes/985/head

Code review from 罗正

* refs/changes/985/head: (16 commits squashed)

  - #524,解决:录音删除,删除后不是返回到录音列表界面,返回的是录音界面bug
    #658,解决,手表,录音频繁点击会有蓝色效果

  - #656,解决,手表,闹钟偶现0000闹钟提醒bug

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

  - 4G界面添加“注:启用4G,可能会加速消耗电量”提醒

  -  运动识别界面添加提醒标签,#192,解决,运动识别界面单一bug

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

  - 根据禅道上期望:APP查找手表和闹钟,勿扰睡眠静音模式下都有响铃和震动提醒
    #421解决, 睡眠模式,闹钟无响铃震动bug

  - 解决静音模式错误开启后会全局静音bug,根据禅道期望“来电铃声、短信消息提醒,勿扰睡眠静音模式下只有亮屏提醒”

  - #717,解决,设置界面向上滑有黑色空白,需优化bug

  - 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

  - #716,解决,设置屏幕与亮度界面右滑返回上一级界面,有上下晃动,优化退出晃动bug

  - #720,解决,手表默认通话音量过小,手表是恢复出厂设置后查看的bug

  - 修复msg_senter关于喝水提醒被覆盖代码

  - 1.添加APP在调节系统音量时候若当前界面在音乐的的声音调节视图则ui同步显示设置的音量值。
    2.解决音乐从本地音乐切换到手机音乐在切换到本地音乐切换不回来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/985
2 years agoMerge #986 into sdk602patch0626 from refs/changes/986/head
袁清梦 [Wed, 18 Sep 2024 13:04:19 +0000 (13:04 +0000)]
Merge #986 into sdk602patch0626 from refs/changes/986/head

修改心率的显示最大最小值为实际值

* refs/changes/986/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/986
2 years ago修改心率的显示最大最小值为实际值 986/1 986/head
Caisking [Wed, 18 Sep 2024 12:52:35 +0000 (20:52 +0800)]
修改心率的显示最大最小值为实际值

2 years ago关闭 app_main 中的 dump meminfo 日志 987/1 987/head
SnickerSun [Wed, 18 Sep 2024 10:14:22 +0000 (18:14 +0800)]
关闭 app_main 中的 dump meminfo 日志

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

2 years agoMerge #984 into sdk602patch0626 from refs/changes/984/head 985/target/1 986/target/1 987/target/1
彭磊 [Wed, 18 Sep 2024 09:52:53 +0000 (09:52 +0000)]
Merge #984 into sdk602patch0626 from refs/changes/984/head

Code review from 彭磊

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

  - 修复g_chipinfo_map映射关系填写错误BUG

  - 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

  - 重新打开宏“CYWEE_MAC_ACTIVE” ,修复回退导致的BUG 优。化cywee开机读取密钥

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/984
2 years ago重新打开宏“CYWEE_MAC_ACTIVE” ,修复回退导致的BUG 优。化cywee开机读取密钥 984/1 984/head
penglei [Wed, 18 Sep 2024 09:43:58 +0000 (17:43 +0800)]
重新打开宏“CYWEE_MAC_ACTIVE” ,修复回退导致的BUG 优。化cywee开机读取密钥

2 years ago修复Slice切换失败或者死机的问题 983/1 983/head
Caisking [Wed, 18 Sep 2024 09:34:58 +0000 (17:34 +0800)]
修复Slice切换失败或者死机的问题

2 years ago#706手表,8点会自动开启睡眠模式,弹窗提示存在问题
Caisking [Wed, 18 Sep 2024 08:29:05 +0000 (16:29 +0800)]
#706手表,8点会自动开启睡眠模式,弹窗提示存在问题

2 years ago#704手表,8点会自动开启睡眠模式,表盘和下拉状态栏中睡眠图标显示是关闭的,点击查找手表只有震动没有响铃
Caisking [Wed, 18 Sep 2024 08:15:41 +0000 (16:15 +0800)]
#704手表,8点会自动开启睡眠模式,表盘和下拉状态栏中睡眠图标显示是关闭的,点击查找手表只有震动没有响铃

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Wed, 18 Sep 2024 04:11:07 +0000 (12:11 +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, 18 Sep 2024 03:17:40 +0000 (11:17 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agorelease V1.1.51 982/1 982/head 983/target/1 984/target/1
SnickerSun [Wed, 18 Sep 2024 03:05:35 +0000 (11:05 +0800)]
release V1.1.51

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

2 years agoMerge #979 into sdk602patch0626 from refs/changes/979/head 982/target/1
彭磊 [Wed, 18 Sep 2024 03:03:04 +0000 (03:03 +0000)]
Merge #979 into sdk602patch0626 from refs/changes/979/head

修复g_chipinfo_map映射关系填写错误BUG

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

  - 修复g_chipinfo_map映射关系填写错误BUG

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/979
2 years ago分区表配置修改,修正0911 patch不能下载问题。 981/1 981/head
SnickerSun [Wed, 18 Sep 2024 03:01:27 +0000 (11:01 +0800)]
分区表配置修改,修正0911 patch不能下载问题。

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

2 years agoRevert "Revert "给project cm,ct,z1,fd230,obu 同步0911的静态库 981/target/1
snickersun@163.com [Wed, 18 Sep 2024 02:58:27 +0000 (10:58 +0800)]
Revert "Revert "给project cm,ct,z1,fd230,obu 同步0911的静态库
""

2 years agoRevert "Revert "更新sdk602 patch 0812 to 0911
snickersun@163.com [Wed, 18 Sep 2024 02:58:08 +0000 (10:58 +0800)]
Revert "Revert "更新sdk602 patch 0812 to 0911
""

2 years ago修复g_chipinfo_map映射关系填写错误BUG 979/1 979/head
penglei [Wed, 18 Sep 2024 02:56:01 +0000 (10:56 +0800)]
修复g_chipinfo_map映射关系填写错误BUG

2 years agoMerge #977 into sdk602patch0626 from refs/changes/977/head 979/target/1
罗正 [Wed, 18 Sep 2024 02:52:42 +0000 (02:52 +0000)]
Merge #977 into sdk602patch0626 from refs/changes/977/head

Code review from 罗正

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

  - #524,解决:录音删除,删除后不是返回到录音列表界面,返回的是录音界面bug
    #658,解决,手表,录音频繁点击会有蓝色效果

  - #656,解决,手表,闹钟偶现0000闹钟提醒bug

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

  - 4G界面添加“注:启用4G,可能会加速消耗电量”提醒

  -  运动识别界面添加提醒标签,#192,解决,运动识别界面单一bug

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

  - 根据禅道上期望:APP查找手表和闹钟,勿扰睡眠静音模式下都有响铃和震动提醒
    #421解决, 睡眠模式,闹钟无响铃震动bug

  - 解决静音模式错误开启后会全局静音bug,根据禅道期望“来电铃声、短信消息提醒,勿扰睡眠静音模式下只有亮屏提醒”

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/977
2 years agoMerge #978 into sdk602patch0626 from refs/changes/978/head
袁清梦 [Wed, 18 Sep 2024 02:28:23 +0000 (02:28 +0000)]
Merge #978 into sdk602patch0626 from refs/changes/978/head

安全模式:下载修复文件增加repari_file_start接口

* refs/changes/978/head: (7 commits squashed)

  - 安全模式:下载修复文件增加repari_file_start接口

  - 心率:增加心率动画的资源文件

  - 心率:修改心率UI;增加上一次检测数据以及检测间隔

  - 心率:同步心率卡片更新

  - 心率:修复心率卡片显示异常

  - 心率:心率动画修改

  - 心率:使用图片icon替换动画

Signed-off-by: Caisking <3449750381@qq.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/978
2 years ago修复通话记录存在的内存泄漏(补) 976/3 976/head
hcj [Wed, 18 Sep 2024 02:01:57 +0000 (10:01 +0800)]
修复通话记录存在的内存泄漏(补)

2 years ago#708 起床闹钟去掉
Caisking [Wed, 18 Sep 2024 01:52:19 +0000 (09:52 +0800)]
#708 起床闹钟去掉

2 years ago心率:使用图片icon替换动画 978/5 978/head
Caisking [Sat, 14 Sep 2024 13:58:53 +0000 (21:58 +0800)]
心率:使用图片icon替换动画

2 years ago心率:心率动画修改 978/4
Caisking [Sat, 14 Sep 2024 13:42:48 +0000 (21:42 +0800)]
心率:心率动画修改

2 years ago心率:修复心率卡片显示异常 978/3
Caisking [Sat, 14 Sep 2024 13:25:28 +0000 (21:25 +0800)]
心率:修复心率卡片显示异常

2 years ago心率:同步心率卡片更新 978/2
Caisking [Sat, 14 Sep 2024 12:37:07 +0000 (20:37 +0800)]
心率:同步心率卡片更新

2 years ago心率:修改心率UI;增加上一次检测数据以及检测间隔
Caisking [Sat, 14 Sep 2024 12:36:49 +0000 (20:36 +0800)]
心率:修改心率UI;增加上一次检测数据以及检测间隔

2 years ago心率:增加心率动画的资源文件
Caisking [Sat, 14 Sep 2024 12:36:07 +0000 (20:36 +0800)]
心率:增加心率动画的资源文件

2 years ago安全模式:下载修复文件增加repari_file_start接口 978/1
Caisking [Sat, 14 Sep 2024 11:12:36 +0000 (19:12 +0800)]
安全模式:下载修复文件增加repari_file_start接口

2 years ago修复通话记录存在的内存泄漏 976/2
hcj [Sat, 14 Sep 2024 09:30:04 +0000 (17:30 +0800)]
修复通话记录存在的内存泄漏

2 years ago日历修复(补 ) 976/1
hcj [Sat, 14 Sep 2024 08:31:30 +0000 (16:31 +0800)]
日历修复(补 )

2 years agoRevert "给project cm,ct,z1,fd230,obu 同步0911的静态库 976/target/1 977/target/1 978/target/1
snickersun@163.com [Sat, 14 Sep 2024 07:19:43 +0000 (15:19 +0800)]
Revert "给project cm,ct,z1,fd230,obu 同步0911的静态库
"

2 years agoRevert "更新sdk602 patch 0812 to 0911
snickersun@163.com [Sat, 14 Sep 2024 07:19:27 +0000 (15:19 +0800)]
Revert "更新sdk602 patch 0812 to 0911
"

2 years ago优化创建睡眠文件夹(补交) 975/2 975/head 980/target/1
penglei [Sat, 14 Sep 2024 07:05:25 +0000 (15:05 +0800)]
优化创建睡眠文件夹(补交)

2 years ago优化睡眠模式文件存储,优化读取cywee密钥 975/1
penglei [Sat, 14 Sep 2024 06:29:01 +0000 (14:29 +0800)]
优化睡眠模式文件存储,优化读取cywee密钥

2 years ago给project cm,ct,z1,fd230,obu 同步0911的静态库 974/1 974/head 975/target/1
SnickerSun [Sat, 14 Sep 2024 06:05:52 +0000 (14:05 +0800)]
给project cm,ct,z1,fd230,obu 同步0911的静态库

2 years ago更新sdk602 patch 0812 to 0911 973/1 973/head 974/target/1
SnickerSun [Sat, 14 Sep 2024 05:53:41 +0000 (13:53 +0800)]
更新sdk602 patch 0812 to 0911

2 years agoCat1 升级脚本到PY_OTA_V13 支持 接听和挂断电话带 电话号
SnickerSun [Sat, 14 Sep 2024 05:52:12 +0000 (13:52 +0800)]
Cat1 升级脚本到PY_OTA_V13 支持 接听和挂断电话带 电话号

2 years ago修复ble广播无法关闭BUG 972/3 972/head 973/target/1
hcj [Sat, 14 Sep 2024 04:07:15 +0000 (12:07 +0800)]
修复ble广播无法关闭BUG

2 years ago系统升级更改 BUG先延期,后续再统一修复(补) 972/2
hcj [Sat, 14 Sep 2024 03:32:06 +0000 (11:32 +0800)]
系统升级更改 BUG先延期,后续再统一修复(补)

2 years ago系统升级更改 BUG先延期,后续再统一修复 972/1
hcj [Sat, 14 Sep 2024 03:30:51 +0000 (11:30 +0800)]
系统升级更改 BUG先延期,后续再统一修复

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 971/1 971/head 972/target/1
hcj [Sat, 14 Sep 2024 01:59:08 +0000 (09:59 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago日历修改
hcj [Sat, 14 Sep 2024 01:58:55 +0000 (09:58 +0800)]
日历修改

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 970/1 970/head 971/target/1
Caisking [Fri, 13 Sep 2024 13:28:32 +0000 (21:28 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago安全模式:增加资源文件修复功能
Caisking [Fri, 13 Sep 2024 13:28:12 +0000 (21:28 +0800)]
安全模式:增加资源文件修复功能

2 years agorelease V1.1.50 1068/target/1 969/1 969/head 970/target/1
SnickerSun [Fri, 13 Sep 2024 11:08:34 +0000 (19:08 +0800)]
release V1.1.50

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 968/1 968/head 969/target/1
luozheng [Fri, 13 Sep 2024 11:05:33 +0000 (19:05 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago#662,解决手表,手电筒设置,5个灯光颜色都选择一遍,灯光颜色不会改变bug
luozheng [Fri, 13 Sep 2024 11:05:23 +0000 (19:05 +0800)]
#662,解决手表,手电筒设置,5个灯光颜色都选择一遍,灯光颜色不会改变bug

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 967/1 967/head 968/target/1
penglei [Fri, 13 Sep 2024 11:00:57 +0000 (19:00 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago添加mac密钥,chipinfo激活转为mac激活
penglei [Fri, 13 Sep 2024 11:00:45 +0000 (19:00 +0800)]
添加mac密钥,chipinfo激活转为mac激活