Merge #434 into sdk602patch0626 from sdk602patch0521

Merge #434 into sdk602patch0626 from sdk602patch0521

0521分支截止7月2日 代码合并到本分支

* sdk602patch0521: (77 commits squashed)

  - 修复表盘协议BUG

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

  - 闹钟添加切换睡眠与小睡模式

  - 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 branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

  - 优化低电量关机

  - 重构心率血氧存储

  - 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

  - 补交

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

  -  更改低电量报警

  - 卡片设置增加按键监控

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

  - 下拉试图修改，图片采用直接读取内存取消采用Imagecach

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

  - 同步表盘资源

  - 勿扰模式视图修改，注释开机加载CLOCK_IAMGES

  - 血氧增加按键控制

  - 增加心率按键控制

  - ble扫描过滤去除，ble read属性更新

  - Merge #416 into sdk602patch0521 from refs/changes/416/head

    Code review from 胡传军

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

      - 修复表盘协议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

      - 优化低电量关机

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

      -  更改低电量报警

      - ble扫描过滤去除，ble read属性更新

    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/416
  - Merge branches &#39;sdk602patch0521&#39; and &#39;sdk602patch0521&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

  - 部分训练界面增加按键

  - 其他卡片取消进入卡片设置

  - 回退设置

  - 支持res_only，ota_all flag制作 ota包

  - update to V1.0.9

  - 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

  - 补交

  - 筛选表盘数据刷新

  - LCD

  - LCD补交

  - Merge #420 into sdk602patch0521 from refs/changes/420/head

    Code review from 胡传军

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

      - 修复表盘协议BUG

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

      - 低电量修改

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

      - 优化低电量关机

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

      -  更改低电量报警

      - ble扫描过滤去除，ble read属性更新

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

      - 修改步数等数据存储，从记录一小时内的增值，改为记录当前时间点总值

      - 补交

      - LCD

      - LCD补交

    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/420
  - Merge #422 into sdk602patch0521 from refs/changes/422/head

    筛选表盘数据刷新

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

  - 表盘BUG修复

  - 优化时间戳获取时间字符串函数

  - 增加睡眠数据

  - AI语音ble协议更新，协议已测试，UI还需要修改

  - 优化蓝牙产测lcd测试

  - 表盘map增加误判断，避免错误id因为不当操作注册进来

  - 增加设置心率周期检测AT

  - 设置心率检测优先级控制

  - 增加心率检测 睡眠提醒

  - Merge #423 into sdk602patch0521 from refs/changes/423/head

    Code review from 胡传军

    * refs/changes/423/head: (17 commits squashed)

      - 修复表盘协议BUG

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

      - 低电量修改

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

      - 优化低电量关机

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

      -  更改低电量报警

      - ble扫描过滤去除，ble read属性更新

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

      - 修改步数等数据存储，从记录一小时内的增值，改为记录当前时间点总值

      - 补交

      - LCD

      - LCD补交

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

      - 表盘BUG修复

      - AI语音ble协议更新，协议已测试，UI还需要修改

      - 表盘map增加误判断，避免错误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/423
  - Merge #425 into sdk602patch0521 from refs/changes/425/head

    Code review from 袁清梦

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

      - 筛选表盘数据刷新

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

      - 优化时间戳获取时间字符串函数

      - 增加睡眠数据

      - 增加设置心率周期检测AT

      - 设置心率检测优先级控制

      - 增加心率检测 睡眠提醒

    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/425
  - 补交

  - 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

  - 修复睡眠闹钟bug

  - bt测试修改

  - 修复视频表盘电量配置

  - 增加睡眠前20分钟弹窗提醒

  - 增加睡眠弹窗 睡眠开启勿扰模式

  - 兼容PY25Q128LA NORFLASH

  - Merge #428 into sdk602patch0521 from refs/changes/428/head

    bt测试修改

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

      - bt测试修改

    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/428
  - 增加资源文件

  - 同步原文件更新

  - 协议bug修复,增加MP3目录获取(解析MP3还有问题)

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

  - 放大设置卡片下方按键为400宽

  - 增加早起弹窗

  - 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 #430 into sdk602patch0521 from refs/changes/430/head

    优化蓝牙产测LCD测试，TP测试

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

      - 优化蓝牙产测LCD测试，TP测试

    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/430
  - 优化早安弹窗

  - Merge branch &#39;sdk602patch0521&#39; of https://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/434