!65 fix view group add child error issue

Merge pull request !65 from pssea/master

frameworks/components/ui_view_group.cpp

@@ -16,12 +16,18 @@
 #include "components/ui_view_group.h"
 
 #include <cstring>
+
 #include "components/root_view.h"
+#include "gfx_utils/graphic_log.h"
 
 namespace OHOS {
 UIViewGroup::UIViewGroup()
-    : childrenHead_(nullptr), childrenTail_(nullptr), childrenNum_(0),
-      isDragging_(false), disallowIntercept_(false), isAutoSize_(false)
+    : childrenHead_(nullptr),
+      childrenTail_(nullptr),
+      childrenNum_(0),
+      isDragging_(false),
+      disallowIntercept_(false),
+      isAutoSize_(false)
 {
     isViewGroup_ = true;
 #if ENABLE_FOCUS_MANAGER
@@ -34,21 +40,19 @@ UIViewGroup::~UIViewGroup() {}
 void UIViewGroup::Add(UIView* view)
 {
     if ((view == this) || (view == nullptr)) {
+        GRAPHIC_LOGE("view can not be nullptr and added to self");
+        ASSERT(0);
+        return;
+    }
+    if (view->GetParent() != nullptr) {
+        GRAPHIC_LOGE("can not add view multi times");
+        ASSERT(0);
         return;
     }
+
     if (childrenHead_ == nullptr) {
         childrenHead_ = view;
     } else {
-        UIView* head = childrenHead_;
-        while (head != nullptr) {
-            if ((view == head) ||
-                ((view->GetViewId() != nullptr) &&
-                (head->GetViewId() != nullptr) &&
-                !strcmp(view->GetViewId(), head->GetViewId()))) {
-                return;
-            }
-            head = head->GetNextSibling();
-        }
 
         if (childrenTail_ == nullptr) {
             return;
@@ -67,23 +71,23 @@ void UIViewGroup::Add(UIView* view)
 
 void UIViewGroup::Insert(UIView* prevView, UIView* insertView)
 {
-    if (insertView == nullptr) {
+    if ((insertView == nullptr) || (insertView == this)) {
+        GRAPHIC_LOGE("insertView can not be nullptr and insert to self");
+        ASSERT(0);
+        return;
+    }
+
+    if (insertView->GetParent() != nullptr) {
+        GRAPHIC_LOGE("can not insert view multi times");
+        ASSERT(0);
         return;
     }
+
     if (childrenHead_ == nullptr) {
         Add(insertView);
         return;
     }
-    UIView* head = childrenHead_;
-    while (head != nullptr) {
-        if ((insertView == head) ||
-            ((insertView->GetViewId() != nullptr) &&
-            (head->GetViewId() != nullptr) &&
-            !strcmp(insertView->GetViewId(), head->GetViewId()))) {
-            return;
-        }
-        head = head->GetNextSibling();
-    }
+
     if (prevView == nullptr) {
         insertView->SetNextSibling(childrenHead_);
         insertView->SetParent(this);

interfaces/kits/components/ui_view_group.h

@@ -252,7 +252,7 @@ protected:
      * @since 1.0
      * @version 1.0
      */
-    virtual void OnChildChanged() {};
+    virtual void OnChildChanged() {}
 
     /**
      * @brief Indicates the pointer to the first child view of this view group.

test/framework/BUILD.gn

@@ -53,6 +53,7 @@ static_library("framework") {
     "../uitest/test_ui_swipe_view/ui_test_ui_swipe_view.cpp",
     "../uitest/test_vector_font/ui_test_vector_font.cpp",
     "../uitest/test_video/ui_test_video.cpp",
+    "../uitest/test_view_group/ui_test_view_group.cpp",
     "../uitest/test_view_percent/ui_test_view_percent.cpp",
     "../uitest/test_view_scale_rotate/ui_test_view_scale_rotate.cpp",
     "src/test_ability.cpp",

test/framework/src/ui_test_group.cpp

@@ -14,6 +14,7 @@
  */
 
 #include "ui_test_group.h"
+
 #include "graphic_config.h"
 #include "test_animator/ui_test_animator.h"
 #include "test_anti_aliasing/ui_test_anti_aliasing.h"
@@ -60,6 +61,7 @@
 #include "test_ui_list_view/ui_test_list_layout.h"
 #include "test_ui_scroll_view/ui_test_ui_scroll_view.h"
 #include "test_ui_swipe_view/ui_test_ui_swipe_view.h"
+#include "test_view_group/ui_test_view_group.h"
 #include "test_view_percent/ui_test_view_percent.h"
 #include "test_view_scale_rotate/ui_test_view_scale_rotate.h"
 #if ENABLE_VECTOR_FONT
@@ -130,6 +132,7 @@ void UITestGroup::SetUpTestCase()
     testCaseList_.PushBack(TestCaseInfo{"Transform", new UITestTransform()});
     testCaseList_.PushBack(TestCaseInfo{"Opacity", new UITestOpacity()});
     testCaseList_.PushBack(TestCaseInfo{"UIQrcode", new UITestQrcode()});
+    testCaseList_.PushBack(TestCaseInfo{"UIViewGroup", new UITestViewGroup()});
 #ifndef VERSION_LITE
     testCaseList_.PushBack(TestCaseInfo{"Video", new UITestVideo()});
 #endif

test/uitest/test_render/ui_test_render.cpp

@@ -14,6 +14,7 @@
  */
 
 #include "ui_test_render.h"
+
 #include "common/screen.h"
 
 namespace OHOS {
@@ -118,7 +119,6 @@ void UITestRender::UIKit_Render_Test_RenderMeasure_001()
     // 2: half of screen width
     label->Resize(Screen::GetInstance().GetWidth() / 2, TITLE_LABEL_DEFAULT_HEIGHT);
     label->SetText("UIKit绘制Measure效果:");
-    group->Add(label);
 
     testLabel_ = new UILabel();
     group->Add(testLabel_);

test/uitest/test_view_group/ui_test_view_group.cpp

+/*
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "ui_test_view_group.h"
+
+#include "common/screen.h"
+
+namespace OHOS {
+void UITestViewGroup::SetUp()
+{
+    if (container_ == nullptr) {
+        container_ = new UIScrollView();
+        container_->Resize(Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight() - BACK_BUTTON_HEIGHT);
+    }
+}
+
+void UITestViewGroup::TearDown()
+{
+    DeleteChildren(container_);
+    container_ = nullptr;
+}
+
+UIView* UITestViewGroup::GetTestView()
+{
+    UIKit_ViewGroup_Test_AddRemove_001();
+    UIKit_ViewGroup_Test_Add_Error_001();
+    UIKit_ViewGroup_Test_Insert_Error_001();
+    return container_;
+}
+
+UIViewGroup* UITestViewGroup::CreateTestCaseGroup() const
+{
+    UIViewGroup* group = new UIViewGroup();
+    group->Resize(Screen::GetInstance().GetWidth(), 200); // 200: height
+    return group;
+}
+
+UILabel* UITestViewGroup::CreateTitleLabel() const
+{
+    UILabel* label = new UILabel();
+    // 300: label width
+    label->SetPosition(TEXT_DISTANCE_TO_LEFT_SIDE, TEXT_DISTANCE_TO_TOP_SIDE, 300, TITLE_LABEL_DEFAULT_HEIGHT);
+    label->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);
+
+    return label;
+}
+
+UILabelButton* UITestViewGroup::CreateButton(const char* text, int16_t width, int16_t height) const
+{
+    UILabelButton* button = new UILabelButton();
+    button->Resize(width, height);
+    button->SetText(text);
+    button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);
+    button->SetStyleForState(STYLE_BORDER_RADIUS, BUTTON_STYLE_BORDER_RADIUS_VALUE, UIButton::RELEASED);
+    button->SetStyleForState(STYLE_BORDER_RADIUS, BUTTON_STYLE_BORDER_RADIUS_VALUE, UIButton::PRESSED);
+    button->SetStyleForState(STYLE_BACKGROUND_COLOR, BUTTON_STYLE_BACKGROUND_COLOR_VALUE, UIButton::RELEASED);
+    button->SetStyleForState(STYLE_BACKGROUND_COLOR, BUTTON_STYLE_BACKGROUND_COLOR_PRESS, UIButton::PRESSED);
+
+    return button;
+}
+
+void UITestViewGroup::UIKit_ViewGroup_Test_AddRemove_001()
+{
+    if (container_ == nullptr) {
+        return;
+    }
+
+    UIViewGroup* group = CreateTestCaseGroup();
+    group->SetViewId("UIKit_ViewGroup_Test_AddRemove_001");
+    group->SetPosition(0, 0);
+
+    UILabel* label = CreateTitleLabel();
+    group->Add(label);
+    label->SetText("UIViewGroup 添加/删除组件:");
+    label->SetViewId("label_text");
+
+    addBtn_ = CreateButton("添加View", 150, 40); // 150: width 40:height
+    group->Add(addBtn_);
+    addBtn_->SetOnClickListener(this);
+    addBtn_->SetViewId("addBtn");
+    addBtn_->LayoutBottomOfParent();
+    addBtn_->LayoutLeftOfParent(10); // 10: offset
+
+    removeBtn_ = CreateButton("删除View", 150, 40); // 150: width 40:height
+    group->Add(removeBtn_);
+    removeBtn_->SetOnClickListener(this);
+    removeBtn_->SetViewId("removeBtn");
+    removeBtn_->LayoutBottomOfParent();
+    removeBtn_->LayoutRightToSibling("addBtn", 10); // 10: offset
+
+    removeAddBtn_ = CreateButton("删除再添加View", 160, 40); // 160: width 40:height
+    group->Add(removeAddBtn_);
+    removeAddBtn_->SetOnClickListener(this);
+    removeAddBtn_->SetViewId("removeAddBtn");
+    removeAddBtn_->LayoutBottomOfParent();
+    removeAddBtn_->LayoutRightToSibling("removeBtn", 10); // 10: offset
+
+    container_->Add(group);
+}
+
+void UITestViewGroup::UIKit_ViewGroup_Test_Add_Error_001()
+{
+    if (container_ == nullptr) {
+        return;
+    }
+
+    UIViewGroup* group = CreateTestCaseGroup();
+    group->SetViewId("UIKit_ViewGroup_Test_Add_Error_001");
+    container_->Add(group);
+
+    UILabel* label = CreateTitleLabel();
+    group->Add(label);
+    // 2: half of screen width
+    label->Resize(Screen::GetInstance().GetWidth() / 2, TITLE_LABEL_DEFAULT_HEIGHT);
+    label->SetText("测试重复添加子组件问题:");
+
+    addTwiceBtn_ = CreateButton("重复add", 150, 40); // 150: width 40:height
+    group->Add(addTwiceBtn_);
+    addTwiceBtn_->SetViewId("addTwiceBtn");
+    addTwiceBtn_->SetOnClickListener(this);
+    addTwiceBtn_->LayoutCenterOfParent();
+    addTwiceBtn_->LayoutLeftOfParent(10); // 10: offset
+
+    addMultiParentBtn_ = CreateButton("add到不同父节点", 200, 40); // 200: width 40:height
+    group->Add(addMultiParentBtn_);
+    addMultiParentBtn_->SetViewId("addMultiParentBtn");
+    addMultiParentBtn_->SetOnClickListener(this);
+    addMultiParentBtn_->LayoutCenterOfParent();
+    addMultiParentBtn_->LayoutRightToSibling("addTwiceBtn", 10); // 10: offset
+
+    addSelfBtn_ = CreateButton("add到自己", 150, 40); // 150: width 40:height
+    group->Add(addSelfBtn_);
+    addSelfBtn_->SetViewId("addSelfBtn");
+    addSelfBtn_->SetOnClickListener(this);
+    addSelfBtn_->LayoutCenterOfParent();
+    addSelfBtn_->LayoutRightToSibling("addMultiParentBtn", 10); // 10: offset
+
+    group->LayoutBottomToSibling("UIKit_ViewGroup_Test_AddRemove_001", 10); // 10: offset
+}
+
+void UITestViewGroup::UIKit_ViewGroup_Test_Insert_Error_001()
+{
+    if (container_ == nullptr) {
+        return;
+    }
+
+    UIViewGroup* group = CreateTestCaseGroup();
+    group->SetViewId("UIKit_ViewGroup_Test_Insert_Error_001");
+    container_->Add(group);
+
+    UILabel* label = CreateTitleLabel();
+    group->Add(label);
+    // 2: half of screen width
+    label->Resize(Screen::GetInstance().GetWidth() / 2, TITLE_LABEL_DEFAULT_HEIGHT);
+    label->SetText("测试Insert子组件问题:");
+
+    insertTwiceBtn_ = CreateButton("重复insert", 150, 40); // 150: width 40:height
+    group->Add(insertTwiceBtn_);
+    insertTwiceBtn_->SetViewId("insertTwiceBtn");
+    insertTwiceBtn_->SetOnClickListener(this);
+    insertTwiceBtn_->LayoutCenterOfParent();
+    insertTwiceBtn_->LayoutLeftOfParent(10); // 10: offset
+
+    insertMultiParentBtn_ = CreateButton("insert到不同父节点", 200, 40); // 200: width 40:height
+    group->Add(insertMultiParentBtn_);
+    insertMultiParentBtn_->SetViewId("insertMultiParentBtn");
+    insertMultiParentBtn_->SetOnClickListener(this);
+    insertMultiParentBtn_->LayoutCenterOfParent();
+    insertMultiParentBtn_->LayoutRightToSibling("insertTwiceBtn", 10); // 10: offset
+
+    insertSelfBtn_ = CreateButton("insert到自己", 150, 40); // 150: width 40:height
+    group->Add(insertSelfBtn_);
+    insertSelfBtn_->SetViewId("addSelfBtn");
+    insertSelfBtn_->SetOnClickListener(this);
+    insertSelfBtn_->LayoutCenterOfParent();
+    insertSelfBtn_->LayoutRightToSibling("insertMultiParentBtn", 10); // 10: offset
+
+    group->LayoutBottomToSibling("UIKit_ViewGroup_Test_Add_Error_001", 10); // 10: offset
+}
+
+bool UITestViewGroup::OnClick(UIView& view, const ClickEvent& event)
+{
+    if (&view == addBtn_) {
+        AddView();
+    } else if (&view == removeBtn_) {
+        RemoveView();
+    } else if (&view == removeAddBtn_) {
+        RemoveAndAddView();
+    } else if (&view == addTwiceBtn_) {
+        UIView* view = new UIView();
+        container_->Add(view);
+        container_->Add(view);
+    } else if (&view == addMultiParentBtn_) {
+        AddMultiParent();
+    } else if (&view == addSelfBtn_) {
+        container_->Add(container_);
+    } else if (&view == insertTwiceBtn_) {
+        UIView* view = new UIView();
+        container_->Insert(nullptr, view);
+        container_->Insert(nullptr, view);
+    } else if (&view == insertMultiParentBtn_) {
+        InsertMultiParent();
+    } else if (&view == insertSelfBtn_) {
+        container_->Insert(nullptr, container_);
+    }
+    return true;
+}
+
+void UITestViewGroup::AddView()
+{
+    UIView* view = new UIView();
+    view->Resize(200, 50);     // 200: width 50: height
+    view->SetPosition(50, 50); // 50: position x 50: position y
+    view->SetStyle(STYLE_BACKGROUND_COLOR, Color::Yellow().full);
+    view->SetViewId("id_view1");
+    UIViewGroup* vg = static_cast<UIViewGroup*>(container_->GetChildById("UIKit_ViewGroup_Test_AddRemove_001"));
+    if (vg != nullptr) {
+        vg->Add(view);
+        vg->Invalidate();
+    }
+}
+
+void UITestViewGroup::RemoveView()
+{
+    UIViewGroup* vg = static_cast<UIViewGroup*>(container_->GetChildById("UIKit_ViewGroup_Test_AddRemove_001"));
+    UIView* view1 = container_->GetChildById("id_view1");
+    if ((vg != nullptr) && (view1 != nullptr)) {
+        vg->Remove(view1);
+        vg->Invalidate();
+    }
+}
+
+void UITestViewGroup::RemoveAndAddView()
+{
+    UIViewGroup* vg = static_cast<UIViewGroup*>(container_->GetChildById("UIKit_ViewGroup_Test_AddRemove_001"));
+    UIView* view1 = container_->GetChildById("id_view1");
+    if ((vg != nullptr) && (view1 != nullptr)) {
+        vg->Remove(view1);
+        vg->Add(view1);
+        vg->Invalidate();
+    }
+}
+
+void UITestViewGroup::AddMultiParent()
+{
+    UIView* view = new UIView();
+    UIViewGroup* vg = static_cast<UIViewGroup*>(container_->GetChildById("UIKit_ViewGroup_Test_Add_Error_001"));
+    if ((vg != nullptr) && (view != nullptr)) {
+        vg->Add(view);
+    }
+    container_->Add(view);
+}
+
+void UITestViewGroup::InsertMultiParent()
+{
+    UIView* view = new UIView();
+    UIViewGroup* vg = static_cast<UIViewGroup*>(container_->GetChildById("UIKit_ViewGroup_Test_Insert_Error_001"));
+    if ((vg != nullptr) && (view != nullptr)) {
+        vg->Insert(nullptr, view);
+    }
+    container_->Insert(nullptr, view);
+}
+} // namespace OHOS

test/uitest/test_view_group/ui_test_view_group.h

+/*
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef UI_TEST_VIEW_GROUP_H
+#define UI_TEST_VIEW_GROUP_H
+
+#include "components/ui_label.h"
+#include "components/ui_label_button.h"
+#include "components/ui_scroll_view.h"
+#include "components/ui_view_group.h"
+#include "ui_test.h"
+
+namespace OHOS {
+class UITestViewGroup : public UITest, public UIView::OnClickListener {
+public:
+    UITestViewGroup() : container_(nullptr) {}
+    ~UITestViewGroup() {}
+    void SetUp() override;
+    void TearDown() override;
+    UIView* GetTestView() override;
+    bool OnClick(UIView& view, const ClickEvent& event) override;
+
+    /**
+     * @brief Test Add/Rmove Function
+     */
+    void UIKit_ViewGroup_Test_AddRemove_001();
+
+    /**
+     * @brief Test add child multi time
+     */
+    void UIKit_ViewGroup_Test_Add_Error_001();
+
+    /**
+     * @brief Test insert child multi time
+     */
+    void UIKit_ViewGroup_Test_Insert_Error_001();
+
+private:
+    UIViewGroup* CreateTestCaseGroup() const;
+    UILabel* CreateTitleLabel() const;
+    UILabelButton* CreateButton(const char* text, int16_t width, int16_t height) const;
+    void AddView();
+    void RemoveView();
+    void RemoveAndAddView();
+    void AddMultiParent();
+    void InsertMultiParent();
+
+    UIScrollView* container_ = nullptr;
+    UILabelButton* addBtn_ = nullptr;
+    UILabelButton* removeBtn_ = nullptr;
+    UILabelButton* removeAddBtn_ = nullptr;
+    UILabelButton* addTwiceBtn_ = nullptr;
+    UILabelButton* addMultiParentBtn_ = nullptr;
+    UILabelButton* addSelfBtn_ = nullptr;
+    UILabelButton* insertTwiceBtn_ = nullptr;
+    UILabelButton* insertSelfBtn_ = nullptr;
+    UILabelButton* insertMultiParentBtn_ = nullptr;
+};
+} // namespace OHOS
+#endif // UI_TEST_VIEW_GROUP_H

tools/qt/simulator/test/test.pro

@@ -62,6 +62,7 @@ SOURCES += \
     ../../../../test/uitest/test_ui_scroll_view/ui_test_ui_scroll_view.cpp \
     ../../../../test/uitest/test_ui_swipe_view/ui_test_ui_swipe_view.cpp \
     ../../../../test/uitest/test_vector_font/ui_test_vector_font.cpp \
+    ../../../../test/uitest/test_view_group/ui_test_view_group.cpp \
     ../../../../test/uitest/test_view_percent/ui_test_view_percent.cpp \
     ../../../../test/uitest/test_view_scale_rotate/ui_test_view_scale_rotate.cpp
 
@@ -114,6 +115,7 @@ HEADERS += \
     ../../../../test/uitest/test_ui_scroll_view/ui_test_ui_scroll_view.h \
     ../../../../test/uitest/test_ui_swipe_view/ui_test_ui_swipe_view.h \
     ../../../../test/uitest/test_vector_font/ui_test_vector_font.h \
+    ../../../../test/uitest/test_view_group/ui_test_view_group.h \
     ../../../../test/uitest/test_view_percent/ui_test_view_percent.h \
     ../../../../test/uitest/test_view_scale_rotate/ui_test_view_scale_rotate.h