mirrors/FD230.git
2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 838/1 838/head 839/target/1
SnickerSun [Fri, 30 Aug 2024 11:56:43 +0000 (19:56 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago更新language_tool脚本,添加和修改多国语言项,改为在language_custom.xlsx中修改,执行make_language.sh即可
SnickerSun [Fri, 30 Aug 2024 11:56:34 +0000 (19:56 +0800)]
更新language_tool脚本,添加和修改多国语言项,改为在language_custom.xlsx中修改,执行make_language.sh即可

2 years ago修复错误的if语句 836/1 836/head 837/target/1 838/target/1
Caisking [Fri, 30 Aug 2024 11:31:35 +0000 (19:31 +0800)]
修复错误的if语句

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Fri, 30 Aug 2024 10:47:17 +0000 (18:47 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化移动入库开关机逻辑 835/2 835/head 836/target/1
DXY [Fri, 30 Aug 2024 10:31:28 +0000 (18:31 +0800)]
优化移动入库开关机逻辑

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
DXY [Fri, 30 Aug 2024 10:06:26 +0000 (18:06 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #834 into sdk602patch0626 from refs/changes/834/head 835/target/2
袁清梦 [Fri, 30 Aug 2024 10:05:49 +0000 (10:05 +0000)]
Merge #834 into sdk602patch0626 from refs/changes/834/head

Code review from 袁清梦

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

  - 黑曜律动表盘资源汇总

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

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

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

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

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

  - 更新表盘制作脚本以及说明文档

  - 更新黑耀表盘资源文件

  - 修改时间分钟个位获取的错误

  - 优化睡眠数据计算。优化数据显示

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/834
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 835/1
DXY [Fri, 30 Aug 2024 10:03:49 +0000 (18:03 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
DXY [Fri, 30 Aug 2024 10:03:40 +0000 (18:03 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago屏蔽KeyInputListener功能键没有使用到的功能
Caisking [Fri, 30 Aug 2024 09:57:38 +0000 (17:57 +0800)]
屏蔽KeyInputListener功能键没有使用到的功能

2 years ago优化睡眠数据计算。优化数据显示 834/2 834/head
Caisking [Fri, 30 Aug 2024 09:48:25 +0000 (17:48 +0800)]
优化睡眠数据计算。优化数据显示

2 years ago修改时间分钟个位获取的错误 834/1
Caisking [Fri, 30 Aug 2024 09:22:52 +0000 (17:22 +0800)]
修改时间分钟个位获取的错误

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 830/target/2 833/1 833/head 835/target/1
hcj [Fri, 30 Aug 2024 08:36:34 +0000 (16:36 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago优化活动界面内存泄漏
hcj [Fri, 30 Aug 2024 08:36:19 +0000 (16:36 +0800)]
优化活动界面内存泄漏

2 years ago更新黑耀表盘资源文件
Caisking [Fri, 30 Aug 2024 08:35:40 +0000 (16:35 +0800)]
更新黑耀表盘资源文件

2 years ago更新表盘制作脚本以及说明文档
Caisking [Fri, 30 Aug 2024 08:35:26 +0000 (16:35 +0800)]
更新表盘制作脚本以及说明文档

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Fri, 30 Aug 2024 06:54:37 +0000 (14:54 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #831 into sdk602patch0626 from refs/changes/831/head 833/target/1 834/target/1
胡传军 [Fri, 30 Aug 2024 06:40:28 +0000 (06:40 +0000)]
Merge #831 into sdk602patch0626 from refs/changes/831/head

Code review from 胡传军

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

  - 计算器内存泄漏修复

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

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/831
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 832/1 832/head
penglei [Fri, 30 Aug 2024 06:33:06 +0000 (14:33 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化黑曜表盘字体UI
penglei [Fri, 30 Aug 2024 06:31:09 +0000 (14:31 +0800)]
优化黑曜表盘字体UI

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 831/1 831/head
hcj [Fri, 30 Aug 2024 02:37:08 +0000 (10:37 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago计算器内存泄漏修复
hcj [Fri, 30 Aug 2024 02:36:56 +0000 (10:36 +0800)]
计算器内存泄漏修复

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Fri, 30 Aug 2024 02:07:23 +0000 (10:07 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #827 into sdk602patch0626 from refs/changes/827/head 830/target/1 831/target/1 832/target/1
彭磊 [Thu, 29 Aug 2024 13:29:29 +0000 (13:29 +0000)]
Merge #827 into sdk602patch0626 from refs/changes/827/head

Code review from 彭磊

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

  - 优化睡眠状态时间戳计算

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

  - 优化黑曜表盘UI

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

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/827
2 years agoMerge #828 into sdk602patch0626 from refs/changes/828/head
程羽飞 [Thu, 29 Aug 2024 13:28:36 +0000 (13:28 +0000)]
Merge #828 into sdk602patch0626 from refs/changes/828/head

更新闹钟界面退出功能

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

  - 更新闹钟界面退出功能

Signed-off-by: dingtalk_kaxuzp <2393524978@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/828
2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 829/1 829/head
SnickerSun [Thu, 29 Aug 2024 13:27:41 +0000 (21:27 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago语言转换脚本更新,支持多种语言同时转换。
SnickerSun [Thu, 29 Aug 2024 13:27:16 +0000 (21:27 +0800)]
语言转换脚本更新,支持多种语言同时转换。

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Thu, 29 Aug 2024 11:34:49 +0000 (19:34 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 827/1 827/head
penglei [Thu, 29 Aug 2024 11:28:23 +0000 (19:28 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化黑曜表盘UI
penglei [Thu, 29 Aug 2024 11:28:10 +0000 (19:28 +0800)]
优化黑曜表盘UI

2 years agoapplist添加音乐界面,使用闹钟中的定时器刷新除主界面的音乐进度条 826/3 826/head 827/target/1 828/target/1 829/target/1
luozheng [Thu, 29 Aug 2024 11:16:35 +0000 (19:16 +0800)]
applist添加音乐界面,使用闹钟中的定时器刷新除主界面的音乐进度条

2 years ago优化cat1Service的UDP接收数据的逻辑:增加移动入库重启开关机流程 移动入库字段RAM由35MB改成32MB
DXY [Thu, 29 Aug 2024 10:14:19 +0000 (18:14 +0800)]
优化cat1Service的UDP接收数据的逻辑:增加移动入库重启开关机流程 移动入库字段RAM由35MB改成32MB

2 years ago海思原本关机和重启界面删除 826/2
luozheng [Thu, 29 Aug 2024 09:56:58 +0000 (17:56 +0800)]
海思原本关机和重启界面删除

2 years ago长按关机sos根据figma上设计修改 826/1
luozheng [Thu, 29 Aug 2024 09:54:15 +0000 (17:54 +0800)]
长按关机sos根据figma上设计修改

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Thu, 29 Aug 2024 09:40:09 +0000 (17:40 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Thu, 29 Aug 2024 06:58:05 +0000 (14:58 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago解决设置中点击关机按钮死机问题
luozheng [Thu, 29 Aug 2024 06:57:57 +0000 (14:57 +0800)]
解决设置中点击关机按钮死机问题

2 years ago闹钟响铃界面修改 825/1 825/head 826/target/1
cheng [Thu, 29 Aug 2024 05:00:18 +0000 (13:00 +0800)]
闹钟响铃界面修改

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 824/1 824/head 825/target/1
SnickerSun [Thu, 29 Aug 2024 04:40:56 +0000 (12:40 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago添加release间日志获取脚本
SnickerSun [Thu, 29 Aug 2024 04:40:30 +0000 (12:40 +0800)]
添加release间日志获取脚本

2 years agoMerge #822 into sdk602patch0626 from refs/changes/822/head 824/target/1
袁清梦 [Thu, 29 Aug 2024 04:11:20 +0000 (04:11 +0000)]
Merge #822 into sdk602patch0626 from refs/changes/822/head

Code review from 袁清梦

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

  - 黑曜律动表盘资源汇总

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

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/822
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 823/1 823/head
hcj [Thu, 29 Aug 2024 04:03:06 +0000 (12:03 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 822/1 822/head
Caisking [Thu, 29 Aug 2024 04:02:53 +0000 (12:02 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago低电量自动关机UI修改
hcj [Thu, 29 Aug 2024 04:02:51 +0000 (12:02 +0800)]
低电量自动关机UI修改

2 years ago黑曜律动表盘资源汇总
Caisking [Thu, 29 Aug 2024 04:02:47 +0000 (12:02 +0800)]
黑曜律动表盘资源汇总

2 years ago闹钟界面修改:闹钟列表、新建闹钟设置时间星期 821/1 821/head 822/target/1 823/target/1
cheng [Thu, 29 Aug 2024 03:46:46 +0000 (11:46 +0800)]
闹钟界面修改:闹钟列表、新建闹钟设置时间星期

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
penglei [Thu, 29 Aug 2024 03:35:25 +0000 (11:35 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #820 into sdk602patch0626 from refs/changes/820/head 821/target/1
彭磊 [Thu, 29 Aug 2024 03:32:00 +0000 (03:32 +0000)]
Merge #820 into sdk602patch0626 from refs/changes/820/head

优化睡眠状态时间戳计算

* refs/changes/820/head: (1 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/820
2 years ago优化睡眠状态时间戳计算 820/1 820/head
penglei [Thu, 29 Aug 2024 03:21:50 +0000 (11:21 +0800)]
优化睡眠状态时间戳计算

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 819/1 819/head
Caisking [Thu, 29 Aug 2024 03:02:07 +0000 (11:02 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago同步applist里面的Slice的内存泄漏打印
Caisking [Thu, 29 Aug 2024 03:02:03 +0000 (11:02 +0800)]
同步applist里面的Slice的内存泄漏打印

2 years ago修改卡片管理UI与figma保持一致
Caisking [Thu, 29 Aug 2024 03:01:20 +0000 (11:01 +0800)]
修改卡片管理UI与figma保持一致

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 818/1 818/head 819/target/1 820/target/1
penglei [Thu, 29 Aug 2024 02:41:46 +0000 (10:41 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago替换黑曜表盘预览图
penglei [Thu, 29 Aug 2024 02:40:57 +0000 (10:40 +0800)]
替换黑曜表盘预览图

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Thu, 29 Aug 2024 02:37:34 +0000 (10:37 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years agoMerge #813 into sdk602patch0626 from refs/changes/813/head 818/target/1
袁清梦 [Thu, 29 Aug 2024 02:34:38 +0000 (02:34 +0000)]
Merge #813 into sdk602patch0626 from refs/changes/813/head

Code review from 袁清梦

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

  - 屏蔽KeyInputListener里面的不使用功能

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

  - 修复密码锁通过蓝牙解锁进行状态同步

  - 修改&quot;重新检测->重测“

  - 删除重复的字段

  - 修复睡眠进度条的两端为圆形

  - 修改每日目标进度条方向

  - 修改训练中进度条颜色为绿色

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/813
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 817/1 817/head
luozheng [Thu, 29 Aug 2024 02:32:16 +0000 (10:32 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoCMake文件补交
luozheng [Thu, 29 Aug 2024 02:32:08 +0000 (10:32 +0800)]
CMake文件补交

2 years ago下拉手机连接状态显示与隐藏添加
luozheng [Thu, 29 Aug 2024 02:31:31 +0000 (10:31 +0800)]
下拉手机连接状态显示与隐藏添加

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
hcj [Thu, 29 Aug 2024 02:23:24 +0000 (10:23 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years agoMerge #814 into sdk602patch0626 from refs/changes/814/head 817/target/1
彭磊 [Thu, 29 Aug 2024 02:18:50 +0000 (02:18 +0000)]
Merge #814 into sdk602patch0626 from refs/changes/814/head

Code review from 彭磊

* refs/changes/814/head: (11 commits squashed)

  - 修改蓝牙广播模式,降低广播功耗

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

  - 修改蓝牙广播模式,降低广播功耗(补)

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

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

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

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

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

  - 优化省电模式4G、蓝牙开关逻辑,添加“黑曜律动”表盘(待优化)

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

  - 4d606cb: 优化省电模式4G、蓝牙开关逻辑,添加“黑曜律动”表盘(待优化)(补)

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/814
2 years agoMerge #816 into sdk602patch0626 from refs/changes/816/head
胡传军 [Thu, 29 Aug 2024 02:14:34 +0000 (02:14 +0000)]
Merge #816 into sdk602patch0626 from refs/changes/816/head

Code review from 胡传军

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

  - 增加AI对话取消对话在蓝牙层级保护,避免出现误取消,以及未结束继续对话的情况

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

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/816
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 816/1 816/head
hcj [Thu, 29 Aug 2024 02:12:54 +0000 (10:12 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago增加AI对话取消对话在蓝牙层级保护,避免出现误取消,以及未结束继续对话的情况
hcj [Thu, 29 Aug 2024 02:11:25 +0000 (10:11 +0800)]
增加AI对话取消对话在蓝牙层级保护,避免出现误取消,以及未结束继续对话的情况

2 years ago手电筒界面修改去掉“线” 815/2 815/head
luozheng [Wed, 28 Aug 2024 12:48:17 +0000 (20:48 +0800)]
手电筒界面修改去掉“线”

2 years ago下拉界面修改蓝牙图标不高亮
luozheng [Wed, 28 Aug 2024 12:46:07 +0000 (20:46 +0800)]
下拉界面修改蓝牙图标不高亮

2 years ago系统中添加关机和重启视图 815/1
luozheng [Wed, 28 Aug 2024 12:32:40 +0000 (20:32 +0800)]
系统中添加关机和重启视图

2 years ago修改训练中进度条颜色为绿色 813/5 813/head
Caisking [Wed, 28 Aug 2024 12:07:09 +0000 (20:07 +0800)]
修改训练中进度条颜色为绿色

2 years ago修改每日目标进度条方向 813/4
Caisking [Wed, 28 Aug 2024 11:55:39 +0000 (19:55 +0800)]
修改每日目标进度条方向

2 years ago修复睡眠进度条的两端为圆形
Caisking [Wed, 28 Aug 2024 11:54:35 +0000 (19:54 +0800)]
修复睡眠进度条的两端为圆形

2 years ago删除重复的字段 813/3
Caisking [Wed, 28 Aug 2024 11:43:33 +0000 (19:43 +0800)]
删除重复的字段

2 years ago修改"重新检测->重测“ 813/2
Caisking [Wed, 28 Aug 2024 11:40:28 +0000 (19:40 +0800)]
修改"重新检测->重测“

2 years ago4d606cb: 优化省电模式4G、蓝牙开关逻辑,添加“黑曜律动”表盘(待优化)(补) 814/2 814/head
penglei [Wed, 28 Aug 2024 11:33:24 +0000 (19:33 +0800)]
4d606cb: 优化省电模式4G、蓝牙开关逻辑,添加“黑曜律动”表盘(待优化)(补)

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 814/1
penglei [Wed, 28 Aug 2024 11:30:12 +0000 (19:30 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago优化省电模式4G、蓝牙开关逻辑,添加“黑曜律动”表盘(待优化)
penglei [Wed, 28 Aug 2024 11:29:44 +0000 (19:29 +0800)]
优化省电模式4G、蓝牙开关逻辑,添加“黑曜律动”表盘(待优化)

2 years ago修复密码锁通过蓝牙解锁进行状态同步 813/1
Caisking [Wed, 28 Aug 2024 11:08:14 +0000 (19:08 +0800)]
修复密码锁通过蓝牙解锁进行状态同步

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Wed, 28 Aug 2024 10:23:05 +0000 (18:23 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago1.AI语音关于取消当前对话逻辑修改,添加AI回应类型枚举(后续会配合使用)
luozheng [Wed, 28 Aug 2024 10:22:57 +0000 (18:22 +0800)]
1.AI语音关于取消当前对话逻辑修改,添加AI回应类型枚举(后续会配合使用)

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
Caisking [Wed, 28 Aug 2024 10:20:14 +0000 (18:20 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 812/1 812/head 813/target/1 814/target/1 815/target/1 816/target/1
SnickerSun [Wed, 28 Aug 2024 08:54:46 +0000 (16:54 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #810 into sdk602patch0626 from refs/changes/810/head 812/target/1
snickersun@163.com [Wed, 28 Aug 2024 08:58:51 +0000 (08:58 +0000)]
Merge #810 into sdk602patch0626 from refs/changes/810/head

release V1.1.38

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

  - release V1.1.38

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/810
2 years ago优化ble发送数据代码结构解决可能出现刚好满mtu导致发送空包问题,已经可能存在参数过多导致的安全隐患(补2 ) 811/1 811/head
hcj [Wed, 28 Aug 2024 08:54:33 +0000 (16:54 +0800)]
优化ble发送数据代码结构解决可能出现刚好满mtu导致发送空包问题,已经可能存在参数过多导致的安全隐患(补2 )

2 years agorelease V1.1.38 810/1 810/head
SnickerSun [Wed, 28 Aug 2024 08:45:57 +0000 (16:45 +0800)]
release V1.1.38

2 years ago优化ble发送数据代码结构解决可能出现刚好满mtu导致发送空包问题,已经可能存在参数过多导致的安全隐患(补 ) 809/2 809/head 810/target/1 811/target/1
hcj [Wed, 28 Aug 2024 08:40:16 +0000 (16:40 +0800)]
优化ble发送数据代码结构解决可能出现刚好满mtu导致发送空包问题,已经可能存在参数过多导致的安全隐患(补 )

2 years ago优化ble发送数据代码结构解决可能出现刚好满mtu导致发送空包问题,已经可能存在参数过多导致的安全隐患 809/1
hcj [Wed, 28 Aug 2024 07:53:32 +0000 (15:53 +0800)]
优化ble发送数据代码结构解决可能出现刚好满mtu导致发送空包问题,已经可能存在参数过多导致的安全隐患

2 years ago录音完成进度条更新
luozheng [Wed, 28 Aug 2024 07:50:53 +0000 (15:50 +0800)]
录音完成进度条更新

2 years agoMerge branches 'sdk602patch0626' and 'sdk602patch0626' of https://codeup.aliyun.com...
luozheng [Wed, 28 Aug 2024 03:08:42 +0000 (11:08 +0800)]
Merge branches 'sdk602patch0626' and 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #807 into sdk602patch0626 from refs/changes/807/head 809/target/1
袁清梦 [Wed, 28 Aug 2024 02:55:53 +0000 (02:55 +0000)]
Merge #807 into sdk602patch0626 from refs/changes/807/head

屏蔽KeyInputListener里面的不使用功能

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

  - 屏蔽KeyInputListener里面的不使用功能

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/807
2 years ago增加睡眠模式;更新睡眠模式判定接口 808/1 808/head
cheng [Tue, 27 Aug 2024 12:35:05 +0000 (20:35 +0800)]
增加睡眠模式;更新睡眠模式判定接口

2 years ago屏蔽KeyInputListener里面的不使用功能 807/1 807/head
Caisking [Tue, 27 Aug 2024 11:49:03 +0000 (19:49 +0800)]
屏蔽KeyInputListener里面的不使用功能

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Tue, 27 Aug 2024 11:17:36 +0000 (19:17 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 806/1 806/head 807/target/1 808/target/1
Caisking [Tue, 27 Aug 2024 11:12:26 +0000 (19:12 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago同步倒计时UI更新:1;更新picker选择的字体以及颜色;2.增加结束倒计时图标以及相关UI更新
Caisking [Tue, 27 Aug 2024 11:12:12 +0000 (19:12 +0800)]
同步倒计时UI更新:1;更新picker选择的字体以及颜色;2.增加结束倒计时图标以及相关UI更新

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 805/1 805/head 806/target/1
hcj [Tue, 27 Aug 2024 10:16:44 +0000 (18:16 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into 0626

2 years ago适配多国语言每日活动
hcj [Tue, 27 Aug 2024 10:16:35 +0000 (18:16 +0800)]
适配多国语言每日活动

2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...
luozheng [Tue, 27 Aug 2024 10:12:37 +0000 (18:12 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years agoMerge #789 into sdk602patch0626 from refs/changes/789/head 805/target/1
罗正 [Tue, 27 Aug 2024 10:11:48 +0000 (10:11 +0000)]
Merge #789 into sdk602patch0626 from refs/changes/789/head

Code review from 罗正

* refs/changes/789/head: (21 commits squashed)

  - 更改下拉蓝牙图标
    添加睡眠图标更新函数,还未适配接口等待联调

  - 1.修复applist心率图标大小不一致问题,修复卡片管理图片为透明背景
    2.将applist中勿扰,卡片管理,更换表盘,省电模式移动到setting

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

  - 添加按键拦截功能(目前只在function键双击添加),若intercept_slice_ids数组中有给定的VIEWID则不触发该事件

  - 修复设置视图死机问题

  - 语言界面第一次启动逻辑修改

  - 录音界面修改

  - 解决指南针Slice内存泄漏

  - 修复勿扰模式Slice图标消失问题

  - 修复a2dp连接时候音乐播放器界面刷新死机问题

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

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

  - ConfigModel中取消保存系统音量和通话音量

  - 解决点击4G开关点击死机问题

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

  - 1.下拉菜单添加更新蓝牙,4G图标状态函数
    2.开启和关闭蓝牙和4G和勿扰操作类似,都为未开启进入视图开启,关闭则可直接快捷关闭

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

  - 解决在产测界面拦截不了按键双击问题

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

  - 实现开关机录音保存显示录音时间

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

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/789
2 years agoMerge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 789/4 789/head
luozheng [Tue, 27 Aug 2024 09:59:51 +0000 (17:59 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

2 years ago实现开关机录音保存显示录音时间
luozheng [Tue, 27 Aug 2024 09:59:45 +0000 (17:59 +0800)]
实现开关机录音保存显示录音时间

2 years agoMerge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230... 803/2 803/head
cheng [Tue, 27 Aug 2024 09:57:25 +0000 (17:57 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into sdk602patch0626