From 658855c1a7524f550ec4893221f5b8bfbaa54b04 Mon Sep 17 00:00:00 2001 From: mahaonan Date: Wed, 22 Nov 2023 11:45:14 +0800 Subject: [PATCH] =?UTF-8?q?flutter=5Fembedding=20=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: mahaonan --- .../flutter/src/main/cpp/types/libflutter/index.d.ets | 2 +- .../src/main/ets/embedding/engine/dart/DartMessenger.ets | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/cpp/types/libflutter/index.d.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/cpp/types/libflutter/index.d.ets index e87ee85e6a..7eba67a0d0 100644 --- a/shell/platform/ohos/flutter_embedding/flutter/src/main/cpp/types/libflutter/index.d.ets +++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/cpp/types/libflutter/index.d.ets @@ -48,7 +48,7 @@ export const nativeInit: ( export const nativeAttach: (napi: FlutterNapi) => number; export const nativeSpawn: ( - nativeSpawningShellId: number, + nativeSpawningShellId: number | null, entrypointFunctionName: string, pathToEntrypointFunction: string, initialRoute: string, diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/dart/DartMessenger.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/dart/DartMessenger.ets index 77e926377e..6e9bfab834 100644 --- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/dart/DartMessenger.ets +++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/dart/DartMessenger.ets @@ -74,7 +74,7 @@ export class DartMessenger implements BinaryMessenger, PlatformMessageHandler { this.messageHandlers.delete(channel); return; } - let dartMessengerTaskQueue: DartMessengerTaskQueue | null; + let dartMessengerTaskQueue: DartMessengerTaskQueue | null = null; if( taskQueue != null) { dartMessengerTaskQueue = this.createdTaskQueues.get(taskQueue) ?? null; if(dartMessengerTaskQueue == null) { @@ -167,7 +167,7 @@ export class DartMessenger implements BinaryMessenger, PlatformMessageHandler { } if (!messageDeferred) { //ArkTS 没有线程池,任务队列使用异步实现 - if(handlerInfo.taskQueue != null) { + if(handlerInfo?.taskQueue != null) { this.asyncInvokeHandler(handlerInfo, message, replyId); } else { this.invokeHandler(handlerInfo, message, replyId); @@ -217,7 +217,7 @@ export class DartMessenger implements BinaryMessenger, PlatformMessageHandler { class HandlerInfo { handler: BinaryMessageHandler; taskQueue: DartMessengerTaskQueue | null; - constructor(handler: BinaryMessageHandler, taskQueue?:DartMessengerTaskQueue) { + constructor(handler: BinaryMessageHandler, taskQueue?:DartMessengerTaskQueue | null) { this.handler = handler; this.taskQueue = taskQueue ?? null; } -- Gitee