Merge #101 into xts_origin from refs/changes/101/head

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 <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/101

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 96f4403..4ea6fbd 100644 (file)
--- 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 fd2cb8c..f5abf57 100644 (file)
--- 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);