mirrors/FD230.git
2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1219/1
hcj [Sat, 19 Oct 2024 11:01:48 +0000 (19:01 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

2 years ago修复电话界面动画问题
hcj [Sat, 19 Oct 2024 11:01:12 +0000 (19:01 +0800)]
修复电话界面动画问题

2 years agoMerge #1216 into sdk602patch0911 from refs/changes/1216/head 1218/target/1 1219/target/1 1220/target/1 1221/target/1
胡传军 [Sat, 19 Oct 2024 10:56:44 +0000 (10:56 +0000)]
Merge #1216 into sdk602patch0911 from refs/changes/1216/head

先关闭4G电话对麦克风管理,可能导致音频系统锁死

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

  - 先关闭4G电话对麦克风管理,可能导致音频系统锁死

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/1216
2 years ago修复编译问题 1217/1 1217/head
Caisking [Sat, 19 Oct 2024 09:01:05 +0000 (17:01 +0800)]
修复编译问题

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Sat, 19 Oct 2024 08:20:28 +0000 (16:20 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago先关闭4G电话对麦克风管理,可能导致音频系统锁死 1216/1 1216/head
hcj [Sat, 19 Oct 2024 08:19:32 +0000 (16:19 +0800)]
先关闭4G电话对麦克风管理,可能导致音频系统锁死

2 years ago心率:优化心率nextday可能不会清空的现象
Caisking [Sat, 19 Oct 2024 08:19:02 +0000 (16:19 +0800)]
心率:优化心率nextday可能不会清空的现象

2 years agoMerge #1215 into sdk602patch0911 from refs/changes/1215/head 1216/target/1 1217/target/1
罗正 [Sat, 19 Oct 2024 07:15:40 +0000 (07:15 +0000)]
Merge #1215 into sdk602patch0911 from refs/changes/1215/head

Code review from 罗正

* refs/changes/1215/head: (10 commits squashed)

  - AI语音录音时间由15修改为10秒,10秒后超时自动发送录音数据

  - 1.目标提醒弹窗加震动
    2.运动识别和久坐提醒震动增加受勿扰和睡眠模式开关影响
    3.修改默认震动强度为中

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

  - 修改KV Store 的Cache 大小为100

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

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

  - #1029,解决,手表,iOS,手机播放音乐,手表使用AI功能,手表依然在播放音乐,

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

  - 解决训练界面音乐进度条不更新问题

  - #1023,解决闹钟有出现没有声音现象bug

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/1215
2 years agoMerge #1214 into sdk602patch0911 from refs/changes/1214/head
袁清梦 [Sat, 19 Oct 2024 07:15:27 +0000 (07:15 +0000)]
Merge #1214 into sdk602patch0911 from refs/changes/1214/head

系统:增加心率数据的日志记录

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

  - 系统:增加心率数据的日志记录

  - #1049手表,运动室外跑步,500步目标测试,实际600步,目标完成度100%,目标完成度需要进行相应增加120%;

    #1048手表,运动室外跑步,1KM目标测试,实际1259米,目标完成度100%,目标完成度需要进行相应增加125%;

    #1052配速,步频,目标完成度,目标完成提示,都有问题;

    #1047手表,运动室外跑步,1KM目标测试,目标进度条在运动过程中不会变更,在运动达标时直接显示满

  - #1033运动中设置步数目标,弹出步数目标达成提醒时界面目标值的单位显示不全(如果目标值较大的话估计单位就显示。。了)

  - #852设置时长目标10min,运动中到达10分钟时无目标达成提醒

  - #1013 运动中从数据面滑至暂停页后停留一会,再滑至数据页,计时会有跳变过程

  - 睡眠:修复开启睡眠会点亮勿扰icon

  - 睡眠:优化主界面睡眠刷新速度

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/1214
2 years ago#715手表,更换省电模式提示内容
Caisking [Sat, 19 Oct 2024 02:58:30 +0000 (10:58 +0800)]
#715手表,更换省电模式提示内容

2 years ago睡眠:优化主界面睡眠刷新速度 1214/3 1214/head
Caisking [Fri, 18 Oct 2024 12:45:47 +0000 (20:45 +0800)]
睡眠:优化主界面睡眠刷新速度

2 years ago睡眠:修复开启睡眠会点亮勿扰icon
Caisking [Fri, 18 Oct 2024 12:25:21 +0000 (20:25 +0800)]
睡眠:修复开启睡眠会点亮勿扰icon

2 years ago电话音频优化(1 1211/5 1211/head
hcj [Fri, 18 Oct 2024 12:15:36 +0000 (20:15 +0800)]
电话音频优化(1

2 years ago#1013 运动中从数据面滑至暂停页后停留一会,再滑至数据页,计时会有跳变过程 1214/2
Caisking [Fri, 18 Oct 2024 11:47:58 +0000 (19:47 +0800)]
#1013 运动中从数据面滑至暂停页后停留一会,再滑至数据页,计时会有跳变过程

2 years ago电话音频优化 1211/4
hcj [Fri, 18 Oct 2024 11:12:50 +0000 (19:12 +0800)]
电话音频优化

2 years ago#852设置时长目标10min,运动中到达10分钟时无目标达成提醒
Caisking [Fri, 18 Oct 2024 08:58:03 +0000 (16:58 +0800)]
#852设置时长目标10min,运动中到达10分钟时无目标达成提醒

2 years ago#1033运动中设置步数目标,弹出步数目标达成提醒时界面目标值的单位显示不全(如果目标值较大的话估计单位就显示。。了)
Caisking [Fri, 18 Oct 2024 08:51:20 +0000 (16:51 +0800)]
#1033运动中设置步数目标,弹出步数目标达成提醒时界面目标值的单位显示不全(如果目标值较大的话估计单位就显示。。了)

2 years ago#1049手表,运动室外跑步,500步目标测试,实际600步,目标完成度100%,目标完成度需要进行相应增加120%;
Caisking [Fri, 18 Oct 2024 08:49:26 +0000 (16:49 +0800)]
#1049手表,运动室外跑步,500步目标测试,实际600步,目标完成度100%,目标完成度需要进行相应增加120%;

#1048手表,运动室外跑步,1KM目标测试,实际1259米,目标完成度100%,目标完成度需要进行相应增加125%;

#1052配速,步频,目标完成度,目标完成提示,都有问题;

#1047手表,运动室外跑步,1KM目标测试,目标进度条在运动过程中不会变更,在运动达标时直接显示满

2 years ago通话记录修改 改为list 1211/3
hcj [Fri, 18 Oct 2024 07:22:40 +0000 (15:22 +0800)]
通话记录修改 改为list

2 years ago系统:增加心率数据的日志记录 1214/1
Caisking [Fri, 18 Oct 2024 03:46:39 +0000 (11:46 +0800)]
系统:增加心率数据的日志记录

2 years ago合并 1211/2
hcj [Fri, 18 Oct 2024 02:50:42 +0000 (10:50 +0800)]
合并

2 years ago添加gen_additional_fs.sh的脚本 1211/target/2 1213/1 1213/head 1214/target/1 1215/target/1
SnickerSun [Fri, 18 Oct 2024 02:18:26 +0000 (10:18 +0800)]
添加gen_additional_fs.sh的脚本

2 years ago心率:优化错误弹窗 1212/3 1212/head 1213/target/1
Caisking [Thu, 17 Oct 2024 12:54:09 +0000 (20:54 +0800)]
心率:优化错误弹窗

2 years ago系统:进行每秒回调判断条件优化 1212/2
Caisking [Thu, 17 Oct 2024 10:24:46 +0000 (18:24 +0800)]
系统:进行每秒回调判断条件优化

2 years ago系统:取消handlewake
Caisking [Thu, 17 Oct 2024 09:57:51 +0000 (17:57 +0800)]
系统:取消handlewake

2 years ago合并代码 1212/1
Caisking [Thu, 17 Oct 2024 09:55:07 +0000 (17:55 +0800)]
合并代码

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Thu, 17 Oct 2024 09:54:12 +0000 (17:54 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago系统:增加系统nextday日志的记录
Caisking [Thu, 17 Oct 2024 09:53:28 +0000 (17:53 +0800)]
系统:增加系统nextday日志的记录

2 years ago系统:修改每秒定时器回调
Caisking [Thu, 17 Oct 2024 09:52:36 +0000 (17:52 +0800)]
系统:修改每秒定时器回调

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1211/1
hcj [Thu, 17 Oct 2024 08:45:24 +0000 (16:45 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

2 years ago修改设置用户数据协议
hcj [Thu, 17 Oct 2024 08:45:15 +0000 (16:45 +0800)]
修改设置用户数据协议

2 years agorelease V1.2.69 1210/2 1210/head 1211/target/1 1212/target/1
SnickerSun [Thu, 17 Oct 2024 08:11:11 +0000 (16:11 +0800)]
release V1.2.69
fix autoota compile issue

2 years agoMerge #1209 into sdk602patch0911 from refs/changes/1209/head 1210/target/1
罗正 [Thu, 17 Oct 2024 08:10:34 +0000 (08:10 +0000)]
Merge #1209 into sdk602patch0911 from refs/changes/1209/head

Code review from 罗正

* refs/changes/1209/head: (4 commits squashed)

  - AI语音录音时间由15修改为10秒,10秒后超时自动发送录音数据

  - 1.目标提醒弹窗加震动
    2.运动识别和久坐提醒震动增加受勿扰和睡眠模式开关影响
    3.修改默认震动强度为中

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

  - 修改KV Store 的Cache 大小为100

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/1209
2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1208/1 1208/head
penglei [Thu, 17 Oct 2024 07:59:24 +0000 (15:59 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago修改cywee ble服务handle
penglei [Thu, 17 Oct 2024 07:58:47 +0000 (15:58 +0800)]
修改cywee ble服务handle

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1207/1 1207/head 1208/target/1 1209/target/1
hcj [Thu, 17 Oct 2024 07:48:11 +0000 (15:48 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

2 years agoble增加广播检测,3s检测一次广播状态是否正常
hcj [Thu, 17 Oct 2024 07:47:40 +0000 (15:47 +0800)]
ble增加广播检测,3s检测一次广播状态是否正常

2 years agoMerge #1206 into sdk602patch0911 from refs/changes/1206/head 1207/target/1
彭磊 [Thu, 17 Oct 2024 06:50:26 +0000 (06:50 +0000)]
Merge #1206 into sdk602patch0911 from refs/changes/1206/head

Code review from 彭磊

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

  - 修复gsensor性别设置错误的bug,修复重复开启gsensor的bug

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

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/1206
2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1206/1 1206/head
penglei [Thu, 17 Oct 2024 03:26:41 +0000 (11:26 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago修复gsensor性别设置错误的bug,修复重复开启gsensor的bug
penglei [Thu, 17 Oct 2024 03:26:35 +0000 (11:26 +0800)]
修复gsensor性别设置错误的bug,修复重复开启gsensor的bug

2 years ago系统:增加系统空闲内存显示 1205/1 1205/head
Caisking [Thu, 17 Oct 2024 03:18:03 +0000 (11:18 +0800)]
系统:增加系统空闲内存显示

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Thu, 17 Oct 2024 02:01:17 +0000 (10:01 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago增加在配对前,清除配对数据操作.(补 1204/1 1204/head 1205/target/1 1206/target/1
hcj [Wed, 16 Oct 2024 14:55:52 +0000 (22:55 +0800)]
增加在配对前,清除配对数据操作.(补

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1203/1 1203/head 1204/target/1
hcj [Wed, 16 Oct 2024 14:46:09 +0000 (22:46 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

2 years ago增加在配对前,清除配对数据操作.
hcj [Wed, 16 Oct 2024 14:45:53 +0000 (22:45 +0800)]
增加在配对前,清除配对数据操作.

2 years ago增加在配对前,清除配对数据操作
hcj [Wed, 16 Oct 2024 14:45:31 +0000 (22:45 +0800)]
增加在配对前,清除配对数据操作

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Wed, 16 Oct 2024 14:29:42 +0000 (22:29 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1202/1 1202/head 1203/target/1
luozheng [Wed, 16 Oct 2024 14:17:18 +0000 (22:17 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago解决播放器声音不能点击bug
luozheng [Wed, 16 Oct 2024 14:17:05 +0000 (22:17 +0800)]
解决播放器声音不能点击bug

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Wed, 16 Oct 2024 14:02:34 +0000 (22:02 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agorelease V1.2.68 1201/1 1201/head 1202/target/1
SnickerSun [Wed, 16 Oct 2024 13:50:56 +0000 (21:50 +0800)]
release V1.2.68

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Wed, 16 Oct 2024 13:36:04 +0000 (21:36 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agoMerge #1200 into sdk602patch0911 from refs/changes/1200/head 1201/target/1
胡传军 [Wed, 16 Oct 2024 13:35:03 +0000 (13:35 +0000)]
Merge #1200 into sdk602patch0911 from refs/changes/1200/head

Code review from 胡传军

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

  - 修改获取站立次数

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

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/1200
2 years ago1.长亮屏runtime设置优化,只有在设置成功时候才设置
luozheng [Wed, 16 Oct 2024 13:33:43 +0000 (21:33 +0800)]
1.长亮屏runtime设置优化,只有在设置成功时候才设置
2.调试界面添加显示runtime值

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1200/1 1200/head
hcj [Wed, 16 Oct 2024 13:29:37 +0000 (21:29 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

2 years ago修改获取站立次数
hcj [Wed, 16 Oct 2024 13:10:00 +0000 (21:10 +0800)]
修改获取站立次数

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Wed, 16 Oct 2024 12:52:02 +0000 (20:52 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago燃脂时间修改 1199/1 1199/head
penglei [Wed, 16 Oct 2024 12:45:34 +0000 (20:45 +0800)]
燃脂时间修改

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Wed, 16 Oct 2024 12:24:41 +0000 (20:24 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agoMerge #1197 into sdk602patch0911 from refs/changes/1197/head 1199/target/1 1200/target/1
罗正 [Wed, 16 Oct 2024 12:21:28 +0000 (12:21 +0000)]
Merge #1197 into sdk602patch0911 from refs/changes/1197/head

Code review from 罗正

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

  - AI语音优化:
    1.添加AI查询的定时器与AI思考中定时器分离
    2.删除AIModel中无用代码

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

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/1197
2 years ago蓝牙修改,根据需求采取,实时更新连接间隔,BR配对优化(补+ 1198/3 1198/head
hcj [Wed, 16 Oct 2024 12:18:30 +0000 (20:18 +0800)]
蓝牙修改,根据需求采取,实时更新连接间隔,BR配对优化(补+

2 years ago蓝牙修改,根据需求采取,实时更新连接间隔,BR配对优化(补 1198/2
hcj [Wed, 16 Oct 2024 12:15:30 +0000 (20:15 +0800)]
蓝牙修改,根据需求采取,实时更新连接间隔,BR配对优化(补

2 years ago蓝牙修改,根据需求采取,实时更新连接间隔,BR配对优化 1198/1
hcj [Wed, 16 Oct 2024 12:14:35 +0000 (20:14 +0800)]
蓝牙修改,根据需求采取,实时更新连接间隔,BR配对优化

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Wed, 16 Oct 2024 11:04:05 +0000 (19:04 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1197/1 1197/head
luozheng [Wed, 16 Oct 2024 10:40:20 +0000 (18:40 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years agoAI语音优化:
luozheng [Wed, 16 Oct 2024 10:40:12 +0000 (18:40 +0800)]
AI语音优化:
1.添加AI查询的定时器与AI思考中定时器分离
2.删除AIModel中无用代码

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Wed, 16 Oct 2024 09:29:06 +0000 (17:29 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

2 years agoMerge #1195 into sdk602patch0911 from refs/changes/1195/head 1197/target/1 1198/target/1
袁清梦 [Wed, 16 Oct 2024 09:08:41 +0000 (09:08 +0000)]
Merge #1195 into sdk602patch0911 from refs/changes/1195/head

Code review from 袁清梦

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

  - 训练:优化配速表心率表的存储

  - 表盘:水母表盘更新

  - 表盘:小狗表盘更新

  - 表盘;小猫表盘更新

  - 表盘:星空表盘更新

  - 表盘:绿叶表盘更新

  - 表盘:宇航员表盘更新

  - 表盘:卫星表盘更新

  - 表盘:飞鸟表盘更新

  - 表盘:更新晨曦智影与镜影行者

  - 表盘:自定义表盘电池坐标优化

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

  - 心率:修改心率检测增加最多60秒长亮屏。测量出来正常息屏。

  - 系统:修改数字英语的字符串使用默认语言,防止其他语言显示异常;修改部分未适配字符串显示默认中文,防止切换语言消失字符

  - 表盘:优化运动表盘

  - 系统:更新默认表盘

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

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/1195
2 years ago1.AI超时界面UI优化 1196/1 1196/head
luozheng [Wed, 16 Oct 2024 08:18:12 +0000 (16:18 +0800)]
1.AI超时界面UI优化
2.添加AI回应直接结束,返回结果为空弹窗
3.进入AI界面动态更改连接参数,减少发送语音数据错误率
4.发送AI准备和取消当前AI对话指令,使用蓝牙的线程,与UI线程解耦

2 years ago密码锁:优化关闭密码的UI切换
Caisking [Wed, 16 Oct 2024 06:51:44 +0000 (14:51 +0800)]
密码锁:优化关闭密码的UI切换

2 years ago表盘:新增星期数字的数据类型
Caisking [Wed, 16 Oct 2024 02:52:40 +0000 (10:52 +0800)]
表盘:新增星期数字的数据类型

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Wed, 16 Oct 2024 01:34:30 +0000 (09:34 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1195/1 1195/head
Caisking [Tue, 15 Oct 2024 12:57:38 +0000 (20:57 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago系统:更新默认表盘
Caisking [Tue, 15 Oct 2024 12:57:28 +0000 (20:57 +0800)]
系统:更新默认表盘

2 years agoMerge #1194 into sdk602patch0911 from refs/changes/1194/head 1195/target/1 1196/target/1
胡传军 [Tue, 15 Oct 2024 12:47:35 +0000 (12:47 +0000)]
Merge #1194 into sdk602patch0911 from refs/changes/1194/head

Code review from 胡传军

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

  - 电话综合修改,有所改善,但如果太快连续拨打电话易出错

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

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/1194
2 years agoMerge #1193 into sdk602patch0911 from refs/changes/1193/head
袁清梦 [Tue, 15 Oct 2024 12:41:40 +0000 (12:41 +0000)]
Merge #1193 into sdk602patch0911 from refs/changes/1193/head

Code review from 袁清梦

* refs/changes/1193/head: (15 commits squashed)

  - 训练:优化配速表心率表的存储

  - 表盘:水母表盘更新

  - 表盘:小狗表盘更新

  - 表盘;小猫表盘更新

  - 表盘:星空表盘更新

  - 表盘:绿叶表盘更新

  - 表盘:宇航员表盘更新

  - 表盘:卫星表盘更新

  - 表盘:飞鸟表盘更新

  - 表盘:更新晨曦智影与镜影行者

  - 表盘:自定义表盘电池坐标优化

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

  - 心率:修改心率检测增加最多60秒长亮屏。测量出来正常息屏。

  - 系统:修改数字英语的字符串使用默认语言,防止其他语言显示异常;修改部分未适配字符串显示默认中文,防止切换语言消失字符

  - 表盘:优化运动表盘

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/1193
2 years ago表盘:优化运动表盘 1193/2 1193/head
Caisking [Tue, 15 Oct 2024 12:15:31 +0000 (20:15 +0800)]
表盘:优化运动表盘

2 years ago在闹钟功能不变情况喜爱,添加新闹钟添加判断,其他界面删除无用代码 1192/4 1192/head
luozheng [Tue, 15 Oct 2024 12:08:11 +0000 (20:08 +0800)]
在闹钟功能不变情况喜爱,添加新闹钟添加判断,其他界面删除无用代码

2 years ago系统:修改数字英语的字符串使用默认语言,防止其他语言显示异常;修改部分未适配字符串显示默认中文,防止切换语言消失字符
Caisking [Tue, 15 Oct 2024 12:00:38 +0000 (20:00 +0800)]
系统:修改数字英语的字符串使用默认语言,防止其他语言显示异常;修改部分未适配字符串显示默认中文,防止切换语言消失字符

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1194/1 1194/head
hcj [Tue, 15 Oct 2024 11:12:32 +0000 (19:12 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0911

2 years ago电话综合修改,有所改善,但如果太快连续拨打电话易出错
hcj [Tue, 15 Oct 2024 11:12:23 +0000 (19:12 +0800)]
电话综合修改,有所改善,但如果太快连续拨打电话易出错

2 years agoAI语音,添加两种情况判断: 1192/3
luozheng [Tue, 15 Oct 2024 11:04:02 +0000 (19:04 +0800)]
AI语音,添加两种情况判断:
情况1,如果AI录音数据重传多次没成功,弹窗进入错误界面
情况2,如果AI思考中,手机蓝牙断开,弹窗进入错误界面

2 years ago心率:修改心率检测增加最多60秒长亮屏。测量出来正常息屏。 1193/1
Caisking [Tue, 15 Oct 2024 10:59:34 +0000 (18:59 +0800)]
心率:修改心率检测增加最多60秒长亮屏。测量出来正常息屏。

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Tue, 15 Oct 2024 08:32:26 +0000 (16:32 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago表盘:自定义表盘电池坐标优化
Caisking [Tue, 15 Oct 2024 08:32:14 +0000 (16:32 +0800)]
表盘:自定义表盘电池坐标优化

2 years ago表盘:更新晨曦智影与镜影行者
Caisking [Tue, 15 Oct 2024 08:31:50 +0000 (16:31 +0800)]
表盘:更新晨曦智影与镜影行者

2 years ago表盘:飞鸟表盘更新
Caisking [Tue, 15 Oct 2024 08:31:17 +0000 (16:31 +0800)]
表盘:飞鸟表盘更新

2 years ago表盘:卫星表盘更新
Caisking [Tue, 15 Oct 2024 08:31:05 +0000 (16:31 +0800)]
表盘:卫星表盘更新

2 years ago表盘:宇航员表盘更新
Caisking [Tue, 15 Oct 2024 08:29:43 +0000 (16:29 +0800)]
表盘:宇航员表盘更新

2 years ago表盘:绿叶表盘更新
Caisking [Tue, 15 Oct 2024 08:29:29 +0000 (16:29 +0800)]
表盘:绿叶表盘更新

2 years ago表盘:星空表盘更新
Caisking [Tue, 15 Oct 2024 08:29:07 +0000 (16:29 +0800)]
表盘:星空表盘更新

2 years ago表盘;小猫表盘更新
Caisking [Tue, 15 Oct 2024 08:28:38 +0000 (16:28 +0800)]
表盘;小猫表盘更新

2 years ago表盘:小狗表盘更新
Caisking [Tue, 15 Oct 2024 08:28:15 +0000 (16:28 +0800)]
表盘:小狗表盘更新

2 years ago表盘:水母表盘更新
Caisking [Tue, 15 Oct 2024 08:27:48 +0000 (16:27 +0800)]
表盘:水母表盘更新

2 years ago1.增加常亮屏runtime,解决长亮屏界面被弹窗取消常亮屏 1192/2
luozheng [Tue, 15 Oct 2024 07:55:57 +0000 (15:55 +0800)]
1.增加常亮屏runtime,解决长亮屏界面被弹窗取消常亮屏
2.#697,解决,手表开机和关机时增加震动(需求)

2 years agoMerge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 1192/1
luozheng [Tue, 15 Oct 2024 03:04:56 +0000 (11:04 +0800)]
Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

2 years ago1009补丁合入,出现播放音频时候队列满,线程被卡住的问题
luozheng [Tue, 15 Oct 2024 03:04:46 +0000 (11:04 +0800)]
1009补丁合入,出现播放音频时候队列满,线程被卡住的问题

2 years agoMerge #1191 into sdk602patch0911 from refs/changes/1191/head 1192/target/1 1193/target/1 1194/target/1
罗正 [Tue, 15 Oct 2024 03:02:10 +0000 (03:02 +0000)]
Merge #1191 into sdk602patch0911 from refs/changes/1191/head

音乐和录音组件使用时添加判断

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

  - 音乐和录音组件使用时添加判断

  - AI思考中界面优化,如果组件new失败,就不Add进容器,保证不死机

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/1191
2 years ago训练:优化配速表心率表的存储
Caisking [Tue, 15 Oct 2024 02:47:43 +0000 (10:47 +0800)]
训练:优化配速表心率表的存储

2 years agoAI思考中界面优化,如果组件new失败,就不Add进容器,保证不死机 1191/2 1191/head
luozheng [Tue, 15 Oct 2024 02:31:22 +0000 (10:31 +0800)]
AI思考中界面优化,如果组件new失败,就不Add进容器,保证不死机