feat(ohos): support logAdapter in EngineInitParams

Author: etkmao

framework/examples/ohos-demo/src/main/ets/hippy_extend/ExampleLogAdapter.ets

@@ -0,0 +1,40 @@
+/*
+ * Tencent is pleased to support the open source community by making
+ * Hippy available.
+ *
+ * Copyright (C) 2022 THL A29 Limited, a Tencent company.
+ * All rights reserved.
+ *
+ * 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.
+ */
+import { HippyLogAdapter, HippyLogSeverity } from 'hippy'
+import hilog from '@ohos.hilog';
+
+export class ExampleLogAdapter implements HippyLogAdapter {
+  onReceiveLogMessage(level: number, tag: string, msg: string): void {
+    switch (level) {
+      case HippyLogSeverity.LOG_SEVERITY_DEBUG:
+      case HippyLogSeverity.LOG_SEVERITY_INFO:
+        break;
+      case HippyLogSeverity.LOG_SEVERITY_WARNING:
+        hilog.warn(0x0001, tag, msg);
+      case HippyLogSeverity.LOG_SEVERITY_ERROR:
+        hilog.error(0x0001, tag, msg);
+      case HippyLogSeverity.LOG_SEVERITY_FATAL:
+        hilog.fatal(0x0001, tag, msg);
+      default:
+        break;
+    }
+  }
+
+}

framework/examples/ohos-demo/src/main/ets/pages/PageConfiguration.ets

@@ -36,6 +36,7 @@ import { LogUtils } from 'hippy/src/main/ets/support/utils/LogUtils'
 import { ExampleFontAdapter } from '../hippy_extend/ExampleFontAdapter'
 import { ExampleImageLocalLoader,
   ExampleImageRemoteLoader } from '../hippy_extend/ExampleImageLoaderAdapter'
+import { ExampleLogAdapter } from '../hippy_extend/ExampleLogAdapter'
 
 export enum DriverMode {
   JS_REACT,
@@ -183,6 +184,9 @@ struct PageConfiguration {
 
     params.fontAdapter = new ExampleFontAdapter()
 
+    // 日志重定向输出适配器举例
+    //params.logAdapter = new ExampleLogAdapter()
+
     // 图片加载适配器举例
     //params.imageLocalLoader = new ExampleImageLocalLoader();
     //params.imageRemoteLoader = new ExampleImageRemoteLoader();

framework/ohos/src/main/cpp/impl/CMakeLists.txt

@@ -34,9 +34,12 @@ set(HIPPY_DRIVER_JS_CPP_DIR "${PROJECT_ROOT_DIR}/driver/js")
 set(HIPPY_DOM_CPP_DIR "${PROJECT_ROOT_DIR}/dom")
 set(HIPPY_VFS_CPP_DIR "${PROJECT_ROOT_DIR}/modules/vfs")
 
-add_library(hippy_impl STATIC
-  "${HIPPY_IMPL_CPP_DIR}/entry.cc"
-)
+add_library(hippy_impl STATIC)
+
+set(PUBLIC_SOURCE_SET
+    "${HIPPY_IMPL_CPP_DIR}/entry.cc")
+
+target_sources(${PROJECT_NAME} PUBLIC ${PUBLIC_SOURCE_SET})
 
 target_include_directories(hippy_impl PUBLIC
   "${HIPPY_IMPL_CPP_DIR}"

framework/ohos/src/main/cpp/impl/entry.cc

@@ -20,5 +20,45 @@
  *
  */
 
-#include <napi/native_api.h>
-#include <stdio.h>
+#include <js_native_api.h>
+#include <js_native_api_types.h>
+#include "oh_napi/oh_napi_object.h"
+#include "oh_napi/oh_napi_register.h"
+#include "oh_napi/oh_napi_task_runner.h"
+#include "oh_napi/ark_ts.h"
+#include "footstone/check.h"
+
+using OhNapiTaskRunner = hippy::OhNapiTaskRunner;
+
+static bool s_is_initialized_ = false;
+
+static napi_value SetNativeLogHandler(napi_env env, napi_callback_info info) {
+  ArkTS arkTs(env);
+  auto args = arkTs.GetCallbackArgs(info, 1);
+  auto ts_log_adapter = args[0];
+  auto ts_log_adapter_ref = arkTs.CreateReference(ts_log_adapter);
+
+  if (!s_is_initialized_) {
+    footstone::log::LogMessage::InitializeDelegate([env, ts_log_adapter_ref](
+        const std::ostringstream& stream,
+        footstone::log::LogSeverity severity) {
+      auto msg = stream.str();
+      OhNapiTaskRunner *taskRunner = OhNapiTaskRunner::Instance(env);
+      taskRunner->RunAsyncTask([env, ts_log_adapter_ref, severity, msg]() {
+        ArkTS arkTs(env);
+        std::vector<napi_value> args = {
+          arkTs.CreateInt(severity), // level
+          arkTs.CreateString("HippyLog"), // tag
+          arkTs.CreateString(msg), // msg
+        };
+        auto delegateObject = arkTs.GetObject(ts_log_adapter_ref);
+        delegateObject.Call("onReceiveLogMessage", args);
+      });
+    });
+    s_is_initialized_ = true;
+  }
+
+  return arkTs.GetUndefined();
+}
+
+REGISTER_OH_NAPI("Entry", "Entry_SetNativeLogHandler", SetNativeLogHandler)

framework/ohos/src/main/ets/hippy_framework/HippyEngine.ets

@@ -104,6 +104,10 @@ export function createHippyEngine(params: EngineInitParams): HippyEngine {
     params.libHippy?.Setting_SetDesktop();
   }
 
+  if (params.logAdapter) {
+    params.libHippy?.Entry_SetNativeLogHandler(params.logAdapter);
+  }
+
   return new HippyEngineManagerImpl(params)
 }
 
@@ -250,7 +254,7 @@ export class EngineInitParams {
       this.deviceAdapter = new DefaultDeviceAdapter()
     }
     if (this.logAdapter === null) {
-      this.logAdapter = new DefaultLogAdapter()
+      // 这里不用创建DefaultLogAdapter，默认c层输出log性能更好
     }
     if (this.engineMonitor === null) {
       this.engineMonitor = new DefaultEngineMonitorAdapter()

framework/ohos/src/main/ets/hippy_library/HippyLibrary.ets

@@ -36,6 +36,7 @@ import {
 import {
   ImageRemoteLoaderInnerAdapter
 } from "../hippy_framework/adapter/image/inner/ImageRemoteLoaderInnerAdapter";
+import { HippyLogAdapter } from "../hippy_framework/adapter/log/HippyLogAdapter";
 
 export interface HippyRenderViewInfo {
   tag: number
@@ -159,4 +160,5 @@ export interface HippyLibrary {
   Worker_UnregisterWModules(moduleNames: HippyArray): void;
   Worker_CallJsFunction(instanceId: number, action: string, buffer: ArrayBuffer): void;
 
+  Entry_SetNativeLogHandler(logAdapter: HippyLogAdapter): void;
 }