mirrors/FD230.git
2 years agoMerge #1240 into sdk602patch0911 from refs/changes/1240/head 1241/target/2 1243/target/1 1244/target/1 1245/target/1
彭磊 [Tue, 22 Oct 2024 09:57:57 +0000 (09:57 +0000)]
Merge #1240 into sdk602patch0911 from refs/changes/1240/head

Code review from 彭磊

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

  - 优化睡眠存储,增加佩戴状态runtime

  - 优化产测老化测试

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

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/1240
2 years agoMerge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 1242/1 1242/head
SnickerSun [Tue, 22 Oct 2024 09:56:32 +0000 (17:56 +0800)]
Merge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago适配autoota 函数
SnickerSun [Tue, 22 Oct 2024 09:56:20 +0000 (17:56 +0800)]
适配autoota 函数

2 years agoMerge #1239 into sdk602patch0911 from refs/changes/1239/head 1240/target/1 1241/target/1 1242/target/1
罗正 [Tue, 22 Oct 2024 08:20:20 +0000 (08:20 +0000)]
Merge #1239 into sdk602patch0911 from refs/changes/1239/head

Code review from 罗正

* refs/changes/1239/head: (12 commits squashed)

  - 来电界面,禁止双击进入AI

  - 录音列表视图修改为右滑退出到录音主视图

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

  - 1.一个分区模式下修改音乐和录音文件夹
    2.录音添加空间判断管理
    3.录音添加”空间已满弹窗“:在总时长大于20分钟或总数大于等于99,录音总空间大于等于10M,弹出
    4.判断录音空间大小是否超出采用指令队列读职
    5.修改底层录音文件audio_capture_wrapper.cpp大小参数使之录取一个录音最长时间在20分钟左右

  - 修改音乐播放器函数名英文错误拼写

  - 如果手表在播放本地音乐,AI界面点击开始对话会暂停本地音乐播放,避免混音

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

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

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

  - 优化查找手表的播放音频逻辑

  - 修复录音播放完后等待一段时间再去点击录音播放,需要点击两次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/1239
2 years ago充电:增加运动不弹窗 1238/3 1238/head
Caisking [Tue, 22 Oct 2024 08:17:30 +0000 (16:17 +0800)]
充电:增加运动不弹窗

2 years agoble:优化数据同步
Caisking [Tue, 22 Oct 2024 08:07:28 +0000 (16:07 +0800)]
ble:优化数据同步

2 years ago表盘:增加116~131表盘缩约图 1238/2
Caisking [Tue, 22 Oct 2024 06:46:53 +0000 (14:46 +0800)]
表盘:增加116~131表盘缩约图

2 years ago表盘:修复自定义表盘更新刷新异常
Caisking [Tue, 22 Oct 2024 06:42:41 +0000 (14:42 +0800)]
表盘:修复自定义表盘更新刷新异常

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1238/1
Caisking [Tue, 22 Oct 2024 03:03:44 +0000 (11:03 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago#1057手表,表盘排序
Caisking [Tue, 22 Oct 2024 03:03:37 +0000 (11:03 +0800)]
#1057手表,表盘排序

2 years ago修复编译问题 1237/2 1237/head 1238/target/1 1239/target/1
penglei [Tue, 22 Oct 2024 01:38:29 +0000 (09:38 +0800)]
修复编译问题

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1237/1
penglei [Mon, 21 Oct 2024 12:40:45 +0000 (20:40 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Mon, 21 Oct 2024 12:16:28 +0000 (20:16 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agoMerge #1235 into sdk602patch0911 from refs/changes/1235/head 1237/target/1
胡传军 [Mon, 21 Oct 2024 11:51:36 +0000 (11:51 +0000)]
Merge #1235 into sdk602patch0911 from refs/changes/1235/head

Code review from 胡传军

* refs/changes/1235/head: (14 commits squashed)

  - 先关闭4G电话对麦克风管理,可能导致音频系统锁死

  - 修复电话界面动画问题

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

  - 增加最大数量表盘限制,待测试 ,修改BLE打印日志

  - 修改获取全部表盘id接口防止越界

  - 电话修改

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

  - 优化电话中再呼叫SOS

  - 合并

  - 增加蓝牙更改广播参数接口

  - 产测蓝牙广播频率修改

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

  - 增加4G对麦克风管理,多次测试未复现,需再验证

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

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/1235
2 years agoMerge #1236 into sdk602patch0911 from refs/changes/1236/head
罗正 [Mon, 21 Oct 2024 11:51:22 +0000 (11:51 +0000)]
Merge #1236 into sdk602patch0911 from refs/changes/1236/head

Code review from 罗正

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

  - 来电界面,禁止双击进入AI

  - 录音列表视图修改为右滑退出到录音主视图

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

  - 1.一个分区模式下修改音乐和录音文件夹
    2.录音添加空间判断管理
    3.录音添加”空间已满弹窗“:在总时长大于20分钟或总数大于等于99,录音总空间大于等于10M,弹出
    4.判断录音空间大小是否超出采用指令队列读职
    5.修改底层录音文件audio_capture_wrapper.cpp大小参数使之录取一个录音最长时间在20分钟左右

  - 修改音乐播放器函数名英文错误拼写

  - 如果手表在播放本地音乐,AI界面点击开始对话会暂停本地音乐播放,避免混音

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

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/1236
2 years agoMerge #1233 into sdk602patch0911 from refs/changes/1233/head
袁清梦 [Mon, 21 Oct 2024 11:50:55 +0000 (11:50 +0000)]
Merge #1233 into sdk602patch0911 from refs/changes/1233/head

Code review from 袁清梦

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

  - #105 5手表开启勿扰模式表盘界面会显示勿扰图标,重启后表盘勿扰图标消失(实际还是勿扰状态,下拉状态栏的勿扰图标是高亮的)

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

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

  - 系统:删除res无用资源

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

  - 语音助手:修复对话界面的异常滑动

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

  - 表盘:同步修改表盘分区路径

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

  - 系统:增加6个功能文件夹的内存查询显示

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

  - 心率:增加弹窗脱腕(待添加)

  - 表盘:增加表盘数量与空间校验

  - 表盘:同步ble修改(已验证)

  - 表盘:优化ble安装表盘的错误弹窗显示

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/1233
2 years ago添加脚本,修改oob64配置的 file.bin ,给专门烧录厂生产用。 1234/3 1234/head
SnickerSun [Mon, 21 Oct 2024 11:48:56 +0000 (19:48 +0800)]
添加脚本,修改oob64配置的 file.bin ,给专门烧录厂生产用。

2 years ago表盘:优化ble安装表盘的错误弹窗显示 1233/3 1233/head
Caisking [Mon, 21 Oct 2024 10:47:36 +0000 (18:47 +0800)]
表盘:优化ble安装表盘的错误弹窗显示

2 years ago表盘:同步ble修改(已验证)
Caisking [Mon, 21 Oct 2024 10:32:24 +0000 (18:32 +0800)]
表盘:同步ble修改(已验证)

2 years ago表盘:增加表盘数量与空间校验 1233/2
Caisking [Mon, 21 Oct 2024 09:28:25 +0000 (17:28 +0800)]
表盘:增加表盘数量与空间校验

2 years agofix oob128 do release copy 1234/2
SnickerSun [Mon, 21 Oct 2024 09:25:09 +0000 (17:25 +0800)]
fix oob128 do release copy

2 years ago心率:增加弹窗脱腕(待添加)
Caisking [Mon, 21 Oct 2024 09:17:36 +0000 (17:17 +0800)]
心率:增加弹窗脱腕(待添加)

2 years ago修复oob128烧写后的flash读取错误 1234/1
SnickerSun [Mon, 21 Oct 2024 08:24:08 +0000 (16:24 +0800)]
修复oob128烧写后的flash读取错误

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1233/1
Caisking [Mon, 21 Oct 2024 08:07:09 +0000 (16:07 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago系统:增加6个功能文件夹的内存查询显示
Caisking [Mon, 21 Oct 2024 08:07:04 +0000 (16:07 +0800)]
系统:增加6个功能文件夹的内存查询显示

2 years agoMerge #1232 into sdk602patch0911 from refs/changes/1232/head 1233/target/1 1234/target/1 1235/target/1 1236/target/1
袁清梦 [Mon, 21 Oct 2024 07:41:40 +0000 (07:41 +0000)]
Merge #1232 into sdk602patch0911 from refs/changes/1232/head

Code review from 袁清梦

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

  - #105 5手表开启勿扰模式表盘界面会显示勿扰图标,重启后表盘勿扰图标消失(实际还是勿扰状态,下拉状态栏的勿扰图标是高亮的)

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

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

  - 系统:删除res无用资源

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

  - 语音助手:修复对话界面的异常滑动

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

  - 表盘:同步修改表盘分区路径

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

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/1232
2 years agoMerge #1229 into sdk602patch0911 from refs/changes/1229/head
胡传军 [Mon, 21 Oct 2024 07:04:28 +0000 (07:04 +0000)]
Merge #1229 into sdk602patch0911 from refs/changes/1229/head

Code review from 胡传军

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

  - 先关闭4G电话对麦克风管理,可能导致音频系统锁死

  - 修复电话界面动画问题

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

  - 增加最大数量表盘限制,待测试 ,修改BLE打印日志

  - 修改获取全部表盘id接口防止越界

  - 电话修改

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

  - 优化电话中再呼叫SOS

  - 合并

  - 增加蓝牙更改广播参数接口

  - 产测蓝牙广播频率修改

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/1229
2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1232/1 1232/head
Caisking [Mon, 21 Oct 2024 07:04:20 +0000 (15:04 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago表盘:同步修改表盘分区路径
Caisking [Mon, 21 Oct 2024 07:04:15 +0000 (15:04 +0800)]
表盘:同步修改表盘分区路径

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Mon, 21 Oct 2024 06:05:12 +0000 (14:05 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agorelease V1.3.1 1231/1 1231/head 1232/target/1
SnickerSun [Mon, 21 Oct 2024 05:28:53 +0000 (13:28 +0800)]
release V1.3.1

2 years ago更新nandflash分区为单分区模式。默认开启单分区模式 1230/1 1230/head 1231/target/1
SnickerSun [Mon, 21 Oct 2024 05:27:00 +0000 (13:27 +0800)]
更新nandflash分区为单分区模式。默认开启单分区模式
SINGLE_USER_PARTITION
        'single_user_partition': 'True', == true or false

2 years ago语音助手:修复对话界面的异常滑动
Caisking [Mon, 21 Oct 2024 02:25:47 +0000 (10:25 +0800)]
语音助手:修复对话界面的异常滑动

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Mon, 21 Oct 2024 02:20:30 +0000 (10:20 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agoMerge #1226 into sdk602patch0911 from refs/changes/1226/head 1229/target/1 1230/target/1 release_V1.2.71
袁清梦 [Mon, 21 Oct 2024 02:19:56 +0000 (02:19 +0000)]
Merge #1226 into sdk602patch0911 from refs/changes/1226/head

Code review from 袁清梦

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

  - #105 5手表开启勿扰模式表盘界面会显示勿扰图标,重启后表盘勿扰图标消失(实际还是勿扰状态,下拉状态栏的勿扰图标是高亮的)

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

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

  - 系统:删除res无用资源

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/1226
2 years agoMerge #1227 into sdk602patch0911 from refs/changes/1227/head
胡传军 [Mon, 21 Oct 2024 02:19:39 +0000 (02:19 +0000)]
Merge #1227 into sdk602patch0911 from refs/changes/1227/head

Code review from 胡传军

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

  - 先关闭4G电话对麦克风管理,可能导致音频系统锁死

  - 修复电话界面动画问题

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

  - 增加最大数量表盘限制,待测试 ,修改BLE打印日志

  - 修改获取全部表盘id接口防止越界

  - 电话修改

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

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/1227
2 years agoMerge #1228 into sdk602patch0911 from refs/changes/1228/head
彭磊 [Mon, 21 Oct 2024 02:19:27 +0000 (02:19 +0000)]
Merge #1228 into sdk602patch0911 from refs/changes/1228/head

优化小睡数据存储

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

  - 优化小睡数据存储

  - 优化蓝牙产测老化测试,按键测试

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/1228
2 years ago内存分配管理定义和文件同步接口判断实现(待验证) 1225/2 1225/head
luozheng [Sun, 20 Oct 2024 10:55:37 +0000 (18:55 +0800)]
内存分配管理定义和文件同步接口判断实现(待验证)

2 years ago优化蓝牙产测老化测试,按键测试 1228/2 1228/head
penglei [Sun, 20 Oct 2024 10:55:24 +0000 (18:55 +0800)]
优化蓝牙产测老化测试,按键测试

2 years ago录音刷新采用Notify刷新UI而不再使用timer刷新
luozheng [Sun, 20 Oct 2024 10:53:41 +0000 (18:53 +0800)]
录音刷新采用Notify刷新UI而不再使用timer刷新

2 years ago优化小睡数据存储 1228/1
penglei [Sun, 20 Oct 2024 10:06:56 +0000 (18:06 +0800)]
优化小睡数据存储

2 years ago系统:删除res无用资源 1226/1 1226/head
Caisking [Sun, 20 Oct 2024 09:44:05 +0000 (17:44 +0800)]
系统:删除res无用资源

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Sun, 20 Oct 2024 08:55:21 +0000 (16:55 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agoMerge branches 'sdk602patch0911' and 'sdk602patch0911' of https://codeup.aliyun.com... 1225/1
luozheng [Sun, 20 Oct 2024 08:06:02 +0000 (16:06 +0800)]
Merge branches 'sdk602patch0911' and 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Sun, 20 Oct 2024 07:57:20 +0000 (15:57 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago1.倒计时界面,UI刷新改用Notify,减少误差
luozheng [Sun, 20 Oct 2024 07:56:30 +0000 (15:56 +0800)]
1.倒计时界面,UI刷新改用Notify,减少误差
2.倒计时响铃流类型改为:AUDIO_STREAM_NOTIFICATION_SYSTEM 支持a2dp播放时混音

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Sun, 20 Oct 2024 07:50:25 +0000 (15:50 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago补充提交 去除mout user 操作 1224/1 1224/head 1225/target/1 1226/target/1 1227/target/1 1228/target/1 release_V1.2.70_20241020_135402
SnickerSun [Sun, 20 Oct 2024 05:53:40 +0000 (13:53 +0800)]
补充提交 去除mout user 操作

2 years ago添加nandflash oob128 支持 1223/1 1223/head 1224/target/1
SnickerSun [Sun, 20 Oct 2024 05:42:44 +0000 (13:42 +0800)]
添加nandflash oob128 支持

2 years ago由于mount速度已经加快,恢复正常mount 顺序,取消剥离的mount user分区操作
SnickerSun [Sun, 20 Oct 2024 05:40:07 +0000 (13:40 +0800)]
由于mount速度已经加快,恢复正常mount 顺序,取消剥离的mount user分区操作

2 years agoMerge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
SnickerSun [Sun, 20 Oct 2024 05:20:00 +0000 (13:20 +0800)]
Merge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agocustom_cmd_service 添加 优先执行指令下达接口
SnickerSun [Sun, 20 Oct 2024 05:13:57 +0000 (13:13 +0800)]
custom_cmd_service 添加 优先执行指令下达接口

2 years agoMerge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
SnickerSun [Sun, 20 Oct 2024 05:11:40 +0000 (13:11 +0800)]
Merge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago关机添加文件索引同步,解决关机后开机mount特别慢问题
SnickerSun [Sun, 20 Oct 2024 05:11:34 +0000 (13:11 +0800)]
关机添加文件索引同步,解决关机后开机mount特别慢问题

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1222/1 1222/head 1223/target/1
penglei [Sun, 20 Oct 2024 05:03:48 +0000 (13:03 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago修改睡眠文件存储,移植dml底层处理
penglei [Sun, 20 Oct 2024 05:03:42 +0000 (13:03 +0800)]
修改睡眠文件存储,移植dml底层处理

2 years agoMerge #1218 into sdk602patch0911 from refs/changes/1218/head 1222/target/1
彭磊 [Sun, 20 Oct 2024 03:56:09 +0000 (03:56 +0000)]
Merge #1218 into sdk602patch0911 from refs/changes/1218/head

Code review from 彭磊

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

  - 优化睡眠状态下误判为未佩戴的情况。
    修改小睡佩戴检测Timer为1分钟,优化小睡入睡时间计算。
    添加tar文件内存管理。

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

  - 修改开机动画图片路径到“user/res/ReBootAndShutDown”

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

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/1218
2 years agoMerge #1221 into sdk602patch0911 from refs/changes/1221/head
袁清梦 [Sun, 20 Oct 2024 03:54:03 +0000 (03:54 +0000)]
Merge #1221 into sdk602patch0911 from refs/changes/1221/head

#1055 手表开启勿扰模式表盘界面会显示勿扰图标,重启后表盘勿扰图标消失(实际还是勿扰状态,下拉状态栏的勿扰图标是高亮的)

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

  - #105 5手表开启勿扰模式表盘界面会显示勿扰图标,重启后表盘勿扰图标消失(实际还是勿扰状态,下拉状态栏的勿扰图标是高亮的)

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/1221
2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1218/2 1218/head
penglei [Sun, 20 Oct 2024 03:52:20 +0000 (11:52 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago修改开机动画图片路径到“user/res/ReBootAndShutDown”
penglei [Sun, 20 Oct 2024 03:52:01 +0000 (11:52 +0800)]
修改开机动画图片路径到“user/res/ReBootAndShutDown”

2 years agoMerge #1219 into sdk602patch0911 from refs/changes/1219/head 1218/target/2
胡传军 [Sun, 20 Oct 2024 03:51:39 +0000 (03:51 +0000)]
Merge #1219 into sdk602patch0911 from refs/changes/1219/head

Code review from 胡传军

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

  - 先关闭4G电话对麦克风管理,可能导致音频系统锁死

  - 修复电话界面动画问题

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

  - 增加最大数量表盘限制,待测试 ,修改BLE打印日志

  - 修改获取全部表盘id接口防止越界

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/1219
2 years ago#105 5手表开启勿扰模式表盘界面会显示勿扰图标,重启后表盘勿扰图标消失(实际还是勿扰状态,下拉状态栏的勿扰图标是高亮的) 1221/1 1221/head
Caisking [Sat, 19 Oct 2024 11:11:40 +0000 (19:11 +0800)]
#105 5手表开启勿扰模式表盘界面会显示勿扰图标,重启后表盘勿扰图标消失(实际还是勿扰状态,下拉状态栏的勿扰图标是高亮的)

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1220/1 1220/head
luozheng [Sat, 19 Oct 2024 11:10:41 +0000 (19:10 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1218/1
penglei [Sat, 19 Oct 2024 10:58:01 +0000 (18:58 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago优化睡眠状态下误判为未佩戴的情况。
penglei [Sat, 19 Oct 2024 10:57:39 +0000 (18:57 +0800)]
优化睡眠状态下误判为未佩戴的情况。
修改小睡佩戴检测Timer为1分钟,优化小睡入睡时间计算。
添加tar文件内存管理。

2 years agoMerge #1216 into sdk602patch0911 from refs/changes/1216/head 1218/target/1 1219/target/1 1220/target/1 1221/target/1
胡传军 [Sat, 19 Oct 2024 10:56:44 +0000 (10:56 +0000)]
Merge #1216 into sdk602patch0911 from refs/changes/1216/head

先关闭4G电话对麦克风管理,可能导致音频系统锁死

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

  - 先关闭4G电话对麦克风管理,可能导致音频系统锁死

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/1216
2 years agoAI语音修改:
luozheng [Sat, 19 Oct 2024 10:42:33 +0000 (18:42 +0800)]
AI语音修改:
1.发送取消对话指令改为直接发送,减少出现上次对话内容出现在下一次对话的UI显示上
2.关闭AI语音多余打印

2 years ago修复编译问题 1217/1 1217/head
Caisking [Sat, 19 Oct 2024 09:01:05 +0000 (17:01 +0800)]
修复编译问题

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

2 years ago心率:优化心率nextday可能不会清空的现象
Caisking [Sat, 19 Oct 2024 08:19:02 +0000 (16:19 +0800)]
心率:优化心率nextday可能不会清空的现象

2 years agodebug_output提交修改
luozheng [Sat, 19 Oct 2024 08:18:17 +0000 (16:18 +0800)]
debug_output提交修改

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Sat, 19 Oct 2024 08:04:13 +0000 (16:04 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago在播放手机音乐的时候,如果想对本地音乐操作这时弹窗提示,不能对本地音乐操作
luozheng [Sat, 19 Oct 2024 07:52:07 +0000 (15:52 +0800)]
在播放手机音乐的时候,如果想对本地音乐操作这时弹窗提示,不能对本地音乐操作

2 years agoMerge #1215 into sdk602patch0911 from refs/changes/1215/head 1216/target/1 1217/target/1
罗正 [Sat, 19 Oct 2024 07:15:40 +0000 (07:15 +0000)]
Merge #1215 into sdk602patch0911 from refs/changes/1215/head

Code review from 罗正

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

  - AI语音录音时间由15修改为10秒,10秒后超时自动发送录音数据

  - 1.目标提醒弹窗加震动
    2.运动识别和久坐提醒震动增加受勿扰和睡眠模式开关影响
    3.修改默认震动强度为中

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

  - 修改KV Store 的Cache 大小为100

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

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

  - #1029,解决,手表,iOS,手机播放音乐,手表使用AI功能,手表依然在播放音乐,

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

  - 解决训练界面音乐进度条不更新问题

  - #1023,解决闹钟有出现没有声音现象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/1215
2 years agoMerge #1214 into sdk602patch0911 from refs/changes/1214/head
袁清梦 [Sat, 19 Oct 2024 07:15:27 +0000 (07:15 +0000)]
Merge #1214 into sdk602patch0911 from refs/changes/1214/head

系统:增加心率数据的日志记录

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

  - 系统:增加心率数据的日志记录

  - #1049手表,运动室外跑步,500步目标测试,实际600步,目标完成度100%,目标完成度需要进行相应增加120%;

    #1048手表,运动室外跑步,1KM目标测试,实际1259米,目标完成度100%,目标完成度需要进行相应增加125%;

    #1052配速,步频,目标完成度,目标完成提示,都有问题;

    #1047手表,运动室外跑步,1KM目标测试,目标进度条在运动过程中不会变更,在运动达标时直接显示满

  - #1033运动中设置步数目标,弹出步数目标达成提醒时界面目标值的单位显示不全(如果目标值较大的话估计单位就显示。。了)

  - #852设置时长目标10min,运动中到达10分钟时无目标达成提醒

  - #1013 运动中从数据面滑至暂停页后停留一会,再滑至数据页,计时会有跳变过程

  - 睡眠:修复开启睡眠会点亮勿扰icon

  - 睡眠:优化主界面睡眠刷新速度

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/1214
2 years ago#1042 手表,增加部分弹窗的状态监控
luozheng [Sat, 19 Oct 2024 03:03:38 +0000 (11:03 +0800)]
#1042 手表,增加部分弹窗的状态监控

2 years ago#715手表,更换省电模式提示内容
Caisking [Sat, 19 Oct 2024 02:58:30 +0000 (10:58 +0800)]
#715手表,更换省电模式提示内容

2 years ago睡眠:优化主界面睡眠刷新速度 1214/3 1214/head
Caisking [Fri, 18 Oct 2024 12:45:47 +0000 (20:45 +0800)]
睡眠:优化主界面睡眠刷新速度

2 years ago睡眠:修复开启睡眠会点亮勿扰icon
Caisking [Fri, 18 Oct 2024 12:25:21 +0000 (20:25 +0800)]
睡眠:修复开启睡眠会点亮勿扰icon

2 years ago电话音频优化(1 1211/5 1211/head
hcj [Fri, 18 Oct 2024 12:15:36 +0000 (20:15 +0800)]
电话音频优化(1

2 years ago#1013 运动中从数据面滑至暂停页后停留一会,再滑至数据页,计时会有跳变过程 1214/2
Caisking [Fri, 18 Oct 2024 11:47:58 +0000 (19:47 +0800)]
#1013 运动中从数据面滑至暂停页后停留一会,再滑至数据页,计时会有跳变过程

2 years ago电话音频优化 1211/4
hcj [Fri, 18 Oct 2024 11:12:50 +0000 (19:12 +0800)]
电话音频优化

2 years ago#1023,解决闹钟有出现没有声音现象bug 1215/1 1215/head
luozheng [Fri, 18 Oct 2024 10:35:56 +0000 (18:35 +0800)]
#1023,解决闹钟有出现没有声音现象bug

2 years ago#852设置时长目标10min,运动中到达10分钟时无目标达成提醒
Caisking [Fri, 18 Oct 2024 08:58:03 +0000 (16:58 +0800)]
#852设置时长目标10min,运动中到达10分钟时无目标达成提醒

2 years ago#1033运动中设置步数目标,弹出步数目标达成提醒时界面目标值的单位显示不全(如果目标值较大的话估计单位就显示。。了)
Caisking [Fri, 18 Oct 2024 08:51:20 +0000 (16:51 +0800)]
#1033运动中设置步数目标,弹出步数目标达成提醒时界面目标值的单位显示不全(如果目标值较大的话估计单位就显示。。了)

2 years ago#1049手表,运动室外跑步,500步目标测试,实际600步,目标完成度100%,目标完成度需要进行相应增加120%;
Caisking [Fri, 18 Oct 2024 08:49:26 +0000 (16:49 +0800)]
#1049手表,运动室外跑步,500步目标测试,实际600步,目标完成度100%,目标完成度需要进行相应增加120%;

#1048手表,运动室外跑步,1KM目标测试,实际1259米,目标完成度100%,目标完成度需要进行相应增加125%;

#1052配速,步频,目标完成度,目标完成提示,都有问题;

#1047手表,运动室外跑步,1KM目标测试,目标进度条在运动过程中不会变更,在运动达标时直接显示满

2 years ago解决训练界面音乐进度条不更新问题
luozheng [Fri, 18 Oct 2024 08:32:42 +0000 (16:32 +0800)]
解决训练界面音乐进度条不更新问题

2 years ago通话记录修改 改为list 1211/3
hcj [Fri, 18 Oct 2024 07:22:40 +0000 (15:22 +0800)]
通话记录修改 改为list

2 years ago系统:增加心率数据的日志记录 1214/1
Caisking [Fri, 18 Oct 2024 03:46:39 +0000 (11:46 +0800)]
系统:增加心率数据的日志记录

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Fri, 18 Oct 2024 03:07:03 +0000 (11:07 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago#1029,解决,手表,iOS,手机播放音乐,手表使用AI功能,手表依然在播放音乐,
luozheng [Fri, 18 Oct 2024 03:06:58 +0000 (11:06 +0800)]
#1029,解决,手表,iOS,手机播放音乐,手表使用AI功能,手表依然在播放音乐,

2 years ago合并 1211/2
hcj [Fri, 18 Oct 2024 02:50:42 +0000 (10:50 +0800)]
合并

2 years ago添加gen_additional_fs.sh的脚本 1211/target/2 1213/1 1213/head 1214/target/1 1215/target/1
SnickerSun [Fri, 18 Oct 2024 02:18:26 +0000 (10:18 +0800)]
添加gen_additional_fs.sh的脚本

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Fri, 18 Oct 2024 01:54:57 +0000 (09:54 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago心率:优化错误弹窗 1212/3 1212/head 1213/target/1
Caisking [Thu, 17 Oct 2024 12:54:09 +0000 (20:54 +0800)]
心率:优化错误弹窗

2 years ago系统:进行每秒回调判断条件优化 1212/2
Caisking [Thu, 17 Oct 2024 10:24:46 +0000 (18:24 +0800)]
系统:进行每秒回调判断条件优化

2 years ago系统:取消handlewake
Caisking [Thu, 17 Oct 2024 09:57:51 +0000 (17:57 +0800)]
系统:取消handlewake

2 years ago合并代码 1212/1
Caisking [Thu, 17 Oct 2024 09:55:07 +0000 (17:55 +0800)]
合并代码

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

2 years ago系统:增加系统nextday日志的记录
Caisking [Thu, 17 Oct 2024 09:53:28 +0000 (17:53 +0800)]
系统:增加系统nextday日志的记录