snickersun@163.com [Thu, 24 Oct 2024 07:58:51 +0000 (07:58 +0000)]
Merge #1249 into sdk602patch0911 from refs/changes/1249/head
Code review from snickersun@163.com
* refs/changes/1249/head: (3 commits squashed)
- 添加4part 4分区版本编译参数
- 更新漏掉的update.fwpkg 文件路径修改
- Merge branch 'sdk602patch0911' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
Signed-off-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.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/1249
罗正 [Thu, 24 Oct 2024 07:58:41 +0000 (07:58 +0000)]
Merge #1247 into sdk602patch0911 from refs/changes/1247/head
Code review from 罗正
* refs/changes/1247/head: (21 commits squashed)
- 来电界面,禁止双击进入AI
- 录音列表视图修改为右滑退出到录音主视图
- Merge branch 'sdk602patch0911' 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 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 优化查找手表的播放音频逻辑
- 修复录音播放完后等待一段时间再去点击录音播放,需要点击两次bug
- 修复音乐播放器在切换到手机音乐无法调节音量bug
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- AI语音界面修改,提示将英文改为中文提醒
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 实现AI答案恢复,列表同步滚动
- 将power键;亮屏改为release触发
- #477,系统更新界面提示,改成灰色透明弹窗提示,这个不显眼(需求)
- 修改applist退出和进入统一动画,只有蜂窝才有
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- #1066,解决,手表端连续创建三个闹钟,再接着删除第二个闹钟,同步IOS APP成功,APP闹钟界面第三个闹钟显示为00:00(必现) bug
#1065,解决APP创建5个闹钟后再删除一个,同步手表成功,手表端无法再新增闹钟(必现)
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/1247
hcj [Thu, 24 Oct 2024 06:52:23 +0000 (14:52 +0800)]
目标数据默认值修改
hcj [Thu, 24 Oct 2024 06:47:32 +0000 (14:47 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
hcj [Thu, 24 Oct 2024 06:47:13 +0000 (14:47 +0800)]
通讯录修改
hcj [Thu, 24 Oct 2024 06:36:44 +0000 (14:36 +0800)]
修改目标达成窗口
hcj [Thu, 24 Oct 2024 06:30:13 +0000 (14:30 +0800)]
SOS呼叫修改
SnickerSun [Thu, 24 Oct 2024 00:30:21 +0000 (08:30 +0800)]
release V1.3.72
袁清梦 [Thu, 24 Oct 2024 00:17:55 +0000 (00:17 +0000)]
Merge #1243 into sdk602patch0911 from refs/changes/1243/head
Code review from 袁清梦
* refs/changes/1243/head: (8 commits squashed)
- 系统:增加亮屏函数打印
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- #994 心率界面检测显示有全天心率数据(最大值 ,最小值 )手表重启后,最大值 ,最小值消失显示为--
- 心率:增加读取控制
- 血氧:增加读写控制
- 系统:修改死机文件的生成路径
- 健康数据:增加存储宏控制
- 心率:关闭MSG_SAVE_TEST宏
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/1243
胡传军 [Thu, 24 Oct 2024 00:17:33 +0000 (00:17 +0000)]
Merge #1241 into sdk602patch0911 from refs/changes/1241/head
Code review from 胡传军
* refs/changes/1241/head: (21 commits squashed)
- 先关闭4G电话对麦克风管理,可能导致音频系统锁死
- 修复电话界面动画问题
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- 增加最大数量表盘限制,待测试 ,修改BLE打印日志
- 修改获取全部表盘id接口防止越界
- 电话修改
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- 优化电话中再呼叫SOS
- 合并
- 增加蓝牙更改广播参数接口
- 产测蓝牙广播频率修改
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- 增加4G对麦克风管理,多次测试未复现,需再验证
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- 优化电话对音频的处理
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- 增加步数单位
- OTA fopen 修复
- 闹钟传输修复
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/1241
罗正 [Thu, 24 Oct 2024 00:17:16 +0000 (00:17 +0000)]
Merge #1244 into sdk602patch0911 from refs/changes/1244/head
Code review from 罗正
* refs/changes/1244/head: (19 commits squashed)
- 来电界面,禁止双击进入AI
- 录音列表视图修改为右滑退出到录音主视图
- Merge branch 'sdk602patch0911' 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 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 优化查找手表的播放音频逻辑
- 修复录音播放完后等待一段时间再去点击录音播放,需要点击两次bug
- 修复音乐播放器在切换到手机音乐无法调节音量bug
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- AI语音界面修改,提示将英文改为中文提醒
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 实现AI答案恢复,列表同步滚动
- 将power键;亮屏改为release触发
- #477,系统更新界面提示,改成灰色透明弹窗提示,这个不显眼(需求)
- 修改applist退出和进入统一动画,只有蜂窝才有
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/1244
hcj [Wed, 23 Oct 2024 11:57:21 +0000 (19:57 +0800)]
闹钟传输修复
penglei [Wed, 23 Oct 2024 11:41:42 +0000 (19:41 +0800)]
老化测试增加获取充电状态
penglei [Wed, 23 Oct 2024 11:38:10 +0000 (19:38 +0800)]
增加蓝牙音乐与蓝牙通话音量,改善音质
hcj [Wed, 23 Oct 2024 06:18:17 +0000 (14:18 +0800)]
OTA fopen 修复
hcj [Wed, 23 Oct 2024 03:23:38 +0000 (11:23 +0800)]
增加步数单位
hcj [Tue, 22 Oct 2024 09:58:13 +0000 (17:58 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
彭磊 [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
SnickerSun [Tue, 22 Oct 2024 09:56:32 +0000 (17:56 +0800)]
Merge branch 'sdk602patch0911' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
SnickerSun [Tue, 22 Oct 2024 09:56:20 +0000 (17:56 +0800)]
适配autoota 函数
hcj [Tue, 22 Oct 2024 08:34:54 +0000 (16:34 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
hcj [Tue, 22 Oct 2024 08:34:23 +0000 (16:34 +0800)]
优化电话对音频的处理
罗正 [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 'sdk602patch0911' 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 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' 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
Caisking [Tue, 22 Oct 2024 08:17:30 +0000 (16:17 +0800)]
充电:增加运动不弹窗
Caisking [Tue, 22 Oct 2024 08:07:28 +0000 (16:07 +0800)]
ble:优化数据同步
Caisking [Tue, 22 Oct 2024 06:46:53 +0000 (14:46 +0800)]
表盘:增加116~131表盘缩约图
Caisking [Tue, 22 Oct 2024 06:42:41 +0000 (14:42 +0800)]
表盘:修复自定义表盘更新刷新异常
Caisking [Tue, 22 Oct 2024 03:03:44 +0000 (11:03 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
Caisking [Tue, 22 Oct 2024 03:03:37 +0000 (11:03 +0800)]
#1057手表,表盘排序
hcj [Tue, 22 Oct 2024 01:57:53 +0000 (09:57 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
penglei [Tue, 22 Oct 2024 01:38:29 +0000 (09:38 +0800)]
修复编译问题
penglei [Mon, 21 Oct 2024 12:40:45 +0000 (20:40 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
Caisking [Mon, 21 Oct 2024 12:16:28 +0000 (20:16 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
胡传军 [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 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- 增加最大数量表盘限制,待测试 ,修改BLE打印日志
- 修改获取全部表盘id接口防止越界
- 电话修改
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- 优化电话中再呼叫SOS
- 合并
- 增加蓝牙更改广播参数接口
- 产测蓝牙广播频率修改
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- 增加4G对麦克风管理,多次测试未复现,需再验证
- Merge branch 'sdk602patch0911' 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
罗正 [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 'sdk602patch0911' 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 'sdk602patch0911' 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
袁清梦 [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 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 系统:删除res无用资源
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 语音助手:修复对话界面的异常滑动
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 表盘:同步修改表盘分区路径
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 系统:增加6个功能文件夹的内存查询显示
- Merge branch 'sdk602patch0911' 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
SnickerSun [Mon, 21 Oct 2024 11:48:56 +0000 (19:48 +0800)]
添加脚本,修改oob64配置的 file.bin ,给专门烧录厂生产用。
Caisking [Mon, 21 Oct 2024 10:47:36 +0000 (18:47 +0800)]
表盘:优化ble安装表盘的错误弹窗显示
hcj [Mon, 21 Oct 2024 10:41:51 +0000 (18:41 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
hcj [Mon, 21 Oct 2024 10:41:11 +0000 (18:41 +0800)]
增加4G对麦克风管理,多次测试未复现,需再验证
Caisking [Mon, 21 Oct 2024 10:32:24 +0000 (18:32 +0800)]
表盘:同步ble修改(已验证)
Caisking [Mon, 21 Oct 2024 09:28:25 +0000 (17:28 +0800)]
表盘:增加表盘数量与空间校验
SnickerSun [Mon, 21 Oct 2024 09:25:09 +0000 (17:25 +0800)]
fix oob128 do release copy
Caisking [Mon, 21 Oct 2024 09:17:36 +0000 (17:17 +0800)]
心率:增加弹窗脱腕(待添加)
SnickerSun [Mon, 21 Oct 2024 08:24:08 +0000 (16:24 +0800)]
修复oob128烧写后的flash读取错误
Caisking [Mon, 21 Oct 2024 08:07:09 +0000 (16:07 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
Caisking [Mon, 21 Oct 2024 08:07:04 +0000 (16:07 +0800)]
系统:增加6个功能文件夹的内存查询显示
袁清梦 [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 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 系统:删除res无用资源
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 语音助手:修复对话界面的异常滑动
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 表盘:同步修改表盘分区路径
- Merge branch 'sdk602patch0911' 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
胡传军 [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 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- 增加最大数量表盘限制,待测试 ,修改BLE打印日志
- 修改获取全部表盘id接口防止越界
- 电话修改
- Merge branch 'sdk602patch0911' 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
Caisking [Mon, 21 Oct 2024 07:04:20 +0000 (15:04 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
Caisking [Mon, 21 Oct 2024 07:04:15 +0000 (15:04 +0800)]
表盘:同步修改表盘分区路径
hcj [Mon, 21 Oct 2024 06:09:02 +0000 (14:09 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
Caisking [Mon, 21 Oct 2024 06:05:12 +0000 (14:05 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
SnickerSun [Mon, 21 Oct 2024 05:28:53 +0000 (13:28 +0800)]
release V1.3.1
SnickerSun [Mon, 21 Oct 2024 05:27:00 +0000 (13:27 +0800)]
更新nandflash分区为单分区模式。默认开启单分区模式
SINGLE_USER_PARTITION
'single_user_partition': 'True', == true or false
hcj [Mon, 21 Oct 2024 03:09:13 +0000 (11:09 +0800)]
产测蓝牙广播频率修改
hcj [Mon, 21 Oct 2024 03:06:06 +0000 (11:06 +0800)]
增加蓝牙更改广播参数接口
hcj [Mon, 21 Oct 2024 02:58:23 +0000 (10:58 +0800)]
合并
hcj [Mon, 21 Oct 2024 02:55:29 +0000 (10:55 +0800)]
优化电话中再呼叫SOS
Caisking [Mon, 21 Oct 2024 02:25:47 +0000 (10:25 +0800)]
语音助手:修复对话界面的异常滑动
Caisking [Mon, 21 Oct 2024 02:20:30 +0000 (10:20 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
袁清梦 [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 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' 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
胡传军 [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 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- 增加最大数量表盘限制,待测试 ,修改BLE打印日志
- 修改获取全部表盘id接口防止越界
- 电话修改
- Merge branch 'sdk602patch0911' 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
彭磊 [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
luozheng [Sun, 20 Oct 2024 10:55:37 +0000 (18:55 +0800)]
内存分配管理定义和文件同步接口判断实现(待验证)
penglei [Sun, 20 Oct 2024 10:55:24 +0000 (18:55 +0800)]
优化蓝牙产测老化测试,按键测试
luozheng [Sun, 20 Oct 2024 10:53:41 +0000 (18:53 +0800)]
录音刷新采用Notify刷新UI而不再使用timer刷新
penglei [Sun, 20 Oct 2024 10:06:56 +0000 (18:06 +0800)]
优化小睡数据存储
hcj [Sun, 20 Oct 2024 09:46:17 +0000 (17:46 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
hcj [Sun, 20 Oct 2024 09:45:41 +0000 (17:45 +0800)]
电话修改
Caisking [Sun, 20 Oct 2024 09:44:05 +0000 (17:44 +0800)]
系统:删除res无用资源
Caisking [Sun, 20 Oct 2024 08:55:21 +0000 (16:55 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
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
luozheng [Sun, 20 Oct 2024 07:57:20 +0000 (15:57 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
luozheng [Sun, 20 Oct 2024 07:56:30 +0000 (15:56 +0800)]
1.倒计时界面,UI刷新改用Notify,减少误差
2.倒计时响铃流类型改为:AUDIO_STREAM_NOTIFICATION_SYSTEM 支持a2dp播放时混音
Caisking [Sun, 20 Oct 2024 07:50:25 +0000 (15:50 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
SnickerSun [Sun, 20 Oct 2024 05:53:40 +0000 (13:53 +0800)]
补充提交 去除mout user 操作
SnickerSun [Sun, 20 Oct 2024 05:42:44 +0000 (13:42 +0800)]
添加nandflash oob128 支持
SnickerSun [Sun, 20 Oct 2024 05:40:07 +0000 (13:40 +0800)]
由于mount速度已经加快,恢复正常mount 顺序,取消剥离的mount user分区操作
SnickerSun [Sun, 20 Oct 2024 05:20:00 +0000 (13:20 +0800)]
Merge branch 'sdk602patch0911' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
SnickerSun [Sun, 20 Oct 2024 05:13:57 +0000 (13:13 +0800)]
custom_cmd_service 添加 优先执行指令下达接口
SnickerSun [Sun, 20 Oct 2024 05:11:40 +0000 (13:11 +0800)]
Merge branch 'sdk602patch0911' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
SnickerSun [Sun, 20 Oct 2024 05:11:34 +0000 (13:11 +0800)]
关机添加文件索引同步,解决关机后开机mount特别慢问题
penglei [Sun, 20 Oct 2024 05:03:48 +0000 (13:03 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
penglei [Sun, 20 Oct 2024 05:03:42 +0000 (13:03 +0800)]
修改睡眠文件存储,移植dml底层处理
彭磊 [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 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- 修改开机动画图片路径到“user/res/ReBootAndShutDown”
- 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/1218
袁清梦 [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
penglei [Sun, 20 Oct 2024 03:52:20 +0000 (11:52 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
penglei [Sun, 20 Oct 2024 03:52:01 +0000 (11:52 +0800)]
修改开机动画图片路径到“user/res/ReBootAndShutDown”
胡传军 [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 'sdk602patch0911' 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
hcj [Sun, 20 Oct 2024 03:26:08 +0000 (11:26 +0800)]
修改获取全部表盘id接口防止越界
hcj [Sun, 20 Oct 2024 03:06:53 +0000 (11:06 +0800)]
增加最大数量表盘限制,待测试 ,修改BLE打印日志
Caisking [Sat, 19 Oct 2024 11:11:40 +0000 (19:11 +0800)]
#105 5手表开启勿扰模式表盘界面会显示勿扰图标,重启后表盘勿扰图标消失(实际还是勿扰状态,下拉状态栏的勿扰图标是高亮的)
luozheng [Sat, 19 Oct 2024 11:10:41 +0000 (19:10 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
hcj [Sat, 19 Oct 2024 11:01:48 +0000 (19:01 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
hcj [Sat, 19 Oct 2024 11:01:12 +0000 (19:01 +0800)]
修复电话界面动画问题
penglei [Sat, 19 Oct 2024 10:58:01 +0000 (18:58 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
penglei [Sat, 19 Oct 2024 10:57:39 +0000 (18:57 +0800)]
优化睡眠状态下误判为未佩戴的情况。
修改小睡佩戴检测Timer为1分钟,优化小睡入睡时间计算。
添加tar文件内存管理。
胡传军 [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
luozheng [Sat, 19 Oct 2024 10:42:33 +0000 (18:42 +0800)]
AI语音修改:
1.发送取消对话指令改为直接发送,减少出现上次对话内容出现在下一次对话的UI显示上
2.关闭AI语音多余打印