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 e87ee85e6a666d83b54f94dcce1b624bfc39f3be..7eba67a0d0c2b2959e5875d6646807a8045586bc 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 77e926377ef428c29344019085a800f725e8354c..6e9bfab834fbdc2b0929e774ecd94c78d4683e7a 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; }