!212 修复图形代码告警相关

Merge pull request !212 from guyuanzhang/clean2

frameworks/components/ui_toggle_button.cpp

@@ -65,8 +65,8 @@ void UIToggleButton::CalculateSize()
     rectWidth_ = TOGGLE_BTN_WIDTH * minValue / DEFAULT_HOT_WIDTH;
 
     Rect contentRect = GetContentRect();
-    int16_t dx = (width_ - rectWidth_) >> 1;
-    int16_t dy = (height_ >> 1) - corner_;
+    int16_t dx = (width_ - rectWidth_) / 2; // 2: half
+    int16_t dy = (height_ / 2) - corner_; // 2: half
     int16_t x = contentRect.GetX() + dx;
     int16_t y = contentRect.GetY() + dy;
     leftCenter_ = {static_cast<int16_t>(x + corner_), static_cast<int16_t>(y + corner_)};

interfaces/kits/components/abstract_adapter.h

@@ -96,7 +96,10 @@ public:
 
     virtual int16_t GetItemWidthWithMargin(int16_t index)
     {
-        UIView *view = GetView(nullptr, index);
+        UIView* view = GetView(nullptr, index);
+        if (view == nullptr) {
+            return 0;
+        }
         int16_t width = view->GetWidthWithMargin();
         DeleteView(view);
         return width;
@@ -104,7 +107,10 @@ public:
 
     virtual int16_t GetItemHeightWithMargin(int16_t index)
     {
-        UIView *view = GetView(nullptr, index);
+        UIView* view = GetView(nullptr, index);
+        if (view == nullptr) {
+            return 0;
+        }
         int16_t height = view->GetHeightWithMargin();
         DeleteView(view);
         return height;

test/uitest/test_texture_mapper/ui_test_texture_mapper.cpp

@@ -79,12 +79,12 @@ void UITestTextureMapper::SetUp()
 
 void UITestTextureMapper::TearDown()
 {
+    delete listener_;
+    listener_ = nullptr;
     DeleteChildren(container_);
     container_ = nullptr;
     textureMapper_ = nullptr;
     layout_ = nullptr;
-    delete listener_;
-    listener_ = nullptr;
 }
 
 const UIView* UITestTextureMapper::GetTestView()

test/uitest/test_texture_mapper/ui_test_texture_mapper.h

@@ -30,27 +30,31 @@ public:
     {
         if (viewGroup != nullptr) {
             viewGroup_ = viewGroup;
-            label_ = new UILabel();
-            viewGroup_->Add(label_);
-            label_->SetPosition(0, 0, 200, TITLE_LABEL_DEFAULT_HEIGHT); // 200: width;
-            label_->SetText("OnAnimatorStop");
-            label_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);
-            label_->SetStyle(STYLE_TEXT_COLOR, Color::Black().full);
-            label_->SetStyle(STYLE_BACKGROUND_COLOR, Color::White().full);
-            label_->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE);
-            label_->SetVisible(false);
+            viewGroup_->Add(&label_);
+            label_.SetPosition(0, 0, 200, TITLE_LABEL_DEFAULT_HEIGHT); // 200: width;
+            label_.SetText("OnAnimatorStop");
+            label_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, FONT_DEFAULT_SIZE);
+            label_.SetStyle(STYLE_TEXT_COLOR, Color::Black().full);
+            label_.SetStyle(STYLE_BACKGROUND_COLOR, Color::White().full);
+            label_.SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE);
+            label_.SetVisible(false);
         }
     }
 
-    ~TestTextureMapperStopListener() {};
+    ~TestTextureMapperStopListener()
+    {
+        if (viewGroup_ != nullptr) {
+            viewGroup_->Remove(&label_);
+        }
+    };
 
     void OnAnimatorStop(UIView& view) override
     {
-        label_->SetVisible(true);
-        label_->Invalidate();
+        label_.SetVisible(true);
+        label_.Invalidate();
     }
 private:
-    UILabel* label_ = nullptr;
+    UILabel label_;
     UIViewGroup* viewGroup_ = nullptr;
 };
 

test/uitest/test_ui_scroll_view/ui_test_ui_scroll_view.cpp

@@ -119,7 +119,7 @@ void UITestUIScrollView::UIKit_UIScrollView_Test_bar_001()
     scroll->SetPosition(positionX_, positionY_, g_scrollW, g_scrollH);
     VISIBLE_XBAR(false);
     scroll->SetYScrollBarVisible(true);
-    scroll->SetReboundSize(50); // 50 : rebound size
+    scroll->SetReboundSize(50); // 50: rebound size
     container_->Add(scroll);
     UILabelButton* button1 = new UILabelButton();
     button1->SetPosition(0, 0, g_buttonW, g_buttonH);

test/unittest/animator/animator_unit_test.cpp

@@ -52,13 +52,13 @@ public:
         return false;
     }
 
-    virtual void Callback(UIView* view) override
+    void Callback(UIView* view) override
     {
         int16_t pos = EasingEquation::LinearEaseNone(START_POS, END_POS, animator_->GetRunTime(), animator_->GetTime());
         view_->SetX(pos);
     }
 
-    virtual void OnStop(UIView& view) override
+    void OnStop(UIView& view) override
     {
         view_->SetX(END_POS);
     }

test/unittest/components/ui_swipe_view_unit_test.cpp

@@ -220,7 +220,7 @@ class OnTestSwipeListener : public UISwipeView::OnSwipeListener {
 public:
     OnTestSwipeListener() {}
     virtual ~OnTestSwipeListener() {}
-    virtual void OnSwipe(UISwipeView& view) override
+    void OnSwipe(UISwipeView& view) override
     {
         view.SetWidth(DEFAULT_WIDTH);
         return;