回退 'Pull Request !247 : 246 HILOG冲突问题'

frameworks/animator/animator_manager.cpp

@@ -16,7 +16,6 @@
 #include "animator/animator_manager.h"
 
 #include "common/task_manager.h"
-#include "gfx_utils/graphic_log.h"
 #include "hal_tick.h"
 
 namespace OHOS {

frameworks/components/ui_arc_label.cpp

@@ -18,7 +18,6 @@
 #include "draw/draw_label.h"
 #include "engines/gfx/gfx_engine_manager.h"
 #include "font/ui_font.h"
-#include "gfx_utils/graphic_log.h"
 #include "themes/theme_manager.h"
 
 namespace OHOS {
@@ -210,15 +209,4 @@ void UIArcLabel::MeasureArcTextInfo()
             arcTextInfo_.direct, orientation_);
     }
 }
-
-void UIArcLabel::InitArcLabelText()
-{
-    if (arcLabelText_ == nullptr) {
-        arcLabelText_ = new Text();
-        if (arcLabelText_ == nullptr) {
-            HILOG_ERROR(HILOG_MODULE_GRAPHIC, "new Text fail");
-            return;
-        }
-    }
-}
 } // namespace OHOS
\ No newline at end of file

frameworks/components/ui_image_view.cpp

@@ -20,7 +20,6 @@
 #include "draw/draw_label.h"
 #include "engines/gfx/gfx_engine_manager.h"
 #include "gfx_utils/file.h"
-#include "gfx_utils/graphic_log.h"
 #include "gfx_utils/image_info.h"
 #include "gfx_utils/mem_api.h"
 #include "imgdecode/cache_manager.h"

frameworks/components/ui_label_button.cpp

@@ -17,7 +17,6 @@
 #include "common/typed_text.h"
 #include "draw/draw_label.h"
 #include "font/ui_font.h"
-#include "gfx_utils/graphic_log.h"
 
 namespace OHOS {
 UILabelButton::UILabelButton() : labelButtonText_(nullptr), offset_({ 0, 0 })
@@ -40,18 +39,6 @@ void UILabelButton::OnDraw(BufferInfo& gfxDstBuffer, const Rect& invalidatedArea
                              labelStyle_, ellipsisIndex, opa);
 }
 
-void UILabelButton::InitLabelButtonText()
-{
-    if (labelButtonText_ == nullptr) {
-        labelButtonText_ = new Text();
-        if (labelButtonText_ == nullptr) {
-            HILOG_ERROR(HILOG_MODULE_GRAPHIC, "new Text fail");
-            return;
-        }
-        labelButtonText_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
-    }
-}
-
 UILabelButton::~UILabelButton()
 {
     if (labelButtonText_ != nullptr) {

frameworks/components/ui_picker.cpp

@@ -17,7 +17,6 @@
 #include "dock/vibrator_manager.h"
 #include "draw/draw_line.h"
 #include "draw/draw_rect.h"
-#include "gfx_utils/graphic_log.h"
 #include "themes/theme_manager.h"
 
 namespace {
@@ -246,17 +245,6 @@ void UIPicker::Refresh()
     }
 }
 
-void UIPicker::InitTextAdapter()
-{
-    if (textAdapter_ == nullptr) {
-        textAdapter_ = new TextAdapter();
-        if (textAdapter_ == nullptr) {
-            HILOG_ERROR(HILOG_MODULE_GRAPHIC, "new TextAdapter fail");
-            return;
-        }
-    }
-}
-
 bool UIPicker::RefreshValues(int16_t start, int16_t end)
 {
     if (!isWidthSet_ || !isHeightSet_ || !itemsHeight_ || ((start == 0) && (end == 0))) {

frameworks/components/ui_video.cpp

@@ -14,7 +14,6 @@
  */
 
 #include "components/ui_video.h"
-#include "gfx_utils/graphic_log.h"
 #include "securec.h"
 
 #ifndef VERSION_LITE

frameworks/components/ui_view.cpp

@@ -548,20 +548,6 @@ Rect UIView::GetContentRect()
     return contentRect;
 }
 
-void UIView::ResizeVisibleArea(int16_t x, int16_t y, int16_t width, int16_t height)
-{
-    if (visibleRect_ == nullptr) {
-        visibleRect_ = new Rect();
-        if (visibleRect_ == nullptr) {
-            HILOG_ERROR(HILOG_MODULE_GRAPHIC, "new Rect fail");
-            return;
-        }
-    }
-    visibleRect_->SetWidth(width);
-    visibleRect_->SetHeight(height);
-    visibleRect_->SetPosition(x, y);
-}
-
 Rect UIView::GetOrigRect() const
 {
     int16_t x = rect_.GetX();

interfaces/kits/components/ui_arc_label.h

@@ -361,7 +361,16 @@ public:
 protected:
     Text* arcLabelText_;
 
-    virtual void InitArcLabelText();
+    virtual void InitArcLabelText()
+    {
+        if (arcLabelText_ == nullptr) {
+            arcLabelText_ = new Text();
+            if (arcLabelText_ == nullptr) {
+                HILOG_ERROR(HILOG_MODULE_GRAPHIC, "new Text fail");
+                return;
+            }
+        }
+    }
     void RefreshArcLabel();
 
 private:

interfaces/kits/components/ui_label_button.h

@@ -37,6 +37,7 @@
 
 #include "common/text.h"
 #include "components/ui_button.h"
+#include "gfx_utils/graphic_log.h"
 
 namespace OHOS {
 /**
@@ -289,7 +290,17 @@ public:
     }
 
 protected:
-    virtual void InitLabelButtonText();
+    virtual void InitLabelButtonText()
+    {
+        if (labelButtonText_ == nullptr) {
+            labelButtonText_ = new Text();
+            if (labelButtonText_ == nullptr) {
+                HILOG_ERROR(HILOG_MODULE_GRAPHIC, "new Text fail");
+                return;
+            }
+            labelButtonText_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
+        }
+    }
 
     Text* labelButtonText_;
 

interfaces/kits/components/ui_picker.h

@@ -381,7 +381,16 @@ protected:
     void RefreshList();
     virtual void ClearList();
     virtual void Refresh();
-    virtual void InitTextAdapter();
+    virtual void InitTextAdapter()
+    {
+        if (textAdapter_ == nullptr) {
+            textAdapter_ = new TextAdapter();
+            if (textAdapter_ == nullptr) {
+                HILOG_ERROR(HILOG_MODULE_GRAPHIC, "new TextAdapter fail");
+                return;
+            }
+        }
+    }
 
     bool isWidthSet_ : 1;
     bool isHeightSet_ : 1;

interfaces/kits/components/ui_view.h

@@ -49,6 +49,7 @@
 #include "gfx_utils/color.h"
 #include "gfx_utils/geometry2d.h"
 #include "gfx_utils/graphic_buffer.h"
+#include "gfx_utils/graphic_log.h"
 #include "gfx_utils/heap_base.h"
 #include "gfx_utils/image_info.h"
 #include "gfx_utils/style.h"
@@ -891,7 +892,19 @@ public:
      * @since 1.0
      * @version 1.0
      */
-    void ResizeVisibleArea(int16_t x, int16_t y, int16_t width, int16_t height);
+    void ResizeVisibleArea(int16_t x, int16_t y, int16_t width, int16_t height)
+    {
+        if (visibleRect_ == nullptr) {
+            visibleRect_ = new Rect();
+            if (visibleRect_ == nullptr) {
+                HILOG_ERROR(HILOG_MODULE_GRAPHIC, "new Rect fail");
+                return;
+            }
+        }
+        visibleRect_->SetWidth(width);
+        visibleRect_->SetHeight(height);
+        visibleRect_->SetPosition(x, y);
+    }
 
     /**
      * @brief Sets the width for the view.