Merge #252 into sdk602patch0521 from refs/changes/252/head

Code review from 胡传军

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

  - 获取N天前日期

  - 增加传输中UI

  - 增加OTA传输中的进度条

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

  - 修复闹钟取消后依然会响的bug

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

 bt core patch 20240609

Merge #249 into sdk602patch0521 from refs/changes/249/head

Code review from 胡传军

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

  - 获取N天前日期

  - 增加传输中UI

  - 增加OTA传输中的进度条

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

Merge #251 into sdk602patch0521 from refs/changes/251/head

Code review from 彭磊

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

  - 添加蓝牙产测麦克风测试项，添加tar保存exc文件功能

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

  - 补交

  - 补交

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

  - 优化麦克风蓝牙产测，优化tar保存死机文件

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

  - 优化tar保存exc文件

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

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

添加呼吸训练Slice，还需优化

Merge #244 into sdk602patch0521 from refs/changes/244/head

添加蓝牙产测麦克风测试项，添加tar保存exc文件功能

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

  - 添加蓝牙产测麦克风测试项，添加tar保存exc文件功能

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

  - 补交

  - 补交

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

  - 优化麦克风蓝牙产测，优化tar保存死机文件

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

preserve.bin 保存时添加 时间戳

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

Merge #245 into sdk602patch0521 from refs/changes/245/head

跳过安卓手机传输文件crc校验

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

  - 跳过安卓手机传输文件crc校验

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

Merge #242 into sdk602patch0521 from refs/changes/242/head

Code review from 罗正

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

  - 秒表视图添加退出动画

  - 手电筒视图优化

  - 勿扰模式和查找手机视图优化

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

  - 优化指南针，倒计时，显示与亮度的退出逻辑

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

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

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

跳过安卓手机传输文件crc校验

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

修复训练记录不显示时间

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

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

Merge #240 into sdk602patch0521 from refs/changes/240/head

Code review from snickersun@163.com

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

  - 给exc_info等dumpfile的文件名添加时间戳

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

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

Merge #239 into sdk602patch0521 from refs/changes/239/head

Code review from 罗正

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

  - 秒表视图添加退出动画

  - 手电筒视图优化

  - 勿扰模式和查找手机视图优化

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

  - 优化指南针，倒计时，显示与亮度的退出逻辑

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

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

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

给exc_info等dumpfile的文件名添加时间戳

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

优化指南针，倒计时，显示与亮度的退出逻辑

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

修复训练记录不显示Icon

优化部分析构问题

优化训练记录；解决训练结束死机bug

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

勿扰模式和查找手机视图优化

补交

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

更新开机logo

优化恢复出厂设置

Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

手电筒视图优化

秒表视图添加退出动画

修正制作ota包时，ota_all的标志文件的位置 code/sdk/output/ota_all，方便切换只升级application和全包升级

图片及处理工具移动到tools，并剔除不需要管理的文件

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

修复ota脚本引用错误

增加项目原文件资源

优化OTA制作脚本，使其可以支持ssb recovery application bt dsp_main dsp_overlay all_nv 的更新。

优化OTA制作脚本，使其可以支持ssb recovery application bt dsp_main dsp_overlay all_nv 的更新。

更新 ble adv min_interval 140, max_interval 160

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

修复训练部分bug

Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

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

Merge #231 into sdk602patch0521 from refs/changes/231/head

Code review from snickersun@163.com

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

  - autobuild.sh 编译去掉-nohso

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

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

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

patch_bt_bugfix_0606

显示方式视图修改

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

修复使用按键跳转Slice不起作用问题,如果applist为其他风格形式如蜂窝，按键跳转返回需要根据其风格才能跳转
eg：NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS);

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

autobuild.sh 编译去掉-nohso

Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

优化蓝牙产测，添加部分测试项，优化久坐提醒

ble协议时间同步计算timezone

修复cat1 checkota.py 升级重启脚本错误

修复cat1 因为sms读取失败造成的无法通讯的问题

配置为内置RC 32K晶振，解决蓝牙死机问题

根据需求删除非默认内置表盘，备份上架的表盘文件

添加表盘原始文件和表盘制作脚本：Dynamic_cat  KUMI  classic  clock  dog  galaxy  geometry  jellyfish  kaleidoscope_dial  maomao  panda

create release 1.0.1 based on 0521 patch

采用sdk自带的例子更新rtc ,
优化时间函数,
添加24小时 12小时 支持，并增加 AT^24HOUR测试指令
优化sntp 更新参数

同步代码
commit 29559b455d06414d9f375e9b9adae66388907667
    优化移动入库，已完成移动入库测试默认是适配地址，待用户测试没有问题修改为商用地址必须手动更改代码

修正表盘配置，适配466x466分辨率，解决 万花筒表盘不工作问题

添加RTC时间测试指令 AT^TIMESYNC

优化电池曲线

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

根据  'SUPPORT_CHINA_MOBILE_DMP', 'SUPPORT_TELECOM_DMP',  判定 固件是移动还是电信入库版本，并在版本号后通过_CM , _CT字样做区分。

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

修复训练部分拼写问题

修改ConfigModel.h文件中部分枚举变量单词的拼写错误

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

1.喝水提醒弹窗增加右滑退出功能
2.修改ConfigModel.h文件中有关喝水提醒的枚举变量单词的拼写错误，增加其对应的set和get函数

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

同步 xts_origin cat1 入库提交:
commit 38d4e128ac840ca950a158a7bf671d374e0df921
    移动入库未完善，待完善优化;添加py压缩文件
commit 07a4673939b3f4a0c71fc2204ddb38c706ac94df
    添加中国移动入库.py文件 china_mobile_dmp.py

Merge #220 into sdk602patch0521 from refs/changes/220/head

Code review from 罗正

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

  - 优化久坐提醒：根据久坐间隔时间和是否在设置的提醒时间段内判断是否弹出久坐视图。协议需要对接

  - 久坐提醒添加右滑退出视图功能

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

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

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

久坐提醒添加右滑退出视图功能

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

1、lwip 添加 sntp,smtp,mbedtls 编译选项
2、取消cat1 gettime 指令, 改用 sntp标准网络方案同步时间
3、bleEvent里 采用和sntp相同的设置指令设置时间
4、custom_utils_at_cmd 修改ota_download为 https方案，暂时未调通。

解决刚刚开机时不触摸屏幕不息屏问题

Merge #218 into sdk602patch0521 from refs/changes/218/head

调整训练结束状态发送顺序

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

  - 调整训练结束状态发送顺序

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

Merge #217 into sdk602patch0521 from refs/changes/217/head

优化久坐提醒：根据久坐间隔时间和是否在设置的提醒时间段内判断是否弹出久坐视图。协议需要对接

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

  - 优化久坐提醒：根据久坐间隔时间和是否在设置的提醒时间段内判断是否弹出久坐视图。协议需要对接

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

调整训练结束状态发送顺序

优化久坐提醒：根据久坐间隔时间和是否在设置的提醒时间段内判断是否弹出久坐视图。协议需要对接

添加设置久坐提醒间隔功能，优化动态心率获取方法。

解决了applist列表显示方式不支持支持表观问题

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

Merge #212 into sdk602patch0521 from refs/changes/212/head

Code review from snickersun@163.com

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

  - 解决触摸屏触摸后无法休眠问题

  - 解决表冠转动时仍然会息屏问题

  - 修复ft6x46内存泄漏问题

  - WEARABLE_LOG_DEBUG放到 config.py中，保证所有模块都受控。优化部分打印以及去掉无用代码

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

WEARABLE_LOG_DEBUG放到 config.py中，保证所有模块都受控。优化部分打印以及去掉无用代码

修复ft6x46内存泄漏问题

解决表冠转动时仍然会息屏问题

解决触摸屏触摸后无法休眠问题

解决表盘界面不显示步数的问题

applist 优化更新

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