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

Merge #1155 into sdk602patch0911 from refs/changes/1155/head

patch_602_0911_to_1009

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

  - patch_602_0911_to_1009

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/1155

patch_602_0911_to_1009

增加+号过滤，挂断电话

mp3文件传输修复

同步消息接收过滤机制0.5秒为限制条件

fix compile issue

Merge #1140 into sdk602patch0626 from refs/changes/1140/head

Code review from 彭磊

* refs/changes/1140/head: (26 commits squashed)

  - 修改小睡数据合并成一个文件

  - 修改小睡数据存入一个文件（默认关闭 待协议调通）

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

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

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

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

  - 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

  - debug界面添加睡眠数据以及睡眠状态runtime，更新cywee算法库修复配速BUG，优化睡眠模式alarm逻辑

  - 修改gsensor FIFO笔数为15笔 并同步运动心率修改

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

  - 回退alarm 睡眠闹钟修改

  - 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秒1次，优化省电模式蓝牙开关逻辑

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

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

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

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

  - 修改ble连接参数，降低ble连接功耗

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

  - br连接以后关闭brscan 降低功耗

  - 添加退出省电模式自动回连

  - 优化心率检测未佩戴消息上报逻辑并加快上报速度

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/1140

Merge #1146 into sdk602patch0626 from refs/changes/1146/head

Code review from 胡传军

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

  - 计算器修改，解决double计算精度不够，导致计算出现多余小数位，#963

  - sos增加适配HFP呼叫,呼叫备注显示#933 #932

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

  - 计算器修改，改为删除仅删除一位 #905 目标同步修改 #921

  - 计算器修改 #962

  - 合并

  - 小睡数据修复

  - 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/1146

release V1.2.63

更新ui_list

Merge #1144 into sdk602patch0626 from refs/changes/1144/head

Code review from 罗正

* refs/changes/1144/head: (20 commits squashed)

  - 绑定弹窗增加按键监听，解决开机动画已经开始，被按键打断问题

  - 1.修改查找手表定时器定时器未关闭bug
    2.#915，解决，省电模式下，使用查找手表后，手表亮度会默认恢复，亮度不再是最低bug

  - 解决#966呼吸训练有改动，多了设置分钟，以及开始按钮，有问题。bug

  - 关闭ChangeSlice中showsStackSliceId打印

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

  - 1.解决呼吸训练过程中出现消息弹窗而取消常亮屏，通过添加runtime解决
    2.将呼吸训练常亮屏操作只在开始训练时开启，而不是进入就设置常亮屏

  - 解决计时器和秒表图片是相反的问题

  - #673,解决蓝牙设备搜索显示框没有自适应显示，导致需要下拉才知道有多个设备bug

  - 解决，#674蓝牙搜索界面，优化重新搜索字样显示位置bug，(绑定成功界面)

  - #928,解决，手电筒设置为闪烁，上滑的时候，背景亮度会根据手电筒亮度变bug

  - 优化蓝牙耳机显示列表

  - #523，解决，录音列表，在只有几条不用滑动查看录音的时候，固定界面不允许滑动bug

  - #686,解决Al语音思考界面，动画有白色线圈bug(重新修改动画资源文件解决)

  - 修改蓝牙耳机界面，适配多国语言

  - 通过添加最高和最低亮度宏，减少硬编码

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

  - #929,解决，手电筒选择彩色，点击上按键退出后再次进入，显示不是彩色bug

  - 关于手表页面添加显示APN protocol

  - 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/1144

安全模式：优化析构

系统：修复密码锁内存泄漏

系统：修复省电模式内存泄漏

系统：优化主界面内存泄漏

Merge #1141 into sdk602patch0626 from refs/changes/1141/head

Code review from 胡传军

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

  - 计算器修改，解决double计算精度不够，导致计算出现多余小数位，#963

  - sos增加适配HFP呼叫,呼叫备注显示#933 #932

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

  - 计算器修改，改为删除仅删除一位 #905 目标同步修改 #921

  - 计算器修改 #962

  - 合并

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/1141

消息：增加信息多次发送的控制

#975手表,增加滑到睡眠界面进行数据更新

消息：增加信息时间戳过滤

Merge #1136 into sdk602patch0626 from refs/changes/1136/head

Code review from 罗正

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

  - 绑定弹窗增加按键监听，解决开机动画已经开始，被按键打断问题

  - 1.修改查找手表定时器定时器未关闭bug
    2.#915，解决，省电模式下，使用查找手表后，手表亮度会默认恢复，亮度不再是最低bug

  - 解决#966呼吸训练有改动，多了设置分钟，以及开始按钮，有问题。bug

  - 关闭ChangeSlice中showsStackSliceId打印

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

  - 1.解决呼吸训练过程中出现消息弹窗而取消常亮屏，通过添加runtime解决
    2.将呼吸训练常亮屏操作只在开始训练时开启，而不是进入就设置常亮屏

  - 解决计时器和秒表图片是相反的问题

  - #673,解决蓝牙设备搜索显示框没有自适应显示，导致需要下拉才知道有多个设备bug

  - 解决，#674蓝牙搜索界面，优化重新搜索字样显示位置bug，(绑定成功界面)

  - #928,解决，手电筒设置为闪烁，上滑的时候，背景亮度会根据手电筒亮度变bug

  - 优化蓝牙耳机显示列表

  - #523，解决，录音列表，在只有几条不用滑动查看录音的时候，固定界面不允许滑动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/1136

Merge #1137 into sdk602patch0626 from refs/changes/1137/head

Code review from 胡传军

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

  - 计算器修改，解决double计算精度不够，导致计算出现多余小数位，#963

  - sos增加适配HFP呼叫,呼叫备注显示#933 #932

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

  - 计算器修改，改为删除仅删除一位 #905 目标同步修改 #921

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/1137

训练：优化app发起运动

训练：优化目标达成显示机制

优化动画效果

消息：增加ios链接时的未读消息屏蔽

同步资源文件更新

训练：修改运动目标达标的动画

训练：增加app发起的运动的状态返回

多国语言：修改”步数“显示错误

#968手表切换为多国语言（非中文），运动模块设定目标页确定按钮字符重叠

同步最新 sdk602patch0626 commit 11db54f4ba432655bb756c80ae47f47ab9207d57

' #694消息提醒弹出会一直显示，需要手动点击关闭

优化抬腕亮屏tp驱动恢复有时失效问题
消息提醒唤醒后马达震动过久问题

Merge #1133 into sdk602patch0626 from refs/changes/1133/head

Code review from 彭磊

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

  - 修改小睡数据合并成一个文件

  - 修改小睡数据存入一个文件（默认关闭 待协议调通）

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

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

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

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

  - 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

  - debug界面添加睡眠数据以及睡眠状态runtime，更新cywee算法库修复配速BUG，优化睡眠模式alarm逻辑

  - 修改gsensor FIFO笔数为15笔 并同步运动心率修改

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

  - 回退alarm 睡眠闹钟修改

  - 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秒1次，优化省电模式蓝牙开关逻辑

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

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/1133

修改蓝牙调试窗口 修改支付宝广播开启位置 修改目标达成界面内存泄漏

release V1.1.62

修复长按进入other_click的问题，当下支持1~8 click

系统：修复label滚动速度问题

常亮屏函数注释set_screen_set_keepon_timeout(0)

Merge #1126 into sdk602patch0626 from refs/changes/1126/head

Code review from 彭磊

* refs/changes/1126/head: (13 commits squashed)

  - 修改小睡数据合并成一个文件

  - 修改小睡数据存入一个文件（默认关闭 待协议调通）

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

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

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

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

  - 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

  - debug界面添加睡眠数据以及睡眠状态runtime，更新cywee算法库修复配速BUG，优化睡眠模式alarm逻辑

  - 修改gsensor FIFO笔数为15笔 并同步运动心率修改

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

  - 回退alarm 睡眠闹钟修改

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/1126

修改开启运动回复模式，改由UI来回复是否成功

消息：增加省电模式不进行消息弹窗

 睡眠数据修正

小睡数据修改待测试(补

解决#922绑定iOS手机，蓝牙来电手表提示音刚开始时默认通知铃声然后中断播放手机来电铃声bug
解决#934，静音模式，蓝牙来电有响铃bug
解决925，勿扰模式下，蓝牙来电有震动响铃bug

小睡数据修改待测试

增加label控制

解决#911,4G提示语字体太大，需要缩小，参考蓝牙界面提示语字体大小bug
解决#936，运动识别提示语字体大小修改，参考蓝牙提示语bug

系统：修改无死机文件显示

#940 运动记录里的卡路里数据与运动完练页显示的不一致

系统：修改label设置为不因为长度改变滚动速度

系统：修改系统开关机日志的存储方式

修复小睡死机问题

解绑确认弹窗添加关机动画

增加ota传输时自动拒接来电

ble对接调试窗口

系统：增加死机文件名称列表的日志

解决#17,手表，充电时下拉状态栏电量图标不显示充电状态bug

修改二维码界面点击五次进入产测界面，系统关于界面点击5次进入调试界面

燃脂时间BUG修改

系统：安全模式增加手表蓝牙名称，版本号，固件版本等相关信息

release V1.1.61

修复log上传BUG

系统：调试窗口增加电池相关服务

修复蓝牙释放，异步进程释放可能死机

解决蓝牙耳机界面内存泄漏问题
解决蓝牙耳机界面，如果进入搜索界面开启定时器后，按按键未关闭定时器问题

#886手表，快捷训练卡片修改骑行为自由训练

语言列表修改

回退音乐来源界面代码修改

多国语言适配传输界面

优化语言列表，解决语言列表最后一项被遮挡住bug

充电弹窗：修改回调与UI的析构顺序

release V1.1.60

系统：修改充电弹窗的CallBack刷新；提前预防刷新空组件

#801 消息通知功能，下滑后，无法回到原位

消息：修复消息列表显示不完成的按键

消息：修复消息详情界面显示不完全的按键

系统：修复系统日志的存储

屏蔽连接动画界面的title

消息：修复消息Slice的析构

Merge #1110 into sdk602patch0626 from refs/changes/1110/head

修改小睡数据合并成一个文件

* refs/changes/1110/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/1110

恢复拖动原始默认值10，让拖动更容易

增加内存泄露编译参数 leakcheck
autoota的编译参数 autoota  autootacli

解决恢复出厂设置后进入训练界面右滑退出进入语言界面

在安全模式里，打开AutoOta开启 SPP 服务

修正打开cat1时 对 Veto PM_ID_DEBUG的操作

修复可能因ble连接不稳定导致的广播误关，无法重新开启广播，导致重连失败（补

修复可能因ble连接不稳定导致的广播误关，无法重新开启广播，导致重连失败

修改音乐来源界面，蓝牙耳机连接状态错误显示

睡眠：修复睡眠卡片析构

训练：修改“休闲运动”列表

训练：修改“其他”列表

训练：修改“极限运动”列表

训练：修改“冰上运动”列表

训练：修改”健身类“列表

训练：修改“舞蹈类"列表

训练：修改“球类运动”列表

训练：修改“水上运动”列表

● 呼吸训练多国语言适配
● 4G界面多国语言适配，
● 运动识别多国语言适配