mirrors/FD230.git
2 years ago对接文件读写锁 1085/1
hcj [Thu, 3 Oct 2024 08:38:13 +0000 (16:38 +0800)]
对接文件读写锁

2 years ago添加custom fileoperate文件读写专用队列。 1084/1 1084/head 1085/target/1 1086/target/1
SnickerSun [Thu, 3 Oct 2024 07:53:00 +0000 (15:53 +0800)]
添加custom fileoperate文件读写专用队列。

2 years agoMerge #1081 into sdk602patch0626 from refs/changes/1081/head 1082/target/1 1084/target/1
彭磊 [Wed, 2 Oct 2024 23:36:39 +0000 (23:36 +0000)]
Merge #1081 into sdk602patch0626 from refs/changes/1081/head

设置睡眠存储runtime,优化加锁逻辑

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

  - 设置睡眠存储runtime,优化加锁逻辑
    降低gsensor功耗(10uA左右)

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/1081
2 years ago#537 语音助手UI和提供的不一致 1080/1 1080/head
Caisking [Wed, 2 Oct 2024 09:31:05 +0000 (17:31 +0800)]
#537 语音助手UI和提供的不一致

2 years ago#503手表,语音助手无法使用
Caisking [Wed, 2 Oct 2024 09:28:22 +0000 (17:28 +0800)]
#503手表,语音助手无法使用

2 years ago运动:增加读写锁状态
Caisking [Wed, 2 Oct 2024 09:24:40 +0000 (17:24 +0800)]
运动:增加读写锁状态

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

2 years agoMerge #1079 into sdk602patch0626 from refs/changes/1079/head 1080/target/1 1081/target/1
袁清梦 [Wed, 2 Oct 2024 09:09:17 +0000 (09:09 +0000)]
Merge #1079 into sdk602patch0626 from refs/changes/1079/head

Code review from 袁清梦

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

  - 语言助手:增加subview的右滑退出

  - 心率血氧:关机存储修改为测量完存储

  - 心率血氧:同步关闭函数修改

  - 系统:增加读写锁状态(由各模块存储决定状态)

  - 系统:修改Slice栈;保证里面保留默认SliceId

  - 血氧:增加读写锁状态

  - 心率:增加读写锁状态

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/1079
2 years ago心率:增加读写锁状态 1079/1 1079/head
Caisking [Wed, 2 Oct 2024 09:05:01 +0000 (17:05 +0800)]
心率:增加读写锁状态

2 years ago血氧:增加读写锁状态
Caisking [Wed, 2 Oct 2024 08:54:39 +0000 (16:54 +0800)]
血氧:增加读写锁状态

2 years ago修改通讯录数据和sos数据存储 由关机存储改为同步存储 1078/2 1078/head
hcj [Wed, 2 Oct 2024 08:43:17 +0000 (16:43 +0800)]
修改通讯录数据和sos数据存储 由关机存储改为同步存储

2 years ago系统:修改Slice栈;保证里面保留默认SliceId
Caisking [Wed, 2 Oct 2024 08:34:49 +0000 (16:34 +0800)]
系统:修改Slice栈;保证里面保留默认SliceId

2 years ago系统:增加读写锁状态(由各模块存储决定状态)
Caisking [Wed, 2 Oct 2024 08:34:02 +0000 (16:34 +0800)]
系统:增加读写锁状态(由各模块存储决定状态)

2 years ago心率血氧:同步关闭函数修改
Caisking [Wed, 2 Oct 2024 08:33:12 +0000 (16:33 +0800)]
心率血氧:同步关闭函数修改

2 years ago心率血氧:关机存储修改为测量完存储
Caisking [Wed, 2 Oct 2024 08:32:30 +0000 (16:32 +0800)]
心率血氧:关机存储修改为测量完存储

2 years ago语言助手:增加subview的右滑退出
Caisking [Wed, 2 Oct 2024 08:30:29 +0000 (16:30 +0800)]
语言助手:增加subview的右滑退出

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1078/1
hcj [Wed, 2 Oct 2024 06:42:12 +0000 (14:42 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago优化传输中处理增加关闭抬腕亮屏
hcj [Wed, 2 Oct 2024 06:41:59 +0000 (14:41 +0800)]
优化传输中处理增加关闭抬腕亮屏

2 years ago优化关机存储,需要根据备注继续修改 1077/1 1077/head 1078/target/1 1079/target/1
SnickerSun [Wed, 2 Oct 2024 03:10:28 +0000 (11:10 +0800)]
优化关机存储,需要根据备注继续修改

2 years agorelease V1.1.58 1076/1 1076/head 1077/target/1
SnickerSun [Mon, 30 Sep 2024 14:13:48 +0000 (22:13 +0800)]
release V1.1.58

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1075/1 1075/head 1076/target/1
Caisking [Mon, 30 Sep 2024 14:10:47 +0000 (22:10 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago增加省电模式界面的编码器效果
Caisking [Mon, 30 Sep 2024 14:10:39 +0000 (22:10 +0800)]
增加省电模式界面的编码器效果

2 years ago修改自定义表盘里面的“日”->"号“
Caisking [Mon, 30 Sep 2024 14:10:14 +0000 (22:10 +0800)]
修改自定义表盘里面的“日”->"号“

2 years ago增加语音助手Slice
Caisking [Mon, 30 Sep 2024 14:09:45 +0000 (22:09 +0800)]
增加语音助手Slice

2 years agoMerge #1073 into sdk602patch0626 from refs/changes/1073/head 1075/target/1
袁清梦 [Mon, 30 Sep 2024 12:19:27 +0000 (12:19 +0000)]
Merge #1073 into sdk602patch0626 from refs/changes/1073/head

Code review from 袁清梦

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

  - 增加app对运动状态控制的限制

  - 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/1073
2 years ago复制添加中文ID和string 可快捷添加id和string 1074/1 1074/head
hcj [Mon, 30 Sep 2024 10:44:43 +0000 (18:44 +0800)]
复制添加中文ID和string 可快捷添加id和string

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1073/1 1073/head
Caisking [Mon, 30 Sep 2024 10:19:31 +0000 (18:19 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago增加app对运动状态控制的限制
Caisking [Mon, 30 Sep 2024 10:19:27 +0000 (18:19 +0800)]
增加app对运动状态控制的限制

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1072/1 1072/head 1073/target/1 1074/target/1
hcj [Mon, 30 Sep 2024 10:03:28 +0000 (18:03 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago自定义表盘接口对接
hcj [Mon, 30 Sep 2024 10:03:09 +0000 (18:03 +0800)]
自定义表盘接口对接

2 years agoMerge #1070 into sdk602patch0626 from refs/changes/1070/head 1072/target/1
罗正 [Mon, 30 Sep 2024 09:56:52 +0000 (09:56 +0000)]
Merge #1070 into sdk602patch0626 from refs/changes/1070/head

Code review from 罗正

* refs/changes/1070/head: (18 commits squashed)

  - 修改第一次启动时进入界面逻辑。不再根据手机是否连接做判断条件

  - 解决,#695,手表,弧形列表使用编码器上下滑动时没有和列表显示一样增加震动反馈bug

  - 解决,#878,手表,恢复出厂设置时,频繁点击按钮会持续震动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

  - 1.解决勿扰模式内存泄漏问题
    2.解决勿扰模式界面中label在切换成其他国语言导致字体遮盖下面的Button问题
    3.勿扰模式界面添加编码器控制界面问题
    4.解决勿扰模式内存泄漏问题

  - 解决,#883手表,闹钟响铃没有按照文档中设定40秒响铃,目前测试实际响铃50秒bug

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

  - 指南针背景图片修改

  - 解决#832手表与APP蓝牙断连,手表端点击找手机,界面不会弹出蓝牙断连提示bug
    查找手机界面会根据手机蓝牙是否有无连接显示不同界面

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

  - #880,在二维码扫码页面添加 电池百分比显示

  - 解决,#843,录音文件排序错乱bug

  - 解决#802录音列表有遮挡显示不全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/1070
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1058/2 1058/head
Caisking [Mon, 30 Sep 2024 09:49:16 +0000 (17:49 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago#690 iOS,手表先开启室外走路运动,iOSApp再开启户外跑步,APP的数据和手表数据显示不一致(,4.6.1-2)
Caisking [Mon, 30 Sep 2024 09:42:53 +0000 (17:42 +0800)]
#690 iOS,手表先开启室外走路运动,iOSApp再开启户外跑步,APP的数据和手表数据显示不一致(,4.6.1-2)

2 years agoMerge #1069 into sdk602patch0626 from refs/changes/1069/head 1058/target/2 1070/target/2
胡传军 [Mon, 30 Sep 2024 08:57:09 +0000 (08:57 +0000)]
Merge #1069 into sdk602patch0626 from refs/changes/1069/head

Code review from 胡传军

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

  - ble解绑恢复出厂修改,仅清除配对,不做多余处理

  - ble 配对修改

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

  - 计算器修改 #771

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/1069
2 years ago修改AW88166 功放参数,所有通路用同一套参数。解决打电话音量小的问题。 1071/1 1071/head
SnickerSun [Mon, 30 Sep 2024 08:48:49 +0000 (16:48 +0800)]
修改AW88166 功放参数,所有通路用同一套参数。解决打电话音量小的问题。

2 years ago计算器修改 #771 1069/1 1069/head
hcj [Mon, 30 Sep 2024 07:09:45 +0000 (15:09 +0800)]
计算器修改 #771

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Mon, 30 Sep 2024 04:45:35 +0000 (12:45 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years agoMerge #1066 into sdk602patch0626 from refs/changes/1066/head 1069/target/1 1070/target/1 1071/target/1
胡传军 [Mon, 30 Sep 2024 04:45:14 +0000 (04:45 +0000)]
Merge #1066 into sdk602patch0626 from refs/changes/1066/head

Code review from 胡传军

* refs/changes/1066/head: (5 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

  - ble解绑恢复出厂修改,仅清除配对,不做多余处理

  - ble 配对修改

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/1066
2 years agoble 配对修改 1066/2 1066/head
hcj [Mon, 30 Sep 2024 03:49:30 +0000 (11:49 +0800)]
ble 配对修改

2 years ago修复多段睡眠,睡眠状态数据会被覆盖的BUG 1067/1 1067/head
penglei [Mon, 30 Sep 2024 03:47:53 +0000 (11:47 +0800)]
修复多段睡眠,睡眠状态数据会被覆盖的BUG

2 years agoble解绑恢复出厂修改,仅清除配对,不做多余处理 1066/1
hcj [Mon, 30 Sep 2024 03:10:05 +0000 (11:10 +0800)]
ble解绑恢复出厂修改,仅清除配对,不做多余处理

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Mon, 30 Sep 2024 03:00:09 +0000 (11:00 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years agoMerge #1065 into sdk602patch0626 from refs/changes/1065/head 1066/target/1 1067/target/1
胡传军 [Mon, 30 Sep 2024 02:57:08 +0000 (02:57 +0000)]
Merge #1065 into sdk602patch0626 from refs/changes/1065/head

Code review from 胡传军

* refs/changes/1065/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/1065
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1065/1 1065/head
hcj [Mon, 30 Sep 2024 02:15:17 +0000 (10:15 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago天气数据解析增加安全防护 防止数组越界
hcj [Mon, 30 Sep 2024 02:13:29 +0000 (10:13 +0800)]
天气数据解析增加安全防护 防止数组越界

2 years agorelease V1.1.57 1064/1 1064/head
SnickerSun [Sun, 29 Sep 2024 14:46:22 +0000 (22:46 +0800)]
release V1.1.57

2 years agoMerge #1055 into sdk602patch0626 from refs/changes/1055/head 1064/target/1 1065/target/1
罗正 [Sun, 29 Sep 2024 13:32:58 +0000 (13:32 +0000)]
Merge #1055 into sdk602patch0626 from refs/changes/1055/head

Code review from 罗正

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

  - 修改第一次启动时进入界面逻辑。不再根据手机是否连接做判断条件

  - 解决,#695,手表,弧形列表使用编码器上下滑动时没有和列表显示一样增加震动反馈bug

  - 解决,#878,手表,恢复出厂设置时,频繁点击按钮会持续震动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

  - 1.解决勿扰模式内存泄漏问题
    2.解决勿扰模式界面中label在切换成其他国语言导致字体遮盖下面的Button问题
    3.勿扰模式界面添加编码器控制界面问题
    4.解决勿扰模式内存泄漏问题

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/1055
2 years ago优化抬腕亮屏速度 1063/1 1063/head
SnickerSun [Sun, 29 Sep 2024 13:29:25 +0000 (21:29 +0800)]
优化抬腕亮屏速度

2 years ago修复ble服务失效bug 1062/1 1062/head 1063/target/1
hcj [Sun, 29 Sep 2024 13:27:40 +0000 (21:27 +0800)]
修复ble服务失效bug

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Sun, 29 Sep 2024 12:20:30 +0000 (20:20 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago增加训练配速心率数据上传 1055/target/4 1061/1 1061/head 1062/target/1
hcj [Sun, 29 Sep 2024 12:18:28 +0000 (20:18 +0800)]
增加训练配速心率数据上传

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1055/target/3 1060/1 1060/head 1061/target/1
hcj [Sun, 29 Sep 2024 11:46:39 +0000 (19:46 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago增加ble断连清除ancs服务
hcj [Sun, 29 Sep 2024 11:46:29 +0000 (19:46 +0800)]
增加ble断连清除ancs服务

2 years ago#885泰语,希伯来语,波斯语,阿拉伯语,印尼语,韩语表盘有问题显示
Caisking [Sun, 29 Sep 2024 11:27:17 +0000 (19:27 +0800)]
#885泰语,希伯来语,波斯语,阿拉伯语,印尼语,韩语表盘有问题显示

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1059/1 1059/head 1060/target/1
penglei [Sun, 29 Sep 2024 10:33:45 +0000 (18:33 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化gsensor fifo输入
penglei [Sun, 29 Sep 2024 10:33:33 +0000 (18:33 +0800)]
优化gsensor fifo输入

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1058/1
Caisking [Sun, 29 Sep 2024 10:33:01 +0000 (18:33 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1053/5 1053/head 1055/target/2 1058/target/1 1059/target/1
hcj [Sun, 29 Sep 2024 10:30:59 +0000 (18:30 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago多蓝牙连接适配问题修改(补)
hcj [Sun, 29 Sep 2024 10:30:39 +0000 (18:30 +0800)]
多蓝牙连接适配问题修改(补)

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 1053/target/3 1057/1 1057/head
SnickerSun [Sun, 29 Sep 2024 10:27:54 +0000 (18:27 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago制作ota包时,资源文件进行压缩。ota_all 去除nv.bin 添加 ota_all_with_nv 选项可以加nv.bin,解决ota_all升级会造成btaddr丢失问题
SnickerSun [Sun, 29 Sep 2024 10:25:40 +0000 (18:25 +0800)]
制作ota包时,资源文件进行压缩。ota_all 去除nv.bin 添加 ota_all_with_nv 选项可以加nv.bin,解决ota_all升级会造成btaddr丢失问题

2 years ago制作ota包时,资源文件进行压缩。 1056/1 1056/head 1057/target/1
SnickerSun [Sun, 29 Sep 2024 10:25:40 +0000 (18:25 +0800)]
制作ota包时,资源文件进行压缩。

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Sun, 29 Sep 2024 09:13:42 +0000 (17:13 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago多蓝牙连接适配问题修改 1053/4
hcj [Sun, 29 Sep 2024 09:11:19 +0000 (17:11 +0800)]
多蓝牙连接适配问题修改

2 years ago支付宝蓝牙连接修改(补) 1053/3
hcj [Sun, 29 Sep 2024 08:10:59 +0000 (16:10 +0800)]
支付宝蓝牙连接修改(补)

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1053/2
hcj [Sun, 29 Sep 2024 07:52:29 +0000 (15:52 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago支付宝蓝牙连接修改
hcj [Sun, 29 Sep 2024 07:52:14 +0000 (15:52 +0800)]
支付宝蓝牙连接修改

2 years ago增加语音助手资源文件
Caisking [Sun, 29 Sep 2024 07:33:36 +0000 (15:33 +0800)]
增加语音助手资源文件

2 years ago喝水提醒,运动识别,配对,久坐提醒(添加震动和10s时长),添加取消亮屏操作,防止其他界面设置亮屏时长不成功 1053/target/2 1054/2 1054/head 1055/target/1 1056/target/1
luozheng [Sun, 29 Sep 2024 06:50:50 +0000 (14:50 +0800)]
喝水提醒,运动识别,配对,久坐提醒(添加震动和10s时长),添加取消亮屏操作,防止其他界面设置亮屏时长不成功

2 years ago删除mainPresenterSample文件中无用代码 1054/1
luozheng [Sun, 29 Sep 2024 06:21:00 +0000 (14:21 +0800)]
删除mainPresenterSample文件中无用代码

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Sun, 29 Sep 2024 06:20:39 +0000 (14:20 +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 [Sun, 29 Sep 2024 03:22:41 +0000 (11:22 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1053/1
hcj [Sun, 29 Sep 2024 03:02:05 +0000 (11:02 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years agoble服务修改适配支付宝绑定
hcj [Sun, 29 Sep 2024 03:01:50 +0000 (11:01 +0800)]
ble服务修改适配支付宝绑定

2 years ago同步默认表盘资源文件更新
Caisking [Sun, 29 Sep 2024 02:58:37 +0000 (10:58 +0800)]
同步默认表盘资源文件更新

2 years agoMerge #1051 into sdk602patch0626 from refs/changes/1051/head 1053/target/1 1054/target/1
袁清梦 [Sun, 29 Sep 2024 02:56:20 +0000 (02:56 +0000)]
Merge #1051 into sdk602patch0626 from refs/changes/1051/head

Code review from 袁清梦

* refs/changes/1051/head: (10 commits squashed)

  - 室外跑步,走路。统一使用室内算法

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

  - 修改遥控拍照Slice析构

  - 增加topic发送错误的错误打印

  - 增加判断文件是否存在的统一接口

  - 增加训练的配速表,心率表相关接口

  - 修改卡片list为不循环

  - 修改消息Slice的显示以及读取

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

  - 修改默认表盘Id

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/1051
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1052/1 1052/head
hcj [Sun, 29 Sep 2024 02:53:49 +0000 (10:53 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago增加支付宝底层初始化判断 避免死机问题
hcj [Sun, 29 Sep 2024 02:53:30 +0000 (10:53 +0800)]
增加支付宝底层初始化判断 避免死机问题

2 years ago在设置亮屏时间添加keep_on状态重置,确保时间设置成功
luozheng [Sun, 29 Sep 2024 02:42:59 +0000 (10:42 +0800)]
在设置亮屏时间添加keep_on状态重置,确保时间设置成功

2 years ago修改默认表盘Id 1051/1 1051/head
Caisking [Sun, 29 Sep 2024 02:30:29 +0000 (10:30 +0800)]
修改默认表盘Id

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

2 years agoMerge #1048 into sdk602patch0626 from refs/changes/1048/head 1051/target/1 1052/target/1
胡传军 [Sat, 28 Sep 2024 23:37:24 +0000 (23:37 +0000)]
Merge #1048 into sdk602patch0626 from refs/changes/1048/head

增加在ble断连后ANCS无法重新发现服务,直接尝试订阅,实测有改善消息通知失效问题(补 )

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

  - 增加在ble断连后ANCS无法重新发现服务,直接尝试订阅,实测有改善消息通知失效问题(补 )

  -  修改省电模式改为进入省电模式后必须手动再开启通话和蓝牙 #395

  -  日历增加上拉图标 #775

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/1048
2 years agoMerge #1047 into sdk602patch0626 from refs/changes/1047/head
罗正 [Sat, 28 Sep 2024 23:36:24 +0000 (23:36 +0000)]
Merge #1047 into sdk602patch0626 from refs/changes/1047/head

Code review from 罗正

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

  - 解决天气内存泄漏

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

  - 修复AI语音聆听中界面计时标签显示问题

  - 主界面view析构函数修改

  - 解决切换到手机音乐还可以播放本地音乐bug

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

  - 解决#671,蓝牙设备名称只显示一个时需要固定不能,去掉下面横线bug

  - 解决#674,蓝牙搜索界面,优化重新搜索字样显示位置bug

  - 解决,#672,蓝牙耳机界面退出,稍微右滑就退出了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/1047
2 years agoMerge #1050 into sdk602patch0626 from refs/changes/1050/head
袁清梦 [Sat, 28 Sep 2024 23:35:10 +0000 (23:35 +0000)]
Merge #1050 into sdk602patch0626 from refs/changes/1050/head

Code review from 袁清梦

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

  - 室外跑步,走路。统一使用室内算法

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

  - 修改遥控拍照Slice析构

  - 增加topic发送错误的错误打印

  - 增加判断文件是否存在的统一接口

  - 增加训练的配速表,心率表相关接口

  - 修改卡片list为不循环

  - 修改消息Slice的显示以及读取

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/1050
2 years ago修改消息Slice的显示以及读取 1050/1 1050/head
Caisking [Sat, 28 Sep 2024 12:40:28 +0000 (20:40 +0800)]
修改消息Slice的显示以及读取

2 years ago修改卡片list为不循环
Caisking [Sat, 28 Sep 2024 12:32:48 +0000 (20:32 +0800)]
修改卡片list为不循环

2 years ago增加训练的配速表,心率表相关接口
Caisking [Sat, 28 Sep 2024 12:32:22 +0000 (20:32 +0800)]
增加训练的配速表,心率表相关接口

2 years ago解决#839手表未佩戴进行呼吸训练,完成界面会显示平均心率65bug
luozheng [Sat, 28 Sep 2024 12:27:30 +0000 (20:27 +0800)]
解决#839手表未佩戴进行呼吸训练,完成界面会显示平均心率65bug

2 years ago优化马达震动 优化黑曜表盘天气图标显示以及跳转APPVIEW 1049/1 1049/head
penglei [Sat, 28 Sep 2024 12:24:53 +0000 (20:24 +0800)]
优化马达震动 优化黑曜表盘天气图标显示以及跳转APPVIEW

2 years ago增加判断文件是否存在的统一接口
Caisking [Sat, 28 Sep 2024 12:22:55 +0000 (20:22 +0800)]
增加判断文件是否存在的统一接口

2 years ago解决,#737,恢复出厂后的语言选择界面,使用滚动编码器没有震动反馈bug
luozheng [Sat, 28 Sep 2024 11:47:23 +0000 (19:47 +0800)]
解决,#737,恢复出厂后的语言选择界面,使用滚动编码器没有震动反馈bug

2 years ago增加topic发送错误的错误打印
Caisking [Sat, 28 Sep 2024 11:32:37 +0000 (19:32 +0800)]
增加topic发送错误的错误打印

2 years ago解决,#672,蓝牙耳机界面退出,稍微右滑就退出了bug 1047/3 1047/head
luozheng [Sat, 28 Sep 2024 10:14:34 +0000 (18:14 +0800)]
解决,#672,蓝牙耳机界面退出,稍微右滑就退出了bug

2 years ago解决#674,蓝牙搜索界面,优化重新搜索字样显示位置bug 1047/2
luozheng [Sat, 28 Sep 2024 09:34:42 +0000 (17:34 +0800)]
解决#674,蓝牙搜索界面,优化重新搜索字样显示位置bug

2 years ago修改遥控拍照Slice析构
Caisking [Sat, 28 Sep 2024 09:33:26 +0000 (17:33 +0800)]
修改遥控拍照Slice析构

2 years ago 日历增加上拉图标 #775 1048/3 1048/head
hcj [Sat, 28 Sep 2024 09:32:27 +0000 (17:32 +0800)]
 日历增加上拉图标 #775

2 years ago解决#671,蓝牙设备名称只显示一个时需要固定不能,去掉下面横线bug
luozheng [Sat, 28 Sep 2024 09:05:53 +0000 (17:05 +0800)]
解决#671,蓝牙设备名称只显示一个时需要固定不能,去掉下面横线bug

2 years ago 修改省电模式改为进入省电模式后必须手动再开启通话和蓝牙 #395 1048/2
hcj [Sat, 28 Sep 2024 09:00:47 +0000 (17:00 +0800)]
 修改省电模式改为进入省电模式后必须手动再开启通话和蓝牙 #395

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

2 years ago增加在ble断连后ANCS无法重新发现服务,直接尝试订阅,实测有改善消息通知失效问题(补 ) 1048/1
hcj [Sat, 28 Sep 2024 08:18:35 +0000 (16:18 +0800)]
增加在ble断连后ANCS无法重新发现服务,直接尝试订阅,实测有改善消息通知失效问题(补 )