mirrors/FD230.git
2 years agoMerge #428 into sdk602patch0521 from refs/changes/428/head 429/target/1
胡传军 [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
2 years ago兼容PY25Q128LA NORFLASH 427/2 427/head
penglei [Tue, 2 Jul 2024 08:43:38 +0000 (16:43 +0800)]
兼容PY25Q128LA NORFLASH

2 years ago修复睡眠闹钟bug 427/1
penglei [Tue, 2 Jul 2024 01:41:10 +0000 (09:41 +0800)]
修复睡眠闹钟bug

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 426/1 426/head 427/target/1 428/target/1
hcj [Tue, 2 Jul 2024 01:31:40 +0000 (09:31 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

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

2 years agoMerge #425 into sdk602patch0521 from refs/changes/425/head 426/target/1
袁清梦 [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 &#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
2 years agoMerge #423 into sdk602patch0521 from refs/changes/423/head
胡传军 [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 &#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
2 years ago表盘map增加误判断,避免错误id因为不当操作注册进来 423/3 423/head
hcj [Mon, 1 Jul 2024 11:21:47 +0000 (19:21 +0800)]
表盘map增加误判断,避免错误id因为不当操作注册进来

2 years ago优化蓝牙产测lcd测试 424/1 424/head
penglei [Mon, 1 Jul 2024 10:15:06 +0000 (18:15 +0800)]
优化蓝牙产测lcd测试

2 years agoAI语音ble协议更新,协议已测试,UI还需要修改 423/2
hcj [Mon, 1 Jul 2024 09:31:05 +0000 (17:31 +0800)]
AI语音ble协议更新,协议已测试,UI还需要修改

2 years ago表盘BUG修复 423/1
hcj [Mon, 1 Jul 2024 06:59:05 +0000 (14:59 +0800)]
表盘BUG修复

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Mon, 1 Jul 2024 06:57:46 +0000 (14:57 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agoMerge #422 into sdk602patch0521 from refs/changes/422/head 423/target/1 424/target/1 425/target/1
袁清梦 [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
2 years agoMerge #420 into sdk602patch0521 from refs/changes/420/head
胡传军 [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 &#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
2 years agoLCD补交 420/3 420/head
hcj [Mon, 1 Jul 2024 02:11:07 +0000 (10:11 +0800)]
LCD补交

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

2 years ago补交 420/2
hcj [Mon, 1 Jul 2024 01:47:41 +0000 (09:47 +0800)]
补交

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 421/1 421/head
luozheng [Mon, 1 Jul 2024 01:33:46 +0000 (09:33 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago修改下拉图片显示错误问题
luozheng [Mon, 1 Jul 2024 01:33:37 +0000 (09:33 +0800)]
修改下拉图片显示错误问题

2 years ago修改步数等数据存储,从记录一小时内的增值,改为记录当前时间点总值 420/1
hcj [Mon, 1 Jul 2024 01:30:27 +0000 (09:30 +0800)]
修改步数等数据存储,从记录一小时内的增值,改为记录当前时间点总值

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Sat, 29 Jun 2024 11:15:13 +0000 (19:15 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agoupdate to V1.0.9 419/2 419/head 420/target/1 421/target/1 422/target/1
SnickerSun [Sat, 29 Jun 2024 10:35:22 +0000 (18:35 +0800)]
update to V1.0.9

2 years ago支持res_only,ota_all flag制作 ota包 419/1
SnickerSun [Sat, 29 Jun 2024 10:34:53 +0000 (18:34 +0800)]
支持res_only,ota_all flag制作 ota包

2 years ago回退设置 417/5 417/head 419/target/1
Caisking [Sat, 29 Jun 2024 10:28:33 +0000 (18:28 +0800)]
回退设置

2 years ago其他卡片取消进入卡片设置 417/4
Caisking [Sat, 29 Jun 2024 10:23:20 +0000 (18:23 +0800)]
其他卡片取消进入卡片设置

2 years ago部分训练界面增加按键 417/3
Caisking [Sat, 29 Jun 2024 10:15:52 +0000 (18:15 +0800)]
部分训练界面增加按键

2 years agoMerge branches 'sdk602patch0521' and 'sdk602patch0521' of https://codeup.aliyun.com...
Caisking [Sat, 29 Jun 2024 10:12:19 +0000 (18:12 +0800)]
Merge branches 'sdk602patch0521' and 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agoMerge #416 into sdk602patch0521 from refs/changes/416/head 417/target/2
胡传军 [Sat, 29 Jun 2024 10:09:03 +0000 (10:09 +0000)]
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
2 years agoble扫描过滤去除,ble read属性更新 416/4 416/head
hcj [Sat, 29 Jun 2024 10:05:40 +0000 (18:05 +0800)]
ble扫描过滤去除,ble read属性更新

2 years ago增加心率按键控制
Caisking [Sat, 29 Jun 2024 09:38:50 +0000 (17:38 +0800)]
增加心率按键控制

2 years ago血氧增加按键控制
Caisking [Sat, 29 Jun 2024 09:25:12 +0000 (17:25 +0800)]
血氧增加按键控制

2 years ago勿扰模式视图修改,注释开机加载CLOCK_IAMGES
luozheng [Sat, 29 Jun 2024 09:22:34 +0000 (17:22 +0800)]
勿扰模式视图修改,注释开机加载CLOCK_IAMGES

2 years ago同步表盘资源 417/2
Caisking [Sat, 29 Jun 2024 07:33:09 +0000 (15:33 +0800)]
同步表盘资源

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 418/1 418/head
luozheng [Sat, 29 Jun 2024 07:19:14 +0000 (15:19 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago下拉试图修改,图片采用直接读取内存取消采用Imagecach
luozheng [Sat, 29 Jun 2024 07:19:06 +0000 (15:19 +0800)]
下拉试图修改,图片采用直接读取内存取消采用Imagecach

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 417/1
Caisking [Sat, 29 Jun 2024 07:06:13 +0000 (15:06 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago卡片设置增加按键监控
Caisking [Sat, 29 Jun 2024 07:06:04 +0000 (15:06 +0800)]
卡片设置增加按键监控

2 years ago 更改低电量报警 416/3
hcj [Sat, 29 Jun 2024 06:49:06 +0000 (14:49 +0800)]
 更改低电量报警

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Sat, 29 Jun 2024 06:48:16 +0000 (14:48 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago补交 412/2 412/head 416/target/2 417/target/1 418/target/1
penglei [Sat, 29 Jun 2024 06:35:32 +0000 (14:35 +0800)]
补交

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Sat, 29 Jun 2024 06:33:49 +0000 (14:33 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Sat, 29 Jun 2024 06:31:49 +0000 (14:31 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

2 years ago重构心率血氧存储 412/target/2 414/2 414/head
Caisking [Sat, 29 Jun 2024 06:08:13 +0000 (14:08 +0800)]
重构心率血氧存储

2 years ago优化低电量关机 416/2
hcj [Sat, 29 Jun 2024 06:06:41 +0000 (14:06 +0800)]
优化低电量关机

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Sat, 29 Jun 2024 05:52:29 +0000 (13:52 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 416/1
hcj [Sat, 29 Jun 2024 03:30:50 +0000 (11:30 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago低电量修改
hcj [Sat, 29 Jun 2024 03:30:15 +0000 (11:30 +0800)]
低电量修改

2 years agomkota.sh 添加 res_only 、ota_all 参数 414/target/2 415/1 415/head 416/target/1
SnickerSun [Sat, 29 Jun 2024 02:57:04 +0000 (10:57 +0800)]
mkota.sh 添加 res_only 、ota_all 参数

2 years ago重构心率血氧存储内容 414/1
Caisking [Fri, 28 Jun 2024 12:20:22 +0000 (20:20 +0800)]
重构心率血氧存储内容

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Fri, 28 Jun 2024 11:29:14 +0000 (19:29 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 413/1 413/head 414/target/1 415/target/1
Caisking [Fri, 28 Jun 2024 11:24:34 +0000 (19:24 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago卡片管理重新设计
Caisking [Fri, 28 Jun 2024 11:22:52 +0000 (19:22 +0800)]
卡片管理重新设计

2 years agoMerge #411 into sdk602patch0521 from refs/changes/411/head 413/target/1
胡传军 [Fri, 28 Jun 2024 11:20:32 +0000 (11:20 +0000)]
Merge #411 into sdk602patch0521 from refs/changes/411/head

Code review from 胡传军

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

  - 修复表盘协议BUG

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

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/411
2 years ago闹钟添加切换睡眠与小睡模式 412/1
penglei [Fri, 28 Jun 2024 11:19:33 +0000 (19:19 +0800)]
闹钟添加切换睡眠与小睡模式

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 411/1 411/head
hcj [Fri, 28 Jun 2024 11:18:26 +0000 (19:18 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago修复表盘协议BUG
hcj [Fri, 28 Jun 2024 11:18:16 +0000 (19:18 +0800)]
修复表盘协议BUG

2 years ago将每日目标中的动画采用图片路径不在采用Imagecach 410/2 410/head
luozheng [Fri, 28 Jun 2024 10:57:33 +0000 (18:57 +0800)]
将每日目标中的动画采用图片路径不在采用Imagecach

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 410/1
luozheng [Fri, 28 Jun 2024 09:52:42 +0000 (17:52 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago网络与通话修改
luozheng [Fri, 28 Jun 2024 09:52:33 +0000 (17:52 +0800)]
网络与通话修改

2 years ago更新版本V1.0.8 409/1 409/head 410/target/1 411/target/1 412/target/1
SnickerSun [Fri, 28 Jun 2024 09:45:30 +0000 (17:45 +0800)]
更新版本V1.0.8

2 years agoMerge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 408/1 408/head 409/target/1
SnickerSun [Fri, 28 Jun 2024 09:44:23 +0000 (17:44 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agoMerge #407 into sdk602patch0521 from refs/changes/407/head 408/target/1
snickersun@163.com [Fri, 28 Jun 2024 09:44:16 +0000 (09:44 +0000)]
Merge #407 into sdk602patch0521 from refs/changes/407/head

Code review from snickersun@163.com

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

  - 更新modem新固件,添加电信入库新需求,pyVer版本增加到PY_SRV_V10。

  - 修复mkota.sh 添加额外资源文件路径处理错误问题。

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

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

  - 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/407
2 years agoMerge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 407/2 407/head
SnickerSun [Fri, 28 Jun 2024 09:42:33 +0000 (17:42 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agoMerge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 407/1
SnickerSun [Fri, 28 Jun 2024 09:41:45 +0000 (17:41 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 406/1 406/head
hcj [Fri, 28 Jun 2024 09:41:01 +0000 (17:41 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago修改心率数据同步协议
hcj [Fri, 28 Jun 2024 09:40:51 +0000 (17:40 +0800)]
修改心率数据同步协议

2 years agoMerge #403 into sdk602patch0521 from refs/changes/403/head 406/target/1 407/target/1
snickersun@163.com [Fri, 28 Jun 2024 09:31:47 +0000 (09:31 +0000)]
Merge #403 into sdk602patch0521 from refs/changes/403/head

Code review from snickersun@163.com

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

  - 更新modem新固件,添加电信入库新需求,pyVer版本增加到PY_SRV_V10。

  - 修复mkota.sh 添加额外资源文件路径处理错误问题。

  - 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/403
2 years agoMerge #405 into sdk602patch0521 from refs/changes/405/head
袁清梦 [Fri, 28 Jun 2024 09:31:25 +0000 (09:31 +0000)]
Merge #405 into sdk602patch0521 from refs/changes/405/head

Code review from 袁清梦

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

  - 增加恢复出厂设置AT  AT^RESTORE

  - 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: 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/405
2 years ago补交 404/2 404/head
penglei [Fri, 28 Jun 2024 09:25:53 +0000 (17:25 +0800)]
补交

2 years ago添加小睡与睡眠数据存储 404/1
penglei [Fri, 28 Jun 2024 09:22:19 +0000 (17:22 +0800)]
添加小睡与睡眠数据存储

2 years agoMerge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 403/1 403/head
SnickerSun [Fri, 28 Jun 2024 09:20:07 +0000 (17:20 +0800)]
Merge branch 'sdk602patch0521' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago修复mkota.sh 添加额外资源文件路径处理错误问题。
SnickerSun [Fri, 28 Jun 2024 09:19:57 +0000 (17:19 +0800)]
修复mkota.sh 添加额外资源文件路径处理错误问题。

2 years ago更新modem新固件,添加电信入库新需求,pyVer版本增加到PY_SRV_V10。
SnickerSun [Fri, 28 Jun 2024 09:19:37 +0000 (17:19 +0800)]
更新modem新固件,添加电信入库新需求,pyVer版本增加到PY_SRV_V10。

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Fri, 28 Jun 2024 08:11:42 +0000 (16:11 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 405/1 405/head
Caisking [Fri, 28 Jun 2024 08:08:09 +0000 (16:08 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Fri, 28 Jun 2024 07:55:22 +0000 (15:55 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago增加恢复出厂设置AT AT^RESTORE
Caisking [Fri, 28 Jun 2024 07:55:19 +0000 (15:55 +0800)]
增加恢复出厂设置AT  AT^RESTORE

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Fri, 28 Jun 2024 07:54:14 +0000 (15:54 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 401/1 401/head 403/target/1 404/target/1 405/target/1
luozheng [Fri, 28 Jun 2024 07:52:17 +0000 (15:52 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago补 400/1 400/head 401/target/1
hcj [Fri, 28 Jun 2024 07:51:09 +0000 (15:51 +0800)]
补

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Fri, 28 Jun 2024 07:49:57 +0000 (15:49 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago主界面切换释放Imagecach
luozheng [Fri, 28 Jun 2024 07:49:47 +0000 (15:49 +0800)]
主界面切换释放Imagecach

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Fri, 28 Jun 2024 07:49:18 +0000 (15:49 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into remotes/origin/sdk602patch0521

2 years ago小睡及睡眠数据修改 399/4 399/head 400/target/1
hcj [Fri, 28 Jun 2024 07:42:40 +0000 (15:42 +0800)]
小睡及睡眠数据修改

2 years agoMerge #398 into sdk602patch0521 from refs/changes/398/head 399/target/2
彭磊 [Fri, 28 Jun 2024 07:37:01 +0000 (07:37 +0000)]
Merge #398 into sdk602patch0521 from refs/changes/398/head

优化小睡消息接收处理

* refs/changes/398/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/398
2 years ago增加心率血氧bin数据 396/6 396/head
Caisking [Fri, 28 Jun 2024 07:25:51 +0000 (15:25 +0800)]
增加心率血氧bin数据

2 years ago补交 398/2 398/head
penglei [Fri, 28 Jun 2024 06:40:00 +0000 (14:40 +0800)]
补交

2 years ago补交 396/5
Caisking [Fri, 28 Jun 2024 05:12:05 +0000 (13:12 +0800)]
补交

2 years ago补交 396/4
Caisking [Fri, 28 Jun 2024 05:09:13 +0000 (13:09 +0800)]
补交

2 years ago同步表盘资源
Caisking [Fri, 28 Jun 2024 05:04:16 +0000 (13:04 +0800)]
同步表盘资源

2 years ago补交 396/3
Caisking [Fri, 28 Jun 2024 04:45:40 +0000 (12:45 +0800)]
补交

2 years ago补交修改 396/2
Caisking [Fri, 28 Jun 2024 04:38:44 +0000 (12:38 +0800)]
补交修改

2 years ago优化小睡消息接收处理 398/1
penglei [Fri, 28 Jun 2024 04:03:58 +0000 (12:03 +0800)]
优化小睡消息接收处理

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Fri, 28 Jun 2024 03:38:36 +0000 (11:38 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago优化心率血氧存储
Caisking [Fri, 28 Jun 2024 03:38:33 +0000 (11:38 +0800)]
优化心率血氧存储

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 396/target/2 397/1 397/head 398/target/1 399/target/1
luozheng [Fri, 28 Jun 2024 02:53:41 +0000 (10:53 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago主界面卡片Unload与Load优化
luozheng [Fri, 28 Jun 2024 02:51:33 +0000 (10:51 +0800)]
主界面卡片Unload与Load优化

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 396/1
Caisking [Thu, 27 Jun 2024 13:34:04 +0000 (21:34 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521

2 years ago修复心率血氧文件的读取
Caisking [Thu, 27 Jun 2024 13:33:52 +0000 (21:33 +0800)]
修复心率血氧文件的读取

2 years agoMerge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Thu, 27 Jun 2024 12:52:05 +0000 (20:52 +0800)]
Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0521