From 848a427690e8c829192b608d7e1a5e3822333c99 Mon Sep 17 00:00:00 2001
From: wangtiantian <wang_thinking@163.com>
Date: Tue, 27 Apr 2021 14:16:54 +0800
Subject: [PATCH] IssueNo:#I3NSQ6 Description:support bitmap font Sig:graphic
 Feature or Bugfix:Feature Binary Source:No

---
 test/BUILD.gn          |  8 +++++++-
 test/sample_ui.cpp     | 13 +++++++++++++
 test/sample_window.cpp | 13 +++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/test/BUILD.gn b/test/BUILD.gn
index bbfc463..6596a48 100755
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -27,6 +27,7 @@ if (ohos_build_type == "debug") {
     sources = [ "sample_ui.cpp" ]
     include_dirs = [
       "//foundation/graphic/ui/frameworks",
+      "//foundation/graphic/ui/test/framework",
       "//third_party/freetype/include",
     ]
     ldflags = [
@@ -47,6 +48,7 @@ if (ohos_build_type == "debug") {
     sources = [ "sample_ui.cpp" ]
     include_dirs = [
       "//foundation/graphic/ui/frameworks",
+      "//foundation/graphic/ui/test/framework",
       "//third_party/freetype/include",
     ]
     ldflags = [
@@ -64,9 +66,13 @@ if (ohos_build_type == "debug") {
   }
 
   executable("sample_window") {
-    sources = [ "sample_window.cpp" ]
+    sources = [
+      "sample_window.cpp",
+      "//foundation/graphic/ui/test/framework/common/ui_text_language.cpp",
+    ]
     include_dirs = [
       "//foundation/graphic/ui/frameworks",
+      "//foundation/graphic/ui/test/framework",
       "//foundation/graphic/surface/interfaces/kits",
       "//third_party/freetype/include",
     ]
diff --git a/test/sample_ui.cpp b/test/sample_ui.cpp
index 4a818e0..141ffb2 100755
--- a/test/sample_ui.cpp
+++ b/test/sample_ui.cpp
@@ -19,7 +19,12 @@
 #include "common/screen.h"
 #include "common/task_manager.h"
 #include "dock/screen_device_proxy.h"
+#if ENABLE_VECTOR_FONT
 #include "font/ui_font_vector.h"
+#else
+#include "common/ui_text_language.h"
+#include "font/ui_font_bitmap.h"
+#endif
 #include "gfx_utils/graphic_log.h"
 #include "graphic_config.h"
 #include "window/window.h"
@@ -58,8 +63,16 @@ static uint8_t g_icuMemBaseAddr[OHOS::SHAPING_WORD_DICT_LENGTH];
 
 static void InitFontEngine()
 {
+#if ENABLE_VECTOR_FONT
     GraphicStartUp::InitFontEngine(reinterpret_cast<uintptr_t>(g_fontMemBaseAddr), MIN_FONT_PSRAM_LENGTH,
                                    VECTOR_FONT_DIR, DEFAULT_VECTOR_FONT_FILENAME);
+#else
+    BitmapFontInit();
+    const char* dPath = "/user/data/font.bin";
+    GraphicStartUp::InitFontEngine(reinterpret_cast<uintptr_t>(g_fontMemBaseAddr), MIN_FONT_PSRAM_LENGTH,
+                                   dPath, nullptr);
+#endif
+
 #if ENABLE_ICU
     GraphicStartUp::InitLineBreakEngine(reinterpret_cast<uintptr_t>(g_icuMemBaseAddr), SHAPING_WORD_DICT_LENGTH,
                                         VECTOR_FONT_DIR, DEFAULT_LINE_BREAK_RULE_FILENAME);
diff --git a/test/sample_window.cpp b/test/sample_window.cpp
index 2eb78d0..7742679 100755
--- a/test/sample_window.cpp
+++ b/test/sample_window.cpp
@@ -22,7 +22,12 @@
 #include "components/ui_label.h"
 #include "dock/screen_device_proxy.h"
 #include "font/ui_font.h"
+#if ENABLE_VECTOR_FONT
 #include "font/ui_font_vector.h"
+#else
+#include "common/ui_text_language.h"
+#include "font/ui_font_bitmap.h"
+#endif
 #include "gfx_utils/graphic_log.h"
 #include "graphic_config.h"
 #include "window/window.h"
@@ -263,8 +268,16 @@ static uint8_t g_icuMemBaseAddr[OHOS::SHAPING_WORD_DICT_LENGTH];
 #endif
 static void InitFontEngine()
 {
+#if ENABLE_VECTOR_FONT
     GraphicStartUp::InitFontEngine(reinterpret_cast<uintptr_t>(g_fontMemBaseAddr), MIN_FONT_PSRAM_LENGTH,
                                    VECTOR_FONT_DIR, DEFAULT_VECTOR_FONT_FILENAME);
+#else
+    BitmapFontInit();
+    const char* dPath = "/user/data/font.bin";
+    GraphicStartUp::InitFontEngine(reinterpret_cast<uintptr_t>(g_fontMemBaseAddr), MIN_FONT_PSRAM_LENGTH,
+                                   dPath, nullptr);
+#endif
+
 #if ENABLE_ICU
     GraphicStartUp::InitLineBreakEngine(reinterpret_cast<uintptr_t>(g_icuMemBaseAddr), SHAPING_WORD_DICT_LENGTH,
                                         VECTOR_FONT_DIR, DEFAULT_LINE_BREAK_RULE_FILENAME);
-- 
Gitee