penglei [Tue, 3 Sep 2024 10:19:41 +0000 (18:19 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
penglei [Tue, 3 Sep 2024 10:19:29 +0000 (18:19 +0800)]
修复BUG #551 "运动，放桌子上不动，卡路里会增加"
Caisking [Tue, 3 Sep 2024 09:35:37 +0000 (17:35 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Tue, 3 Sep 2024 09:34:52 +0000 (17:34 +0800)]
增加previousCardId成员变量；增加心率卡片到其他Slice关闭心率检测
penglei [Tue, 3 Sep 2024 09:17:45 +0000 (17:17 +0800)]
重命名MMC5603为CUSTOM_MMC5603 解决与DML新版本库编译冲突问题。(补)
penglei [Tue, 3 Sep 2024 08:44:49 +0000 (16:44 +0800)]
更新cywee dml 版本为2.20.0.0 。
重命名MMC5603为CUSTOM_MMC5603 解决与DML新版本库编译冲突问题。
Caisking [Tue, 3 Sep 2024 08:40:58 +0000 (16:40 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Tue, 3 Sep 2024 08:40:10 +0000 (16:40 +0800)]
优化主界面card管理；增加睡眠card回退索引
Caisking [Tue, 3 Sep 2024 08:39:33 +0000 (16:39 +0800)]
优化睡眠card处理
penglei [Tue, 3 Sep 2024 08:20:46 +0000 (16:20 +0800)]
修改睡眠状态存储数组长度为50，添加AT指令打印睡眠存储信息
about watch 添加cywee算法版本
penglei [Tue, 3 Sep 2024 06:24:33 +0000 (14:24 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Tue, 3 Sep 2024 03:39:22 +0000 (11:39 +0800)]
增加key事件监控打印
hcj [Tue, 3 Sep 2024 03:12:28 +0000 (11:12 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Tue, 3 Sep 2024 03:12:03 +0000 (11:12 +0800)]
修复#567
Caisking [Tue, 3 Sep 2024 02:20:04 +0000 (10:20 +0800)]
屏蔽睡眠时间戳为0的数据不做字符串处理
Caisking [Tue, 3 Sep 2024 02:05:07 +0000 (10:05 +0800)]
修复睡眠进度条显示异常
Caisking [Tue, 3 Sep 2024 01:58:04 +0000 (09:58 +0800)]
修复下拉电池框与自定义表盘电池框显示
penglei [Tue, 3 Sep 2024 01:21:29 +0000 (09:21 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Mon, 2 Sep 2024 12:56:08 +0000 (20:56 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Mon, 2 Sep 2024 12:54:53 +0000 (20:54 +0800)]
时间变更，同时更新 NEXTDAY alarm。防止消息不正确造成的午夜计步重置失效。
SnickerSun [Mon, 2 Sep 2024 12:49:34 +0000 (20:49 +0800)]
release V1.1.40
罗正 [Mon, 2 Sep 2024 12:48:55 +0000 (12:48 +0000)]
Merge #857 into sdk602patch0626 from refs/changes/857/head
Code review from 罗正
* refs/changes/857/head: (27 commits squashed)
- 秒表界面计数条数去掉数字0
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 1.倒计时界面取消长亮屏，并在倒计时结束时添加一个亮屏5s操作
2.优化自定义倒计时时间总时长文字不居中
- 解决闹钟界面右滑容易退出问题
- 补交闹钟少提交文件
- 倒计时界面使用%02d解决计数少于两位数补零
- 闹钟退出逻辑改为OnDragEnd
- 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
- 修复下拉界面关闭4g开关，而4G开关界面中没有同步关闭问题 #406
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 天气动画改为Imageinfo保存和释放
- AI语音优化修改：
1.动画改为imageinfo创建和释放改善内存泄漏
2.添加对应回应类型的错误弹窗
- 查找手机和配对动画改成Imageinfo减少内存泄漏
- 开机动画使用Imageinfo创建和释放，解决动画内存泄漏
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 查找手机界面屏蔽未连接界面，与figma上设计统一
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 查找手机界面UI优化，解决内存泄漏
- 录音界面添加录音超出限制提醒弹窗,录音排序待优化
- 绑定动画资源添加
- 配对弹窗优化，添加一个动画，并适配多国语言
- 解绑弹窗UI优化修改，适配多国语言
- 解绑确认弹窗添加，并添加对应多国语言资源
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 通过设置图像大小为固定为视图大小。解决在拖动scrolView过程中动画上下移动问题
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/857
Caisking [Mon, 2 Sep 2024 12:15:01 +0000 (20:15 +0800)]
#561手表，未绑定时，放置在不平整的面上，心率测量灯也会定期测量，
Caisking [Mon, 2 Sep 2024 11:48:27 +0000 (19:48 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Mon, 2 Sep 2024 11:42:23 +0000 (19:42 +0800)]
修复bug#331 隔天计步不清零
Caisking [Mon, 2 Sep 2024 11:41:56 +0000 (19:41 +0800)]
关闭消息index打印
Caisking [Mon, 2 Sep 2024 11:37:47 +0000 (19:37 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Mon, 2 Sep 2024 11:37:39 +0000 (19:37 +0800)]
#461 表盘，消息红点提示下面有遮挡，未显示全
Caisking [Mon, 2 Sep 2024 10:55:06 +0000 (18:55 +0800)]
#594 APP iOS 表盘下载安装后，已安装表盘只显示默认五个表盘
Caisking [Mon, 2 Sep 2024 10:48:05 +0000 (18:48 +0800)]
#191KUMU表盘，时间显示不居中;#461表盘，消息红点提示下面有遮挡，未显示全
胡传军 [Mon, 2 Sep 2024 10:32:24 +0000 (10:32 +0000)]
Merge #853 into sdk602patch0626 from refs/changes/853/head
Code review from 胡传军
* refs/changes/853/head: (6 commits squashed)
- 修改动画出现的内存泄漏
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
- 修改拨打电话，通讯录，UI显示
- 修复#487 #485 #520 #498 #496
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/853
程羽飞 [Mon, 2 Sep 2024 10:30:39 +0000 (10:30 +0000)]
Merge #851 into sdk602patch0626 from refs/changes/851/head
闹钟增加点击时间进入编辑和左滑按钮删除功能
* refs/changes/851/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/851
罗正 [Mon, 2 Sep 2024 10:25:59 +0000 (10:25 +0000)]
Merge #854 into sdk602patch0626 from refs/changes/854/head
Code review from 罗正
* refs/changes/854/head: (25 commits squashed)
- 秒表界面计数条数去掉数字0
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 1.倒计时界面取消长亮屏，并在倒计时结束时添加一个亮屏5s操作
2.优化自定义倒计时时间总时长文字不居中
- 解决闹钟界面右滑容易退出问题
- 补交闹钟少提交文件
- 倒计时界面使用%02d解决计数少于两位数补零
- 闹钟退出逻辑改为OnDragEnd
- 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
- 修复下拉界面关闭4g开关，而4G开关界面中没有同步关闭问题 #406
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 天气动画改为Imageinfo保存和释放
- AI语音优化修改：
1.动画改为imageinfo创建和释放改善内存泄漏
2.添加对应回应类型的错误弹窗
- 查找手机和配对动画改成Imageinfo减少内存泄漏
- 开机动画使用Imageinfo创建和释放，解决动画内存泄漏
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 查找手机界面屏蔽未连接界面，与figma上设计统一
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 查找手机界面UI优化，解决内存泄漏
- 录音界面添加录音超出限制提醒弹窗,录音排序待优化
- 绑定动画资源添加
- 配对弹窗优化，添加一个动画，并适配多国语言
- 解绑弹窗UI优化修改，适配多国语言
- 解绑确认弹窗添加，并添加对应多国语言资源
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/854
Caisking [Mon, 2 Sep 2024 10:04:51 +0000 (18:04 +0800)]
调整电池资源文件；增加黑色电池框
hcj [Mon, 2 Sep 2024 09:38:00 +0000 (17:38 +0800)]
修复#487 #485 #520 #498 #496
hcj [Mon, 2 Sep 2024 09:34:01 +0000 (17:34 +0800)]
修改拨打电话，通讯录，UI显示
Caisking [Mon, 2 Sep 2024 08:58:50 +0000 (16:58 +0800)]
修复自定义表盘读取配置异常bug
Caisking [Mon, 2 Sep 2024 08:58:19 +0000 (16:58 +0800)]
修复密码锁icon显示不透明
Caisking [Mon, 2 Sep 2024 07:25:19 +0000 (15:25 +0800)]
屏蔽训练中的佩戴检测；减少训练卡顿
SnickerSun [Mon, 2 Sep 2024 06:56:07 +0000 (14:56 +0800)]
移动、电信入库软件要求 版本号固定
Caisking [Sat, 31 Aug 2024 09:51:11 +0000 (17:51 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Sat, 31 Aug 2024 09:51:05 +0000 (17:51 +0800)]
增加滚动式label初始化
hcj [Sat, 31 Aug 2024 09:36:27 +0000 (17:36 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
penglei [Sat, 31 Aug 2024 09:28:56 +0000 (17:28 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Sat, 31 Aug 2024 09:25:57 +0000 (17:25 +0800)]
release V1.1.39
Caisking [Sat, 31 Aug 2024 09:24:00 +0000 (17:24 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
hcj [Sat, 31 Aug 2024 09:23:51 +0000 (17:23 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
袁清梦 [Sat, 31 Aug 2024 09:21:48 +0000 (09:21 +0000)]
Merge #849 into sdk602patch0626 from refs/changes/849/head
Code review from 袁清梦
* refs/changes/849/head: (2 commits squashed)
- 屏蔽部分语言 保留了韩语
- 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/849
彭磊 [Sat, 31 Aug 2024 09:20:59 +0000 (09:20 +0000)]
Merge #847 into sdk602patch0626 from refs/changes/847/head
优化离线语音助手内存泄漏
* refs/changes/847/head: (2 commits squashed)
- 优化离线语音助手内存泄漏
- 修复BUG 550 “运动，心率显示，刚开始每次心率都是一样的，实际心率灯没测量 ，将绝对静止判断时间调整为90分钟
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/847
罗正 [Sat, 31 Aug 2024 09:19:32 +0000 (09:19 +0000)]
Merge #848 into sdk602patch0626 from refs/changes/848/head
Code review from 罗正
* refs/changes/848/head: (16 commits squashed)
- 秒表界面计数条数去掉数字0
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 1.倒计时界面取消长亮屏，并在倒计时结束时添加一个亮屏5s操作
2.优化自定义倒计时时间总时长文字不居中
- 解决闹钟界面右滑容易退出问题
- 补交闹钟少提交文件
- 倒计时界面使用%02d解决计数少于两位数补零
- 闹钟退出逻辑改为OnDragEnd
- 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
- 修复下拉界面关闭4g开关，而4G开关界面中没有同步关闭问题 #406
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 天气动画改为Imageinfo保存和释放
- AI语音优化修改：
1.动画改为imageinfo创建和释放改善内存泄漏
2.添加对应回应类型的错误弹窗
- 查找手机和配对动画改成Imageinfo减少内存泄漏
- 开机动画使用Imageinfo创建和释放，解决动画内存泄漏
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/848
Caisking [Sat, 31 Aug 2024 09:18:52 +0000 (17:18 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Sat, 31 Aug 2024 09:18:46 +0000 (17:18 +0800)]
屏蔽部分语言 保留了韩语
胡传军 [Sat, 31 Aug 2024 09:17:00 +0000 (09:17 +0000)]
Merge #845 into sdk602patch0626 from refs/changes/845/head
Code review from 胡传军
* refs/changes/845/head: (2 commits squashed)
- 修改动画出现的内存泄漏
- Merge branch 'sdk602patch0626' 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/845
penglei [Sat, 31 Aug 2024 09:07:12 +0000 (17:07 +0800)]
修复BUG 550 “运动，心率显示，刚开始每次心率都是一样的，实际心率灯没测量 ，将绝对静止判断时间调整为90分钟
Caisking [Sat, 31 Aug 2024 08:34:15 +0000 (16:34 +0800)]
#550 修复训练数据中的测试数据
Caisking [Sat, 31 Aug 2024 08:30:08 +0000 (16:30 +0800)]
使用LoadSingleRes与UnloadSingleRes进行动画资源加载释放
penglei [Sat, 31 Aug 2024 08:13:44 +0000 (16:13 +0800)]
优化离线语音助手内存泄漏
Caisking [Sat, 31 Aug 2024 07:24:31 +0000 (15:24 +0800)]
修复训练动画的内存泄漏
Caisking [Sat, 31 Aug 2024 07:24:12 +0000 (15:24 +0800)]
修复遥控拍照动画的内存泄漏
Caisking [Sat, 31 Aug 2024 07:22:46 +0000 (15:22 +0800)]
修复睡眠进度条与实际不一致的bug
Caisking [Sat, 31 Aug 2024 07:22:01 +0000 (15:22 +0800)]
增加通用的配置结构体函数。增加释放imageinfo相关接口
hcj [Sat, 31 Aug 2024 07:21:48 +0000 (15:21 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Sat, 31 Aug 2024 07:21:10 +0000 (15:21 +0800)]
修改动画出现的内存泄漏
penglei [Sat, 31 Aug 2024 02:04:53 +0000 (10:04 +0800)]
关闭mem_check 宏
hcj [Sat, 31 Aug 2024 01:45:43 +0000 (09:45 +0800)]
增加新方法直接生成imageinfo* 数组
hcj [Sat, 31 Aug 2024 01:43:06 +0000 (09:43 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
penglei [Fri, 30 Aug 2024 13:36:50 +0000 (21:36 +0800)]
补交
penglei [Fri, 30 Aug 2024 13:31:32 +0000 (21:31 +0800)]
修改添加密钥AT指令,优化新算法兼容
penglei [Fri, 30 Aug 2024 13:09:13 +0000 (21:09 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
penglei [Fri, 30 Aug 2024 13:08:59 +0000 (21:08 +0800)]
更新cywee算法，添加MAC地址密钥激活方式，优化睡眠模式佩戴检测(补交)
SnickerSun [Fri, 30 Aug 2024 12:56:19 +0000 (20:56 +0800)]
暂时取消 norflash_trace_ norflash_exc_的生成，因为海思不能提供分析工具
SnickerSun [Fri, 30 Aug 2024 12:55:28 +0000 (20:55 +0800)]
添加多国语言字体切换逻辑，逻辑可用，字体还不完整
penglei [Fri, 30 Aug 2024 12:53:40 +0000 (20:53 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
penglei [Fri, 30 Aug 2024 12:53:11 +0000 (20:53 +0800)]
更新cywee算法，添加MAC地址密钥激活方式，优化睡眠模式佩戴检测
hcj [Fri, 30 Aug 2024 12:09:41 +0000 (20:09 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Fri, 30 Aug 2024 12:09:20 +0000 (20:09 +0800)]
保留通话按键调节音量功能，加大条件限制（ 补2）
Caisking [Fri, 30 Aug 2024 12:09:03 +0000 (20:09 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Fri, 30 Aug 2024 12:08:56 +0000 (20:08 +0800)]
心率动画屏蔽取消
罗正 [Fri, 30 Aug 2024 12:08:27 +0000 (12:08 +0000)]
Merge #830 into sdk602patch0626 from refs/changes/830/head
Code review from 罗正
* refs/changes/830/head: (9 commits squashed)
- 秒表界面计数条数去掉数字0
- Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
- 1.倒计时界面取消长亮屏，并在倒计时结束时添加一个亮屏5s操作
2.优化自定义倒计时时间总时长文字不居中
- 解决闹钟界面右滑容易退出问题
- 补交闹钟少提交文件
- 倒计时界面使用%02d解决计数少于两位数补零
- 闹钟退出逻辑改为OnDragEnd
- 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: 罗正 <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/830
Caisking [Fri, 30 Aug 2024 12:01:23 +0000 (20:01 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Fri, 30 Aug 2024 12:01:17 +0000 (20:01 +0800)]
统一动画数组生成以及释放函数。
SnickerSun [Fri, 30 Aug 2024 11:56:43 +0000 (19:56 +0800)]
Merge branch 'sdk602patch0626' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
SnickerSun [Fri, 30 Aug 2024 11:56:34 +0000 (19:56 +0800)]
更新language_tool脚本，添加和修改多国语言项，改为在language_custom.xlsx中修改，执行make_language.sh即可
hcj [Fri, 30 Aug 2024 11:54:57 +0000 (19:54 +0800)]
保留通话按键调节音量功能，加大条件限制(补)
hcj [Fri, 30 Aug 2024 11:49:08 +0000 (19:49 +0800)]
保留通话按键调节音量功能，加大条件限制
Caisking [Fri, 30 Aug 2024 11:31:35 +0000 (19:31 +0800)]
修复错误的if语句
Caisking [Fri, 30 Aug 2024 10:47:17 +0000 (18:47 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
DXY [Fri, 30 Aug 2024 10:31:28 +0000 (18:31 +0800)]
优化移动入库开关机逻辑
DXY [Fri, 30 Aug 2024 10:06:26 +0000 (18:06 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
袁清梦 [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
DXY [Fri, 30 Aug 2024 10:03:49 +0000 (18:03 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
DXY [Fri, 30 Aug 2024 10:03:40 +0000 (18:03 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
Caisking [Fri, 30 Aug 2024 09:57:38 +0000 (17:57 +0800)]
屏蔽KeyInputListener功能键没有使用到的功能
Caisking [Fri, 30 Aug 2024 09:48:25 +0000 (17:48 +0800)]
优化睡眠数据计算。优化数据显示
Caisking [Fri, 30 Aug 2024 09:22:52 +0000 (17:22 +0800)]
修改时间分钟个位获取的错误
hcj [Fri, 30 Aug 2024 08:36:34 +0000 (16:36 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into 0626
hcj [Fri, 30 Aug 2024 08:36:19 +0000 (16:36 +0800)]
优化活动界面内存泄漏
Caisking [Fri, 30 Aug 2024 08:35:40 +0000 (16:35 +0800)]
更新黑耀表盘资源文件
Caisking [Fri, 30 Aug 2024 08:35:26 +0000 (16:35 +0800)]
更新表盘制作脚本以及说明文档
Caisking [Fri, 30 Aug 2024 06:54:37 +0000 (14:54 +0800)]
Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into sdk602patch0626
projects / mirrors / FD230.git / log