From 6523515ebfb7da1af905bf436f57486f1de0a023 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E7=BD=97=E6=AD=A3?= <1732036298@qq.com> Date: Sat, 27 Apr 2024 10:20:11 +0000 Subject: [PATCH] Merge #101 into xts_origin from refs/changes/101/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 罗正 * refs/changes/101/head: (4 commits squashed) - 通过设置拦截函数优化连接状态视图的退出逻辑 - Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin - Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into xts_origin - 修复下拉时间不更新问题 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/101 --- .../fd230app/nativeui/main/src/ConnectedStatusView.cpp | 9 ++++++--- .../fd230app/nativeui/main/src/MainPresenterSample.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/ConnectedStatusView.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/ConnectedStatusView.cpp index 96f44035d..4ea6fbdde 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/ConnectedStatusView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/ConnectedStatusView.cpp @@ -38,13 +38,13 @@ namespace OHOS for (int i = 0; i < MAX_CONNECTEDSTATUS_ID; i++) { delete background[i]; - background[i]; + background[i] = nullptr; delete PhoneAndEarAndBluetooth[i]; - PhoneAndEarAndBluetooth[i]; + PhoneAndEarAndBluetooth[i] = nullptr; delete ConnectedStatusLabel[i]; - ConnectedStatusLabel[i]; + ConnectedStatusLabel[i] = nullptr; } delete PhoneConnectedStatusImage; @@ -145,6 +145,9 @@ namespace OHOS } group->SetPosition(0, 0, 466, 466); group->SetViewIndex(1); + group->SetTouchable(true); + group->SetDraggable(true); + group->SetIntercept(true); /* -------------------------------------------------------------------------- */ LabelConfig titleConfig = {93, 53, 280, 35, 30, 35, "连接状态"}; Title = InitLabel(titleConfig); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp index fd2cb8c45..f5abf577e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp @@ -252,7 +252,12 @@ namespace OHOS void MainPresenterSample::OnSwipe(UISwipeView &view) { - UNUSED(view); + //UNUSED(view); + if(MainViewSample::GetInstance()->IsPullUpViewPage()) + { + UpdataBaseData(); + } + CardId cardId = view_->GetHorCurrentCard(); callback_->OnSwipe(view); SetTaskPeroid(cardId); -- 2.17.1