mirrors/FD230.git
2 years ago优化倒计时处理逻辑,减少误差 1260/2
luozheng [Fri, 25 Oct 2024 10:28:05 +0000 (18:28 +0800)]
优化倒计时处理逻辑,减少误差

2 years ago解决重启后立马进入一个常亮界面会取消该常亮操作。
luozheng [Fri, 25 Oct 2024 08:00:47 +0000 (16:00 +0800)]
解决重启后立马进入一个常亮界面会取消该常亮操作。

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

2 years ago#1068,出厂默认值(需求)
luozheng [Fri, 25 Oct 2024 03:39:31 +0000 (11:39 +0800)]
#1068,出厂默认值(需求)

2 years agotest 1259/1 1259/head 1260/target/1 1261/target/1 1262/target/1 1263/target/1 1264/target/1
Caisking [Fri, 25 Oct 2024 02:17:50 +0000 (10:17 +0800)]
test

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

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1258/1 1258/head 1259/target/1
luozheng [Fri, 25 Oct 2024 02:14:18 +0000 (10:14 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agotest
luozheng [Fri, 25 Oct 2024 02:14:09 +0000 (10:14 +0800)]
test

2 years ago训练:优化目标处理 1257/1 1257/head
Caisking [Fri, 25 Oct 2024 02:09:53 +0000 (10:09 +0800)]
训练:优化目标处理

2 years agoMerge #1256 into sdk602patch0911 from refs/changes/1256/head 1257/target/1 1258/target/1
罗正 [Thu, 24 Oct 2024 12:41:28 +0000 (12:41 +0000)]
Merge #1256 into sdk602patch0911 from refs/changes/1256/head

Code review from 罗正

* refs/changes/1256/head: (28 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个闹钟后再删除一个,同步手表成功,手表端无法再新增闹钟(必现)

  - #1026,解决,天气显示不同,无法同步bug

  - 应用的按键监听改为释放退出

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

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

  - 根据客户要求修改:press亮屏,press退出应用,取消在applsit界面双击切换applist样式

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

  - #1060,解决,手表,AI全家桶偶尔点击1次继续对话,会有不灵敏的情况,需要点击第2次才能继续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/1256
2 years ago#1060,解决,手表,AI全家桶偶尔点击1次继续对话,会有不灵敏的情况,需要点击第2次才能继续bug 1256/2 1256/head
luozheng [Thu, 24 Oct 2024 12:39:46 +0000 (20:39 +0800)]
#1060,解决,手表,AI全家桶偶尔点击1次继续对话,会有不灵敏的情况,需要点击第2次才能继续bug

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1256/1
luozheng [Thu, 24 Oct 2024 12:26:05 +0000 (20:26 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago根据客户要求修改:press亮屏,press退出应用,取消在applsit界面双击切换applist样式
luozheng [Thu, 24 Oct 2024 12:25:58 +0000 (20:25 +0800)]
根据客户要求修改:press亮屏,press退出应用,取消在applsit界面双击切换applist样式

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

2 years ago睡眠:优化睡眠更新
Caisking [Thu, 24 Oct 2024 12:21:11 +0000 (20:21 +0800)]
睡眠:优化睡眠更新

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

2 years ago蓝牙修改,增快链接动画速度 1253/1 1253/head 1254/target/1
hcj [Thu, 24 Oct 2024 10:26:57 +0000 (18:26 +0800)]
蓝牙修改,增快链接动画速度

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1252/1 1252/head
luozheng [Thu, 24 Oct 2024 09:35:50 +0000 (17:35 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago应用的按键监听改为释放退出
luozheng [Thu, 24 Oct 2024 09:35:42 +0000 (17:35 +0800)]
应用的按键监听改为释放退出

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

2 years ago#904手表,蓝牙未连接时,语音助手提示语使用错误,目前使用的是音乐的提示语
Caisking [Thu, 24 Oct 2024 09:33:49 +0000 (17:33 +0800)]
#904手表,蓝牙未连接时,语音助手提示语使用错误,目前使用的是音乐的提示语

2 years ago优化蓝牙连接 1251/3 1251/head 1252/target/1 1253/target/1
hcj [Thu, 24 Oct 2024 09:32:07 +0000 (17:32 +0800)]
优化蓝牙连接

2 years ago优化蓝牙连接 1251/2
hcj [Thu, 24 Oct 2024 09:18:30 +0000 (17:18 +0800)]
优化蓝牙连接

2 years ago优化flash 4分区 1254/1 1254/head 1255/target/1 1256/target/1
SnickerSun [Thu, 24 Oct 2024 08:49:42 +0000 (16:49 +0800)]
优化flash 4分区

2 years agoMerge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...
SnickerSun [Thu, 24 Oct 2024 08:14:09 +0000 (16:14 +0800)]
Merge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1251/1
hcj [Thu, 24 Oct 2024 08:05:56 +0000 (16:05 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

2 years ago低电量报警修改
hcj [Thu, 24 Oct 2024 08:05:45 +0000 (16:05 +0800)]
低电量报警修改

2 years ago#1026,解决,天气显示不同,无法同步bug
luozheng [Thu, 24 Oct 2024 07:36:21 +0000 (15:36 +0800)]
#1026,解决,天气显示不同,无法同步bug

2 years ago目标数据默认值修改 1248/2 1248/head 1249/target/1
hcj [Thu, 24 Oct 2024 06:52:23 +0000 (14:52 +0800)]
目标数据默认值修改

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1248/1
hcj [Thu, 24 Oct 2024 06:47:32 +0000 (14:47 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

2 years ago通讯录修改
hcj [Thu, 24 Oct 2024 06:47:13 +0000 (14:47 +0800)]
通讯录修改

2 years ago修改目标达成窗口
hcj [Thu, 24 Oct 2024 06:36:44 +0000 (14:36 +0800)]
修改目标达成窗口

2 years agoSOS呼叫修改
hcj [Thu, 24 Oct 2024 06:30:13 +0000 (14:30 +0800)]
SOS呼叫修改

2 years ago#1066,解决,手表端连续创建三个闹钟,再接着删除第二个闹钟,同步IOS APP成功,APP闹钟界面第三个闹钟显示为00:00(必现) bug 1247/1 1247/head
luozheng [Thu, 24 Oct 2024 06:27:13 +0000 (14:27 +0800)]
#1066,解决,手表端连续创建三个闹钟,再接着删除第二个闹钟,同步IOS APP成功,APP闹钟界面第三个闹钟显示为00:00(必现) bug
#1065,解决APP创建5个闹钟后再删除一个,同步手表成功,手表端无法再新增闹钟(必现)

2 years agogit ignore 4part file.bin file_tmp.bin
SnickerSun [Thu, 24 Oct 2024 04:20:35 +0000 (12:20 +0800)]
git ignore 4part file.bin file_tmp.bin

2 years agoMerge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 1250/1 1250/head 1251/target/1
SnickerSun [Thu, 24 Oct 2024 04:08:59 +0000 (12:08 +0800)]
Merge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agoMerge #1249 into sdk602patch0911 from refs/changes/1249/head 1250/target/1
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 &#39;sdk602patch0911&#39; 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
2 years agoMerge #1247 into sdk602patch0911 from refs/changes/1247/head
罗正 [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 &#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

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

  - AI语音界面修改,提示将英文改为中文提醒

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

  - 实现AI答案恢复,列表同步滚动

  - 将power键;亮屏改为release触发

  - #477,系统更新界面提示,改成灰色透明弹窗提示,这个不显眼(需求)

  - 修改applist退出和进入统一动画,只有蜂窝才有

  - Merge branch &#39;sdk602patch0911&#39; 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
2 years agoMerge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 1249/1 1249/head
SnickerSun [Thu, 24 Oct 2024 04:07:44 +0000 (12:07 +0800)]
Merge branch 'sdk602patch0911' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago更新漏掉的update.fwpkg 文件路径修改
SnickerSun [Thu, 24 Oct 2024 04:07:35 +0000 (12:07 +0800)]
更新漏掉的update.fwpkg 文件路径修改

2 years ago添加4part 4分区版本编译参数
SnickerSun [Thu, 24 Oct 2024 02:50:41 +0000 (10:50 +0800)]
添加4part 4分区版本编译参数

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

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

2 years agorelease V1.3.72 1246/1 1246/head 1247/target/1 1248/target/1
SnickerSun [Thu, 24 Oct 2024 00:30:21 +0000 (08:30 +0800)]
release V1.3.72

2 years agoMerge #1243 into sdk602patch0911 from refs/changes/1243/head 1246/target/1
袁清梦 [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 &#39;sdk602patch0911&#39; 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
2 years agoMerge #1241 into sdk602patch0911 from refs/changes/1241/head
胡传军 [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 &#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

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

  - 优化电话对音频的处理

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

  - Merge branch &#39;sdk602patch0911&#39; 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
2 years agoMerge #1244 into sdk602patch0911 from refs/changes/1244/head
罗正 [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 &#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

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

  - AI语音界面修改,提示将英文改为中文提醒

  - Merge branch &#39;sdk602patch0911&#39; 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
2 years ago修改applist退出和进入统一动画,只有蜂窝才有 1244/4 1244/head
luozheng [Wed, 23 Oct 2024 12:48:03 +0000 (20:48 +0800)]
修改applist退出和进入统一动画,只有蜂窝才有

2 years ago#477,系统更新界面提示,改成灰色透明弹窗提示,这个不显眼(需求) 1244/3
luozheng [Wed, 23 Oct 2024 12:35:26 +0000 (20:35 +0800)]
#477,系统更新界面提示,改成灰色透明弹窗提示,这个不显眼(需求)

2 years ago闹钟传输修复 1241/4 1241/head
hcj [Wed, 23 Oct 2024 11:57:21 +0000 (19:57 +0800)]
闹钟传输修复

2 years ago老化测试增加获取充电状态 1245/2 1245/head
penglei [Wed, 23 Oct 2024 11:41:42 +0000 (19:41 +0800)]
老化测试增加获取充电状态

2 years ago增加蓝牙音乐与蓝牙通话音量,改善音质 1245/1
penglei [Wed, 23 Oct 2024 11:38:10 +0000 (19:38 +0800)]
增加蓝牙音乐与蓝牙通话音量,改善音质

2 years ago将power键;亮屏改为release触发 1244/2
luozheng [Wed, 23 Oct 2024 09:56:22 +0000 (17:56 +0800)]
将power键;亮屏改为release触发

2 years ago心率:关闭MSG_SAVE_TEST宏 1243/4 1243/head
Caisking [Wed, 23 Oct 2024 07:13:59 +0000 (15:13 +0800)]
心率:关闭MSG_SAVE_TEST宏

2 years ago实现AI答案恢复,列表同步滚动 1244/1
luozheng [Wed, 23 Oct 2024 07:07:47 +0000 (15:07 +0800)]
实现AI答案恢复,列表同步滚动

2 years ago健康数据:增加存储宏控制 1243/3
Caisking [Wed, 23 Oct 2024 06:57:31 +0000 (14:57 +0800)]
健康数据:增加存储宏控制

2 years ago系统:修改死机文件的生成路径
Caisking [Wed, 23 Oct 2024 06:53:34 +0000 (14:53 +0800)]
系统:修改死机文件的生成路径

2 years agoOTA fopen 修复 1241/3
hcj [Wed, 23 Oct 2024 06:18:17 +0000 (14:18 +0800)]
OTA fopen 修复

2 years ago血氧:增加读写控制 1243/2
Caisking [Wed, 23 Oct 2024 03:59:11 +0000 (11:59 +0800)]
血氧:增加读写控制

2 years ago心率:增加读取控制
Caisking [Wed, 23 Oct 2024 03:59:01 +0000 (11:59 +0800)]
心率:增加读取控制

2 years ago增加步数单位 1241/2
hcj [Wed, 23 Oct 2024 03:23:38 +0000 (11:23 +0800)]
增加步数单位

2 years ago#994 心率界面检测显示有全天心率数据(最大值 ,最小值 )手表重启后,最大值 ,最小值消失显示为--
Caisking [Wed, 23 Oct 2024 02:06:13 +0000 (10:06 +0800)]
#994 心率界面检测显示有全天心率数据(最大值 ,最小值 )手表重启后,最大值 ,最小值消失显示为--

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Tue, 22 Oct 2024 11:14:55 +0000 (19:14 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agoAI语音界面修改,提示将英文改为中文提醒
luozheng [Tue, 22 Oct 2024 11:14:47 +0000 (19:14 +0800)]
AI语音界面修改,提示将英文改为中文提醒

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

2 years ago系统:增加亮屏函数打印
Caisking [Tue, 22 Oct 2024 10:03:11 +0000 (18:03 +0800)]
系统:增加亮屏函数打印

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Tue, 22 Oct 2024 09:58:13 +0000 (17:58 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

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 &#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/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 branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Tue, 22 Oct 2024 08:35:20 +0000 (16:35 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1241/1
hcj [Tue, 22 Oct 2024 08:34:54 +0000 (16:34 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

2 years ago优化电话对音频的处理
hcj [Tue, 22 Oct 2024 08:34:23 +0000 (16:34 +0800)]
优化电话对音频的处理

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修复音乐播放器在切换到手机音乐无法调节音量bug 1239/2 1239/head
luozheng [Tue, 22 Oct 2024 08:05:55 +0000 (16:05 +0800)]
修复音乐播放器在切换到手机音乐无法调节音量bug

2 years ago修复录音播放完后等待一段时间再去点击录音播放,需要点击两次bug 1239/1
luozheng [Tue, 22 Oct 2024 07:04:09 +0000 (15:04 +0800)]
修复录音播放完后等待一段时间再去点击录音播放,需要点击两次bug

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 ago优化查找手表的播放音频逻辑
luozheng [Tue, 22 Oct 2024 06:38:29 +0000 (14:38 +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 agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Tue, 22 Oct 2024 01:57:53 +0000 (09:57 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

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

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...
luozheng [Mon, 21 Oct 2024 12:46:30 +0000 (20:46 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

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 agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1236/1 1236/head
luozheng [Mon, 21 Oct 2024 10:42:10 +0000 (18:42 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1235/1 1235/head
hcj [Mon, 21 Oct 2024 10:41:51 +0000 (18:41 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

2 years ago增加4G对麦克风管理,多次测试未复现,需再验证
hcj [Mon, 21 Oct 2024 10:41:11 +0000 (18:41 +0800)]
增加4G对麦克风管理,多次测试未复现,需再验证

2 years ago如果手表在播放本地音乐,AI界面点击开始对话会暂停本地音乐播放,避免混音
luozheng [Mon, 21 Oct 2024 10:40:25 +0000 (18:40 +0800)]
如果手表在播放本地音乐,AI界面点击开始对话会暂停本地音乐播放,避免混音

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

2 years ago修改音乐播放器函数名英文错误拼写
luozheng [Mon, 21 Oct 2024 10:22:48 +0000 (18:22 +0800)]
修改音乐播放器函数名英文错误拼写