Caisking [Sat, 28 Dec 2024 10:51:50 +0000 (18:51 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
彭磊 [Sat, 28 Dec 2024 10:51:32 +0000 (10:51 +0000)]
Merge #1580 into sdk602patch0911 from refs/changes/1580/head
功耗runtime增加运动事件上报
* refs/changes/1580/head: (1 commits squashed)
- 功耗runtime增加运动事件上报
Signed-off-by: aliyun6865282430 <1624952103@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>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1580
Caisking [Sat, 28 Dec 2024 10:43:33 +0000 (18:43 +0800)]
release V1.3.106
hcj [Sat, 28 Dec 2024 09:15:37 +0000 (17:15 +0800)]
增加时间保存runtimelog
Caisking [Fri, 27 Dec 2024 13:42:15 +0000 (21:42 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
hcj [Fri, 27 Dec 2024 07:52:38 +0000 (15:52 +0800)]
增加bleread指令记录
Caisking [Fri, 27 Dec 2024 07:36:19 +0000 (15:36 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
袁清梦 [Fri, 27 Dec 2024 07:23:48 +0000 (07:23 +0000)]
Merge #1577 into sdk602patch0911 from refs/changes/1577/head
蓝牙传输：回退常亮屏
* refs/changes/1577/head: (1 commits squashed)
- 蓝牙传输：回退常亮屏
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>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1577
luozheng [Fri, 27 Dec 2024 07:17:42 +0000 (15:17 +0800)]
修复OTA文件传输成功这时屏幕右滑导致死机
Caisking [Fri, 27 Dec 2024 07:03:01 +0000 (15:03 +0800)]
蓝牙传输：回退常亮屏
袁清梦 [Fri, 27 Dec 2024 03:33:00 +0000 (03:33 +0000)]
Merge #1575 into sdk602patch0911 from refs/changes/1575/head
Code review from 袁清梦
* refs/changes/1575/head: (5 commits squashed)
- releaseV1.3.105
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
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>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1575
luozheng [Fri, 27 Dec 2024 03:29:18 +0000 (11:29 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
luozheng [Fri, 27 Dec 2024 03:29:10 +0000 (11:29 +0800)]
修改按键三秒检测，修复OTA升级完后不开机问题，需要验证
hcj [Thu, 26 Dec 2024 13:29:52 +0000 (21:29 +0800)]
合并
hcj [Thu, 26 Dec 2024 13:29:09 +0000 (21:29 +0800)]
更新脚本解析工具，增加横向分析表格
Caisking [Thu, 26 Dec 2024 13:18:54 +0000 (21:18 +0800)]
心率：增加获取值的日志记录
Caisking [Thu, 26 Dec 2024 13:07:07 +0000 (21:07 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
penglei [Thu, 26 Dec 2024 12:34:22 +0000 (20:34 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
penglei [Thu, 26 Dec 2024 12:34:17 +0000 (20:34 +0800)]
去掉测心率退出低功耗，增加功耗脚本解析
Caisking [Thu, 26 Dec 2024 12:04:27 +0000 (20:04 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
Caisking [Thu, 26 Dec 2024 12:01:18 +0000 (20:01 +0800)]
心率：修复主界面滑动较快时；亮屏时间不恢复
hcj [Thu, 26 Dec 2024 10:10:32 +0000 (18:10 +0800)]
更正连接参数更新接口
Caisking [Thu, 26 Dec 2024 09:33:51 +0000 (17:33 +0800)]
蓝牙传输：关闭传输文件的长亮屏
Caisking [Thu, 26 Dec 2024 09:33:26 +0000 (17:33 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
hcj [Thu, 26 Dec 2024 08:39:52 +0000 (16:39 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
hcj [Thu, 26 Dec 2024 08:39:41 +0000 (16:39 +0800)]
修改连接参数更新接口，当触发更新后会增加定时器操作，确认修改结果(补
胡传军 [Thu, 26 Dec 2024 08:39:26 +0000 (08:39 +0000)]
Merge #1568 into sdk602patch0911 from refs/changes/1568/head
Code review from 胡传军
* refs/changes/1568/head: (11 commits squashed)
- 增加pud解码支持长短信解码及英文短信解码
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- 修改按键投票机制，增加GPIO按键单独投票
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- 更新运行日志解析工具
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- 修改因0502指令造成的多次同步数据问题
- 修改连接参数更新接口，当触发更新后会增加定时器操作，确认修改结果
Signed-off-by: aliyun8003852482 <1224667075@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>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1568
hcj [Thu, 26 Dec 2024 08:34:04 +0000 (16:34 +0800)]
修改连接参数更新接口，当触发更新后会增加定时器操作，确认修改结果
hcj [Wed, 25 Dec 2024 09:40:07 +0000 (17:40 +0800)]
修改因0502指令造成的多次同步数据问题
hcj [Wed, 25 Dec 2024 09:39:15 +0000 (17:39 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
luozheng [Wed, 25 Dec 2024 06:26:31 +0000 (14:26 +0800)]
1262,手表不自动息屏，落腕息屏也不生效，进入支付宝扫码页面再退出恢复正常，出现一次bug
penglei [Wed, 25 Dec 2024 06:15:18 +0000 (14:15 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
Caisking [Wed, 25 Dec 2024 03:31:33 +0000 (11:31 +0800)]
表盘：更新默认表盘
Caisking [Wed, 25 Dec 2024 03:31:24 +0000 (11:31 +0800)]
表盘：更新lzma文件
Caisking [Tue, 24 Dec 2024 13:36:46 +0000 (21:36 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
Caisking [Tue, 24 Dec 2024 13:36:41 +0000 (21:36 +0800)]
心率：增加心率的结果日志
Caisking [Tue, 24 Dec 2024 13:29:25 +0000 (21:29 +0800)]
系统：屏蔽调试打印
彭磊 [Tue, 24 Dec 2024 13:28:43 +0000 (13:28 +0000)]
Merge #1562 into sdk602patch0911 from refs/changes/1562/head
runtime脚本增加解析
* refs/changes/1562/head: (1 commits squashed)
- runtime脚本增加解析
Signed-off-by: aliyun6865282430 <1624952103@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>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1562
胡传军 [Tue, 24 Dec 2024 13:28:11 +0000 (13:28 +0000)]
Merge #1563 into sdk602patch0911 from refs/changes/1563/head
Code review from 胡传军
* refs/changes/1563/head: (8 commits squashed)
- 增加pud解码支持长短信解码及英文短信解码
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- 修改按键投票机制，增加GPIO按键单独投票
- Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
- 更新运行日志解析工具
Signed-off-by: aliyun8003852482 <1224667075@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>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1563
Caisking [Tue, 24 Dec 2024 13:22:12 +0000 (21:22 +0800)]
表盘：增加【大鹅】
Caisking [Tue, 24 Dec 2024 13:21:56 +0000 (21:21 +0800)]
运动：屏蔽更新model；由model自动去获取
Caisking [Tue, 24 Dec 2024 13:18:45 +0000 (21:18 +0800)]
活动：提前进行数据初始化
Caisking [Tue, 24 Dec 2024 13:17:45 +0000 (21:17 +0800)]
表盘：增加步数目标，卡路里目标对应model
luozheng [Tue, 24 Dec 2024 12:42:05 +0000 (20:42 +0800)]
1.解决：#1261闹钟响起时来日常活动目标达成提醒（比如步数达标提醒），提醒界面自动消后，闹钟界面也消失，但闹钟一直响铃（无法关闭）bug
2.查找手表和闹钟弹窗屏蔽按键事件
hcj [Tue, 24 Dec 2024 08:20:49 +0000 (16:20 +0800)]
更新运行日志解析工具
penglei [Tue, 24 Dec 2024 07:57:22 +0000 (15:57 +0800)]
runtime脚本增加解析
Caisking [Tue, 24 Dec 2024 06:22:30 +0000 (14:22 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
hcj [Tue, 24 Dec 2024 06:17:12 +0000 (14:17 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
luozheng [Tue, 24 Dec 2024 03:46:19 +0000 (11:46 +0800)]
修改表盘时间标签坐标错误
Caisking [Tue, 24 Dec 2024 03:43:29 +0000 (11:43 +0800)]
系统：修改电池log到/user/log目录下
luozheng [Tue, 24 Dec 2024 02:33:50 +0000 (10:33 +0800)]
#1237，Android app提示解绑失败后手表出现绿屏，出现3次bug
luozheng [Mon, 23 Dec 2024 09:53:41 +0000 (17:53 +0800)]
修改来电铃声声音通道为原来的AUDIO_STREAM_RING，解决来电铃声被打断问题
luozheng [Mon, 23 Dec 2024 09:46:55 +0000 (17:46 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
luozheng [Mon, 23 Dec 2024 09:46:42 +0000 (17:46 +0800)]
表盘市场；【天秤座】
luozheng [Mon, 23 Dec 2024 09:45:19 +0000 (17:45 +0800)]
表盘市场；【白羊座】
luozheng [Mon, 23 Dec 2024 09:44:10 +0000 (17:44 +0800)]
表盘市场；【金牛座】
luozheng [Mon, 23 Dec 2024 09:42:33 +0000 (17:42 +0800)]
表盘市场；【狮子座】
luozheng [Mon, 23 Dec 2024 09:40:43 +0000 (17:40 +0800)]
表盘市场；【射手座】
luozheng [Mon, 23 Dec 2024 09:39:32 +0000 (17:39 +0800)]
表盘市场；【水瓶座】
luozheng [Mon, 23 Dec 2024 09:34:45 +0000 (17:34 +0800)]
表盘市场；【沙皮狗】
胡传军 [Mon, 23 Dec 2024 09:33:23 +0000 (09:33 +0000)]
Merge #1550 into sdk602patch0911 from refs/changes/1550/head
- 增加pud解码支持长短信解码及英文短信解码
- 修改按键投票机制，增加GPIO按键单独投票
luozheng [Mon, 23 Dec 2024 09:32:48 +0000 (17:32 +0800)]
表盘市场；【狮子】
luozheng [Mon, 23 Dec 2024 09:30:01 +0000 (17:30 +0800)]
表盘市场；【小翠鸟】
luozheng [Mon, 23 Dec 2024 09:28:16 +0000 (17:28 +0800)]
表盘市场；【夜光水母】
luozheng [Mon, 23 Dec 2024 09:25:02 +0000 (17:25 +0800)]
表盘市场；【白玫瑰】
hcj [Mon, 23 Dec 2024 09:23:19 +0000 (17:23 +0800)]
修改按键投票机制，增加GPIO按键单独投票
luozheng [Mon, 23 Dec 2024 09:22:54 +0000 (17:22 +0800)]
表盘市场；【熊】
luozheng [Mon, 23 Dec 2024 09:20:46 +0000 (17:20 +0800)]
表盘市场；【狼】
luozheng [Mon, 23 Dec 2024 09:18:51 +0000 (17:18 +0800)]
表盘市场；【小雏菊】
luozheng [Mon, 23 Dec 2024 09:17:02 +0000 (17:17 +0800)]
表盘市场；【斑马】
luozheng [Mon, 23 Dec 2024 09:15:07 +0000 (17:15 +0800)]
表盘市场；【老鹰】
luozheng [Mon, 23 Dec 2024 09:12:30 +0000 (17:12 +0800)]
表盘市场；【荷花】
luozheng [Mon, 23 Dec 2024 09:09:44 +0000 (17:09 +0800)]
表盘市场；【长颈鹿】
luozheng [Mon, 23 Dec 2024 09:06:03 +0000 (17:06 +0800)]
表盘市场；【麋鹿】
luozheng [Mon, 23 Dec 2024 09:01:13 +0000 (17:01 +0800)]
表盘市场；【柠檬清新】
luozheng [Mon, 23 Dec 2024 08:56:45 +0000 (16:56 +0800)]
表盘市场；【露珠】
luozheng [Mon, 23 Dec 2024 08:49:53 +0000 (16:49 +0800)]
表盘：【天秤座】
luozheng [Mon, 23 Dec 2024 08:47:59 +0000 (16:47 +0800)]
表盘：【白羊座】
luozheng [Mon, 23 Dec 2024 08:46:44 +0000 (16:46 +0800)]
表盘：【金牛座】
luozheng [Mon, 23 Dec 2024 08:38:41 +0000 (16:38 +0800)]
表盘：【狮子座】
luozheng [Mon, 23 Dec 2024 08:37:15 +0000 (16:37 +0800)]
表盘：【射手座】
luozheng [Mon, 23 Dec 2024 08:27:36 +0000 (16:27 +0800)]
表盘：【水瓶座】
penglei [Mon, 23 Dec 2024 08:16:20 +0000 (16:16 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
penglei [Mon, 23 Dec 2024 08:16:07 +0000 (16:16 +0800)]
uart1 tx默认设置上拉，恢复出厂设置不删除死机文件
luozheng [Mon, 23 Dec 2024 08:13:36 +0000 (16:13 +0800)]
表盘：【沙皮狗】
luozheng [Mon, 23 Dec 2024 08:11:24 +0000 (16:11 +0800)]
表盘：【狮子】
luozheng [Mon, 23 Dec 2024 07:40:30 +0000 (15:40 +0800)]
表盘：【小翠鸟】
luozheng [Mon, 23 Dec 2024 07:30:50 +0000 (15:30 +0800)]
表盘：【夜光水母】
luozheng [Mon, 23 Dec 2024 07:28:54 +0000 (15:28 +0800)]
表盘：【白玫瑰】
luozheng [Mon, 23 Dec 2024 07:21:43 +0000 (15:21 +0800)]
表盘：【熊】
luozheng [Mon, 23 Dec 2024 07:20:24 +0000 (15:20 +0800)]
表盘：【狼】
luozheng [Mon, 23 Dec 2024 07:11:05 +0000 (15:11 +0800)]
表盘：【小雏菊】
luozheng [Mon, 23 Dec 2024 07:01:07 +0000 (15:01 +0800)]
表盘：【斑马】
luozheng [Mon, 23 Dec 2024 06:53:14 +0000 (14:53 +0800)]
表盘：【老鹰】
luozheng [Mon, 23 Dec 2024 06:45:49 +0000 (14:45 +0800)]
表盘：【荷花】
luozheng [Mon, 23 Dec 2024 06:35:35 +0000 (14:35 +0800)]
表盘：【长颈鹿】
hcj [Mon, 23 Dec 2024 06:25:50 +0000 (14:25 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0911
luozheng [Mon, 23 Dec 2024 03:54:13 +0000 (11:54 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0911
Caisking [Mon, 23 Dec 2024 03:52:42 +0000 (11:52 +0800)]
表盘：回退步数目标
luozheng [Mon, 23 Dec 2024 03:46:32 +0000 (11:46 +0800)]
表盘：【麋鹿】
projects / mirrors / FD230.git / log