From a29c97febacaccf8f93fd9ea8d64d4ba2f6bb564 Mon Sep 17 00:00:00 2001
From: niulihua <niulihua3@huawei.com>
Date: Sun, 25 Apr 2021 19:36:30 +0800
Subject: [PATCH] =?UTF-8?q?IssueNo:=20#I3NSZ1=20Description:=201=E3=80=81a?=
 =?UTF-8?q?dd=20graphic=20abstract=20layer;=202=E3=80=81modify=20for=20mul?=
 =?UTF-8?q?tipy=20thread=20drawing;=203=E3=80=81fix=20launcher=20crash=20w?=
 =?UTF-8?q?hen=20enable=20button=20default=20animator=20Feature=20or=20Bug?=
 =?UTF-8?q?fix:=20Feature=20Binary=20Source:=20No?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/sample_ui.cpp     | 11 -----------
 test/sample_window.cpp | 10 +---------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/test/sample_ui.cpp b/test/sample_ui.cpp
index 4a818e0..9f552a8 100755
--- a/test/sample_ui.cpp
+++ b/test/sample_ui.cpp
@@ -18,7 +18,6 @@
 #include "common/graphic_startup.h"
 #include "common/screen.h"
 #include "common/task_manager.h"
-#include "dock/screen_device_proxy.h"
 #include "font/ui_font_vector.h"
 #include "gfx_utils/graphic_log.h"
 #include "graphic_config.h"
@@ -42,15 +41,6 @@ void TestAPP()
     window->Show();
 }
 
-static void InitHal()
-{
-    ScreenDevice* display = new ScreenDevice();
-    ScreenDeviceProxy::GetInstance()->SetDevice(display);
-    ScreenDeviceProxy::GetInstance()->SetScreenSize(HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);
-    ScreenDeviceProxy::GetInstance()->SetAnimatorbuffer(reinterpret_cast<uint8_t*>(g_animaterBuffer), ARGB8888,
-                                                        HORIZONTAL_RESOLUTION);
-}
-
 static uint32_t g_fontMemBaseAddr[MIN_FONT_PSRAM_LENGTH / 4];
 #if ENABLE_ICU
 static uint8_t g_icuMemBaseAddr[OHOS::SHAPING_WORD_DICT_LENGTH];
@@ -70,7 +60,6 @@ static void InitFontEngine()
 int main(int argc, char* argv[])
 {
     OHOS::GraphicStartUp::Init();
-    OHOS::InitHal();
     OHOS::InitFontEngine();
     OHOS::TestAPP();
     while (1) {
diff --git a/test/sample_window.cpp b/test/sample_window.cpp
index 2eb78d0..0f3353d 100755
--- a/test/sample_window.cpp
+++ b/test/sample_window.cpp
@@ -20,7 +20,6 @@
 #include "components/ui_button.h"
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
-#include "dock/screen_device_proxy.h"
 #include "font/ui_font.h"
 #include "font/ui_font_vector.h"
 #include "gfx_utils/graphic_log.h"
@@ -251,12 +250,6 @@ void TestWindowNumLimit()
     }
 }
 
-static void InitHal()
-{
-    ScreenDevice* display = new ScreenDevice();
-    ScreenDeviceProxy::GetInstance()->SetDevice(display);
-}
-
 static uint32_t g_fontMemBaseAddr[MIN_FONT_PSRAM_LENGTH / 4];
 #if ENABLE_ICU
 static uint8_t g_icuMemBaseAddr[OHOS::SHAPING_WORD_DICT_LENGTH];
@@ -275,7 +268,6 @@ static void InitFontEngine()
 int main(int argc, char* argv[])
 {
     OHOS::GraphicStartUp::Init();
-    OHOS::InitHal();
     OHOS::InitFontEngine();
     OHOS::TestWindow();
     while (1) {
@@ -284,4 +276,4 @@ int main(int argc, char* argv[])
         usleep(1000 * 10); /* 1000 * 10: Just to let the system breathe */
     }
     return 0;
-}
\ No newline at end of file
+}
-- 
Gitee