Snicker Git - mirrors/FD230.git/log

projects / mirrors / FD230.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Caisking [Fri, 5 Jul 2024 02:47:39 +0000 (10:47 +0800)]

补

commit | commitdiff | tree

Caisking [Fri, 5 Jul 2024 02:46:37 +0000 (10:46 +0800)]

补交

commit | commitdiff | tree

Caisking [Fri, 5 Jul 2024 02:34:46 +0000 (10:34 +0800)]

解决训练数据泄漏

commit | commitdiff | tree

SnickerSun [Thu, 4 Jul 2024 13:27:22 +0000 (21:27 +0800)]

update to V1.0.12

commit | commitdiff | tree

SnickerSun [Thu, 4 Jul 2024 13:24:07 +0000 (21:24 +0800)]

添加AT^LSFD指令查看打开的文件

commit | commitdiff | tree

luozheng [Thu, 4 Jul 2024 13:21:10 +0000 (21:21 +0800)]

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

commit | commitdiff | tree

luozheng [Thu, 4 Jul 2024 13:15:53 +0000 (21:15 +0800)]

下拉视图更新

commit | commitdiff | tree

Caisking [Thu, 4 Jul 2024 13:12:52 +0000 (21:12 +0800)]

修复拼写错误

commit | commitdiff | tree

Caisking [Thu, 4 Jul 2024 12:52:36 +0000 (20:52 +0800)]

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

commit | commitdiff | tree

Caisking [Thu, 4 Jul 2024 12:52:30 +0000 (20:52 +0800)]

增加睡眠UI数据存储

commit | commitdiff | tree

Caisking [Thu, 4 Jul 2024 12:49:13 +0000 (20:49 +0800)]

修改每日目标默认值以及公里显示

commit | commitdiff | tree

penglei [Thu, 4 Jul 2024 12:42:38 +0000 (20:42 +0800)]

添加久坐提醒闹钟，优化cat1蓝牙产测

commit | commitdiff | tree

Caisking [Thu, 4 Jul 2024 11:24:21 +0000 (19:24 +0800)]

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

commit | commitdiff | tree

Caisking [Thu, 4 Jul 2024 11:23:23 +0000 (19:23 +0800)]

优化睡眠UI

commit | commitdiff | tree

Caisking [Thu, 4 Jul 2024 11:21:04 +0000 (19:21 +0800)]

修改Slice切换速度为200ms

commit | commitdiff | tree

Caisking [Thu, 4 Jul 2024 11:19:40 +0000 (19:19 +0800)]

修复训练协议同步的条数计算；部分数据增加；时间修改

commit | commitdiff | tree

luozheng [Thu, 4 Jul 2024 11:17:08 +0000 (19:17 +0800)]

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

commit | commitdiff | tree

luozheng [Thu, 4 Jul 2024 11:16:52 +0000 (19:16 +0800)]

1.ai语音修改
2.解决下拉视图信号显示问题
3.喝水提醒修改

commit | commitdiff | tree

Caisking [Thu, 4 Jul 2024 10:42:23 +0000 (18:42 +0800)]

去除主界面上下界面的PreLoad

commit | commitdiff | tree

Caisking [Thu, 4 Jul 2024 10:40:22 +0000 (18:40 +0800)]

心率view优化

commit | commitdiff | tree

hcj [Thu, 4 Jul 2024 10:39:07 +0000 (18:39 +0800)]

添加0106协议

commit | commitdiff | tree

hcj [Thu, 4 Jul 2024 09:22:57 +0000 (17:22 +0800)]

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

commit | commitdiff | tree

penglei [Thu, 4 Jul 2024 09:03:24 +0000 (17:03 +0800)]

优化睡眠消息接收

commit | commitdiff | tree

hcj [Thu, 4 Jul 2024 01:44:33 +0000 (09:44 +0800)]

mp3作者名字读取，由于utf16的编码，串口打印出来是乱码

commit | commitdiff | tree

luozheng [Thu, 4 Jul 2024 01:23:23 +0000 (09:23 +0800)]

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

commit | commitdiff | tree

penglei [Thu, 4 Jul 2024 01:15:49 +0000 (09:15 +0800)]

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

commit | commitdiff | tree

luozheng [Wed, 3 Jul 2024 12:35:13 +0000 (20:35 +0800)]

久坐提醒修改

commit | commitdiff | tree

罗正 [Wed, 3 Jul 2024 11:57:57 +0000 (11:57 +0000)]

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

Code review from 罗正

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

  - Ai语音修改

  - 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

  - Ai语音修改

  - 修改倒计时铃声，修改下拉定时器停止逻辑，在下拉视图析构前停止定时器

  - AI语音Model修改

  - Merge branch 'sdk602patch0521' 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/448

commit | commitdiff | tree

luozheng [Wed, 3 Jul 2024 11:50:16 +0000 (19:50 +0800)]

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

commit | commitdiff | tree

Caisking [Wed, 3 Jul 2024 11:49:34 +0000 (19:49 +0800)]

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

commit | commitdiff | tree

Caisking [Wed, 3 Jul 2024 11:48:47 +0000 (19:48 +0800)]

增加睡眠目标

commit | commitdiff | tree

Caisking [Wed, 3 Jul 2024 11:48:24 +0000 (19:48 +0800)]

更新语言资源文件

commit | commitdiff | tree

彭磊 [Wed, 3 Jul 2024 11:48:05 +0000 (11:48 +0000)]

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

Code review from 彭磊

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

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

  - 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 remotes/origin/sdk602patch0521

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

  - 补交

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

commit | commitdiff | tree

luozheng [Wed, 3 Jul 2024 11:28:30 +0000 (19:28 +0800)]

AI语音Model修改

commit | commitdiff | tree

Caisking [Wed, 3 Jul 2024 10:59:01 +0000 (18:59 +0800)]

增加早安闹钟响铃

commit | commitdiff | tree

Caisking [Wed, 3 Jul 2024 10:58:41 +0000 (18:58 +0800)]

修改部分消息优先级

commit | commitdiff | tree

luozheng [Wed, 3 Jul 2024 10:51:30 +0000 (18:51 +0800)]

修改倒计时铃声，修改下拉定时器停止逻辑，在下拉视图析构前停止定时器

commit | commitdiff | tree

Caisking [Wed, 3 Jul 2024 10:45:28 +0000 (18:45 +0800)]

修复applist列表

commit | commitdiff | tree

luozheng [Wed, 3 Jul 2024 10:39:59 +0000 (18:39 +0800)]

Ai语音修改

commit | commitdiff | tree

penglei [Wed, 3 Jul 2024 10:18:39 +0000 (18:18 +0800)]

补交

commit | commitdiff | tree

penglei [Wed, 3 Jul 2024 08:48:12 +0000 (16:48 +0800)]

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

commit | commitdiff | tree

Caisking [Wed, 3 Jul 2024 07:44:59 +0000 (15:44 +0800)]

关闭心率血氧大部分日志打印

commit | commitdiff | tree

Caisking [Wed, 3 Jul 2024 03:11:07 +0000 (11:11 +0800)]

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

commit | commitdiff | tree

snickersun@163.com [Wed, 3 Jul 2024 03:10:12 +0000 (11:10 +0800)]

Revert "Merge branch sdk602patch0626 into sdk602patch0521 (Conflict resolved online)

# Conflicts:
# code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
# code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
"

commit | commitdiff | tree

Caisking [Wed, 3 Jul 2024 03:09:10 +0000 (11:09 +0800)]

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

commit | commitdiff | tree

Caisking [Wed, 3 Jul 2024 03:05:33 +0000 (11:05 +0800)]

修复睡眠数据提交

commit | commitdiff | tree

SnickerSun [Tue, 2 Jul 2024 15:21:42 +0000 (23:21 +0800)]

V1.0.10

commit | commitdiff | tree

snickersun@163.com [Tue, 2 Jul 2024 15:18:38 +0000 (23:18 +0800)]

Merge branch sdk602patch0626 into sdk602patch0521 (Conflict resolved online)

# Conflicts:
# code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
# code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp

commit | commitdiff | tree

penglei [Tue, 2 Jul 2024 12:49:12 +0000 (20:49 +0800)]

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

commit | commitdiff | tree

Caisking [Tue, 2 Jul 2024 12:45:04 +0000 (20:45 +0800)]

部分提交更新

commit | commitdiff | tree

snickersun@163.com [Tue, 2 Jul 2024 12:37:39 +0000 (12:37 +0000)]

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 &#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

      -  更改低电量报警

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

  - 部分训练界面增加按键

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

  - 回退设置

  - 支持res_only，ota_all flag制作 ota包

  - update to V1.0.9

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

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

  - 修改下拉图片显示错误问题

  - Merge branch 'sdk602patch0521' 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 &#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

      -  更改低电量报警

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

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

  - Merge branch 'sdk602patch0521' 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 &#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

      -  更改低电量报警

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

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

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

      - 补交

      - LCD

      - LCD补交

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

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

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

  - 增加早起弹窗

  - 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 #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 'sdk602patch0521' 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

commit | commitdiff | tree

SnickerSun [Tue, 2 Jul 2024 12:32:37 +0000 (20:32 +0800)]

patch0626 适配 fd230app

commit | commitdiff | tree

penglei [Tue, 2 Jul 2024 12:16:43 +0000 (20:16 +0800)]

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

commit | commitdiff | tree

Caisking [Tue, 2 Jul 2024 12:14:55 +0000 (20:14 +0800)]

心率周期检测

commit | commitdiff | tree

penglei [Tue, 2 Jul 2024 11:05:06 +0000 (19:05 +0800)]

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

commit | commitdiff | tree

SnickerSun [Tue, 2 Jul 2024 11:04:03 +0000 (19:04 +0800)]

patch0626 初版 nativeapp可用，fd230app还没合

commit | commitdiff | tree

Caisking [Tue, 2 Jul 2024 10:54:20 +0000 (18:54 +0800)]

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

commit | commitdiff | tree

Caisking [Tue, 2 Jul 2024 10:54:16 +0000 (18:54 +0800)]

优化早安弹窗

commit | commitdiff | tree

彭磊 [Tue, 2 Jul 2024 10:52:49 +0000 (10:52 +0000)]

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

commit | commitdiff | tree

Caisking [Tue, 2 Jul 2024 10:41:08 +0000 (18:41 +0800)]

时间戳打印测试接口

commit | commitdiff | tree

penglei [Tue, 2 Jul 2024 10:23:28 +0000 (18:23 +0800)]

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

commit | commitdiff | tree

Caisking [Tue, 2 Jul 2024 09:39:43 +0000 (17:39 +0800)]

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

commit | commitdiff | tree

Caisking [Tue, 2 Jul 2024 09:39:27 +0000 (17:39 +0800)]

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

commit | commitdiff | tree

Caisking [Tue, 2 Jul 2024 09:39:03 +0000 (17:39 +0800)]

增加早起弹窗

commit | commitdiff | tree

Caisking [Tue, 2 Jul 2024 09:38:47 +0000 (17:38 +0800)]

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

commit | commitdiff | tree

hcj [Tue, 2 Jul 2024 09:35:47 +0000 (17:35 +0800)]

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

commit | commitdiff | tree

hcj [Tue, 2 Jul 2024 09:35:41 +0000 (17:35 +0800)]

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

commit | commitdiff | tree

Caisking [Tue, 2 Jul 2024 09:25:15 +0000 (17:25 +0800)]

同步原文件更新

commit | commitdiff | tree

Caisking [Tue, 2 Jul 2024 09:24:59 +0000 (17:24 +0800)]

增加资源文件

commit | commitdiff | tree

胡传军 [Tue, 2 Jul 2024 08:45:58 +0000 (08:45 +0000)]

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

commit | commitdiff | tree

penglei [Tue, 2 Jul 2024 08:43:38 +0000 (16:43 +0800)]

兼容PY25Q128LA NORFLASH

commit | commitdiff | tree

Caisking [Tue, 2 Jul 2024 07:55:58 +0000 (15:55 +0800)]

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

commit | commitdiff | tree

Caisking [Tue, 2 Jul 2024 07:34:01 +0000 (15:34 +0800)]

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

commit | commitdiff | tree

Caisking [Tue, 2 Jul 2024 07:33:34 +0000 (15:33 +0800)]

修复视频表盘电量配置

commit | commitdiff | tree

hcj [Tue, 2 Jul 2024 02:21:18 +0000 (10:21 +0800)]

bt测试修改

commit | commitdiff | tree

penglei [Tue, 2 Jul 2024 01:41:10 +0000 (09:41 +0800)]

修复睡眠闹钟bug

commit | commitdiff | tree

Caisking [Tue, 2 Jul 2024 01:38:30 +0000 (09:38 +0800)]

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

commit | commitdiff | tree

luozheng [Tue, 2 Jul 2024 01:33:56 +0000 (09:33 +0800)]

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

commit | commitdiff | tree

hcj [Tue, 2 Jul 2024 01:31:40 +0000 (09:31 +0800)]

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

commit | commitdiff | tree

hcj [Tue, 2 Jul 2024 01:31:21 +0000 (09:31 +0800)]

补交

commit | commitdiff | tree

袁清梦 [Tue, 2 Jul 2024 01:26:35 +0000 (01:26 +0000)]

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

Code review from 袁清梦

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

  - 筛选表盘数据刷新

  - Merge branch 'sdk602patch0521' 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

commit | commitdiff | tree

luozheng [Tue, 2 Jul 2024 01:25:29 +0000 (09:25 +0800)]

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

commit | commitdiff | tree

胡传军 [Tue, 2 Jul 2024 01:21:48 +0000 (01:21 +0000)]

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

Code review from 胡传军

* refs/changes/423/head: (17 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属性更新

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

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

  - 补交

  - LCD

  - LCD补交

  - Merge branch 'sdk602patch0521' 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

commit | commitdiff | tree

luozheng [Tue, 2 Jul 2024 01:18:01 +0000 (09:18 +0800)]

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

commit | commitdiff | tree

luozheng [Mon, 1 Jul 2024 12:34:16 +0000 (20:34 +0800)]

Ai语音修改

commit | commitdiff | tree

Caisking [Mon, 1 Jul 2024 11:50:54 +0000 (19:50 +0800)]

增加心率检测睡眠提醒

commit | commitdiff | tree

Caisking [Mon, 1 Jul 2024 11:50:24 +0000 (19:50 +0800)]

设置心率检测优先级控制

commit | commitdiff | tree

Caisking [Mon, 1 Jul 2024 11:49:55 +0000 (19:49 +0800)]

增加设置心率周期检测AT

commit | commitdiff | tree

hcj [Mon, 1 Jul 2024 11:21:47 +0000 (19:21 +0800)]

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

commit | commitdiff | tree

penglei [Mon, 1 Jul 2024 10:15:06 +0000 (18:15 +0800)]

优化蓝牙产测lcd测试

commit | commitdiff | tree

hcj [Mon, 1 Jul 2024 09:31:05 +0000 (17:31 +0800)]

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

commit | commitdiff | tree

Caisking [Mon, 1 Jul 2024 08:25:43 +0000 (16:25 +0800)]

增加睡眠数据

commit | commitdiff | tree

Caisking [Mon, 1 Jul 2024 08:23:23 +0000 (16:23 +0800)]

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

commit | commitdiff | tree

hcj [Mon, 1 Jul 2024 06:59:05 +0000 (14:59 +0800)]

表盘BUG修复

commit | commitdiff | tree

hcj [Mon, 1 Jul 2024 06:57:46 +0000 (14:57 +0800)]

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

commit | commitdiff | tree

Caisking [Mon, 1 Jul 2024 06:27:08 +0000 (14:27 +0800)]

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

commit | commitdiff | tree

袁清梦 [Mon, 1 Jul 2024 04:50:26 +0000 (04:50 +0000)]

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

commit | commitdiff | tree

胡传军 [Mon, 1 Jul 2024 04:50:05 +0000 (04:50 +0000)]

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

Code review from 胡传军

* refs/changes/420/head: (13 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属性更新

  - Merge branch 'sdk602patch0521' 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

commit | commitdiff | tree

hcj [Mon, 1 Jul 2024 02:11:07 +0000 (10:11 +0800)]

LCD补交

commit | commitdiff | tree

hcj [Mon, 1 Jul 2024 02:10:30 +0000 (10:10 +0800)]

LCD

Unnamed repository; edit this file 'description' to name the repository.