From: 袁清梦 <3449750381@qq.com>
Date: Tue, 14 Jan 2025 11:45:07 +0000 (+0800)
Subject: Merge #1629 into sdk602patch0911 from refs/changes/1629/head
X-Git-Tag: v1.3.113-repair_tp~36^2~2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=181cd3fcee03c7e9b11b5a19f477dd9677a50e57;p=mirrors%2FFD230.git

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

Code review from 袁清梦

* refs/changes/1629/head: (28 commits)
  表盘：【花蕾】
  Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f...
  Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f...
  Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f...
  Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f...
  修改表盘；【沙皮狗】
  表盘：【新年快乐】
  表盘：【蛇年大吉】
  表盘：【福娃贺岁】
  表盘：【恭喜发财】
  表盘：【好运连连】
  表盘：【八方来财】
  表盘：【喜迎2025】
  表盘：【元旦快乐】
  表盘：【新春快乐】
  表盘【2025】
  表盘：【蛇来运转】
  表盘：【蛇年吉祥】
  工具：优化表盘工具
  Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f...
  表盘：关闭调试打印
  Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f...
  表盘：【2025】
  Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f...
  Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f...
  电话：增加接听挂断的实际触摸面积
  解绑：增加解绑时因为设置了亮屏时间而导致无法长亮屏
  心率：修复了心率血氧结构体的数据读取

Signed-off-by: Caisking <3449750381@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: Caisking <3449750381@qq.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1629
---

181cd3fcee03c7e9b11b5a19f477dd9677a50e57