From 704f7ed5c76ad679000bfbe01b7613790135d192 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E7=BD=97=E6=AD=A3?= <1732036298@qq.com> Date: Mon, 2 Sep 2024 12:48:55 +0000 Subject: [PATCH] Merge #857 into sdk602patch0626 from refs/changes/857/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/857 --- .../service/msg_center/src/notify/pairing_notification.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp index 054bc06a3..f6b41db73 100644 --- a/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-22 10:04:36 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-09-02 17:27:00 + * @LastEditTime: 2024-09-02 20:03:45 * @FilePath: /FD230/code/sdk/application/wearable/service/msg_center/src/notify/pairing_notification.cpp */ #include "notification_manager.h" @@ -292,6 +292,7 @@ namespace OHOS DeviceBindingAnimatorView->SetAutoEnable(false); DeviceBindingAnimatorView->SetResizeMode(UIImageAnimatorView::CENTER); DeviceBindingAnimatorView->Start(); + DeviceBindingAnimatorView->SetSizeFixed(true); } /* ---------------------------- DeviceBindingName --------------------------- */ if (DeviceBindingName == nullptr) @@ -433,6 +434,7 @@ namespace OHOS DeviceUnBindingAnimatorView->SetStyle(STYLE_BACKGROUND_OPA, 0xff); DeviceUnBindingAnimatorView->SetImageAnimatorSrc(UnBindImageInfo, UNBIND_IMAGE_ANIMATOR_VIEW_NUM_FRAMES, UNBIND_IMAGE_ANIMATOR_VIEW_TIMEOFUPDATE); DeviceUnBindingAnimatorView->SetRepeat(true); + DeviceUnBindingAnimatorView->SetSizeFixed(true); DeviceUnBindingAnimatorView->Start(); } /* ----------------------- DeviceUnBindingViewTitleLabel ---------------------- */ -- 2.17.1