diff --git a/.gitattributes b/.gitattributes
index 915d1ed51d121f1986c9dfe71cf1745c1a11286d..7d94e0961337f83b1b3f764a7e123a0a999561f8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
 # Dart sources have to be normalized so that source offsets in kernel files
 # with source embedded in them match across all platforms.
-*.dart text eol=lf
\ No newline at end of file
+*.dart text eol=lf
+*.patch* text eol=lf
\ No newline at end of file
diff --git a/OAT.xml b/OAT.xml
index 2e84930cccbbb65d5ed5a9f8d5aecb683bc7519b..d1c59fbe8b2e35818aaa218487c0109c32300fcf 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -142,9 +142,11 @@ used to filter file path.
             <filefilter name="licenseFileNamePolicyFilter" desc="Filters for LICENSE file policies">
             </filefilter>
             <filefilter name="readmeFileNamePolicyFilter" desc="Filters for README file policies">
+                <filteritem type="filepath" name="*README.md|*README.en.md" desc="README文件，不参与编译"/>
             </filefilter>
             <filefilter name="readmeOpenSourcefileNamePolicyFilter"
                 desc="Filters for README.OpenSource file policies">
+                <filteritem type="filepath" name="*README.md|*README.en.md" desc="README文件，不参与编译"/>
             </filefilter>
             <filefilter name="binaryFileTypePolicyFilter" desc="Filters for binary file policies">
                 <filteritem type="filename" name="*.iml|*.json|*.txt" desc="desc files" />
diff --git a/README.en.md b/README.en.md
index 1b57e89b92d73492261975d2ceeef0cfe3262632..571606e841ab216d0059f77bddcd84949b22a9d6 100644
--- a/README.en.md
+++ b/README.en.md
@@ -52,10 +52,14 @@ This warehouse is based on the extension of Flutter's official engine warehouse
 
 3. Synchronize code: In the engine directory, execute `gclient sync`; here the engine source code, official packages repository will be synchronized, and the ohos_setup task will be executed;
 
-4. Download sdk: Download ohos-sdk-full in [the daily build](http://ci.openharmony.cn/workbench/cicd/dailybuild/dailylist), configure the following environment variables:
+4. Download sdk: From [HarmonyOS Kit List]（ https://developer.harmonyos.com/deveco-developer-suite/enabling/kit?currentPage=1&pageSize=100 ）Download supporting development tools, currently not supporting packages downloaded from other channels
 
 ```sh
-export OHOS_SDK_HOME=<ohos-sdk-full>
+#HarmonyOS SDK, extract the directory after sdk/xxSDK.zip from the development kit package
+export HOS_SDK_HOME=/home/<user>/ohos/sdk
+
+#Unzip the bin subdirectory after commandline/commandline tools xxxx.zip in the development kit package
+export PATH=$PATH:/home/<user>/ohos/command-line-tools/bin
 ```
 
 5. Start building: In the engine directory, execute `./ohos` to start building the flutter engine that supports ohos devices.
@@ -64,13 +68,24 @@ export OHOS_SDK_HOME=<ohos-sdk-full>
 
 ## FAQ:
 1. When running the project, an error of Member notfound:'isOhos' is reported: Please ensure that all dart patches are applied in the src/third_party/dart directory (the patches are located in the src/flutter/attachment/repos directory, and you can use git apply to apply the patch). Recompile the engine after patching
-   
+
 2. Prompt Permission denied: Execute chmod +x <script file> to add execution permissions
 
 3. Compile the engine in debug/release/profile mode separately: `./ohos -t debug|release|profile`
 
 4. See help: `./ohos -h`
 
+5. Due to the different ways Windows, macOS, and Linux handle line endings, applying Dart patches can result in different Dart VM snapshot hash values. You can obtain the current snapshot hash value using the following method:
+
+   ```shell
+   python xxx/src/third_party/dart/tools/make_version.py --format='{{SNAPSHOT_HASH}}'
+   ```
+
+   Here, xxx is the engine path you created yourself.
+
+   If the obtained value is not "8af474944053df1f0a3be6e6165fa7cf", then you need to check whether all lines at the end of the xxx/src/third_party/dart/runtime/vm/dart.cc file and the xxx/src/third_party/dart/runtime/vm/image_snapshot.cc file end with LF. On Windows, you can use Notepad++; for other systems, please consult specific methods on your own.
+
+
 
 ## Embedding layer code construction guide
 
@@ -81,16 +96,17 @@ export OHOS_SDK_HOME=<ohos-sdk-full>
      nodejs.dir=<nodejs sdk directory>
      ```
 
-2. In the shell/platform/ohos/flutter_embedding directory, execute
+2. You need to copy the file `libflutter.so` to `shell/platform/ohos/flutter_embedding/libs/arm64-v8a/` 
+
+3. In the shell/platform/ohos/flutter_embedding directory, execute
 
      ```
-     ./hvigorw --mode module -p module=flutter@default -p product=default assembleHar --no-daemon
+     # The optional values for buildMode are: debug release profile
+     ./hvigorw --mode module -p module=flutter@default -p product=default -p buildMode=debug assembleHar --no-daemon
      ```
 
 
 
-3. The har file output path is: shell/platform/ohos/flutter_embedding/flutter/build
+4. The har file output path is: shell/platform/ohos/flutter_embedding/flutter/build/default/outputs/default/flutter.har
 
 ps: If you are using the Beta version of DevEco Studio and encounter the error "must have required property 'compatibleSdkVersion', location: build-profile.json5:17:11" when compiling the project, please refer to the "DevEco Studio Environment Configuration Guide." docx》Chapter '6 Creating Projects and Running Hello World' [Configuration Plugin] Modify the shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5 file.
-
-[hvigor-dependencies-config](shell/platform/ohos/flutter_embedding/dependencies/hvigor-dependencies-config.md)
diff --git a/README.md b/README.md
index 5cb27d599c6e68ef28d28da501eef57e066c26d8..909189f0d1aa75f3f2e2935d685db427a13235f1 100644
--- a/README.md
+++ b/README.md
@@ -53,10 +53,14 @@ Flutter Engine
 
 3. 同步代码：在engine目录，执行`gclient sync`；这里会同步engine源码、官方packages仓，还有执行ohos_setup任务；
 
-4. 下载sdk： 在[每日构建](http://ci.openharmony.cn/workbench/cicd/dailybuild/dailylist)下载ohos-sdk-full，配置以下环境变量:
+4. 下载sdk： 从[鸿蒙套件列表](https://developer.harmonyos.com/deveco-developer-suite/enabling/kit?currentPage=1&pageSize=100)下载配套开发工具，暂不支持非该渠道下载的套件
 
 ```sh
-export OHOS_SDK_HOME=<ohos-sdk-full>
+# HarmonyOS SDK，解压开发套件包中 sdk/xxSDK.zip 之后的目录
+export HOS_SDK_HOME=/home/<user>/ohos/sdk
+
+# 解压开发套件包中 commandline/commandline-tools-xxxx.zip 之后 bin 子目录
+export PATH=$PATH:/home/<user>/ohos/command-line-tools/bin
 ```
 
 5. 开始构建：在engine目录，执行`./ohos`，即可开始构建支持ohos设备的flutter engine。
@@ -76,6 +80,17 @@ export OHOS_SDK_HOME=<ohos-sdk-full>
 
 4. 查看帮助：`./ohos -h`
 
+5. 由于windows和mac、linux对换行符处理方式不同，在应用dart补丁时会造成dart vm snapshot hash结果不同，可通过以下方法获取当前snapshot hash值
+
+   ```shell
+   python xxx/src/third_party/dart/tools/make_version.py --format='{{SNAPSHOT_HASH}}'
+   ```
+
+   其中xxx为创建的engine路径
+
+   如果获取到的值不是“8af474944053df1f0a3be6e6165fa7cf”那么就需要检查xxx/src/third_party/dart/runtime/vm/dart.cc文件和xxx/src/third_party/dart/runtime/vm/image_snapshot.cc文件中全部行的结尾是不是以LF结尾的，windows可以使用notepad++查看，其它系统具体方法请自行查询
+
+
 ## embedding层代码构建指导
 
 1. 编辑shell/platform/ohos/flutter_embedding/local.properties：
@@ -85,14 +100,15 @@ export OHOS_SDK_HOME=<ohos-sdk-full>
     nodejs.dir=<nodejs的sdk目录>
     ```
 
-2. 在shell/platform/ohos/flutter_embedding目录下，执行 
+2. 你需要复制文件 `libflutter.so` 到 `shell/platform/ohos/flutter_embedding/libs/arm64-v8a/`
+
+3. 在shell/platform/ohos/flutter_embedding目录下，执行 
 
     ```
-    ./hvigorw --mode module -p module=flutter@default -p product=default assembleHar --no-daemon
+    # buildMode可选值为: debug release profile
+    ./hvigorw --mode module -p module=flutter@default -p product=default -p buildMode=debug assembleHar --no-daemon
     ```
 
-3. har文件输出路径为：shell/platform/ohos/flutter_embedding/flutter/build
+4. har文件输出路径为：shell/platform/ohos/flutter_embedding/flutter/build/default/outputs/default/flutter.har
 
 ps:如果你使用的是DevEco Studio的Beta版本，编译工程时遇到“must have required property 'compatibleSdkVersion', location: build-profile.json5:17:11"错误，请参考《DevEco Studio环境配置指导.docx》中的‘6 创建工程和运行Hello World’【配置插件】章节修改 shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5文件。
-
-[hvigor本地依赖配置](shell/platform/ohos/flutter_embedding/dependencies/hvigor-dependencies-config.md)
diff --git a/attachment/repos/bootstrap/ohos.py b/attachment/repos/bootstrap/ohos.py
index 21022e045442452b15fc086c37bfb8571471c03e..4b0395bd357c2996a1e8ab99e20e409b6d3f5d8c 100644
--- a/attachment/repos/bootstrap/ohos.py
+++ b/attachment/repos/bootstrap/ohos.py
@@ -105,7 +105,7 @@ def engineClean(buildInfo):
 
 
 def findFile(path, search, results):
-    if not os.path.exists(path):
+    if not path or not os.path.exists(path):
         return
     for item in os.listdir(path):
         cur_path = os.path.join(path, item)
@@ -127,35 +127,14 @@ def getNdkHome():
     if not OHOS_NDK_HOME:
         OHOS_NDK_HOME = findNativeInCurrentDir()
     if not OHOS_NDK_HOME:
-        OHOS_SDK_HOME = os.getenv("OHOS_SDK_HOME")
-        sdkInt = 0
-        if ('openharmony' in os.getenv("HOS_SDK_HOME")):
-            print('dddd')
-            OHOS_SDK_HOME = "%s/openharmony" % os.getenv("HOS_SDK_HOME")
-            if os.path.exists(OHOS_SDK_HOME):
-                for dir in os.listdir(OHOS_SDK_HOME):
-                    try:
-                        tmpInt = int(dir)
-                        sdkInt = max(sdkInt, tmpInt)
-                    except:
-                        logging.warning("Parse int error, dir=%s" % dir)
-            if sdkInt == 0:
-                logging.error(
-                    "Ohos sdkInt parse failed, please config the correct environment variable."
-                    " Such as: 'export OHOS_SDK_HOME=~/ohos/sdk/openharmony'."
-                )
-                exit(20)
-            OHOS_NDK_HOME = os.path.join(OHOS_SDK_HOME, str(sdkInt), "native")
-        else:
-            print('go here')
-            OHOS_NDK_HOME = "%s/HarmonyOS-NEXT-DP1/base/native" % os.getenv("HOS_SDK_HOME")
+        dirs = []
+        findFile(os.getenv("OHOS_SDK_HOME"), "native", dirs)
+        findFile(os.getenv("HOS_SDK_HOME"), "native", dirs)
+        for dir in dirs:
+            if isNdkValid(dir):
+                OHOS_NDK_HOME = dir
     logging.info("OHOS_NDK_HOME = %s" % OHOS_NDK_HOME)
-    if (
-        (not os.path.exists(OHOS_NDK_HOME))
-        or (not os.path.exists(OHOS_NDK_HOME + "/sysroot"))
-        or (not os.path.exists(OHOS_NDK_HOME + "/llvm/bin"))
-        or (not os.path.exists(OHOS_NDK_HOME + "/build-tools/cmake/bin"))
-    ):
+    if not isNdkValid(OHOS_NDK_HOME):
         logging.error(
             """
     Please set the environment variables for HarmonyOS SDK to "HOS_SDK_HOME" or "OHOS_SDK_HOME".
@@ -165,6 +144,21 @@ def getNdkHome():
         exit(10)
     return OHOS_NDK_HOME
 
+# 校验 native
+def isNdkValid(path):
+    if not path:
+        return False
+    dirs = [
+        os.path.join(path),
+        os.path.join(path, 'sysroot'),
+        os.path.join(path, 'llvm', 'bin'),
+        os.path.join(path, 'build-tools', 'cmake', 'bin')
+    ]
+    for dir in dirs:
+        if not os.path.exists(dir):
+            return False
+    return True
+
 
 # 指定engine编译的配置参数
 def engineConfig(buildInfo, extraParam=""):
@@ -209,49 +203,21 @@ def engineCompile(buildInfo):
     runCommand("ninja -C %s" % os.path.join("src", "out", getOutput(buildInfo)))
 
 
-# 替换文件中的字符串
-def replaceStr(file, regex, newstr):
-    with open(file, "r", encoding="utf-8") as f1:
-        lines = f1.readlines()
-    with open(file, "w+", encoding="utf-8") as f2:
-        for line in lines:
-            a = re.sub(regex, newstr, line)
-            f2.writelines(a)
-
-
 # 编译har文件
 def harBuild(buildInfo):
     buildType = buildInfo.buildType
-    isDebug = "true" if buildType == "debug" else "false"
-    isProfile = "true" if buildType == "profile" else "false"
-    dirEmbedding = os.path.abspath(
-        "%s/src/flutter/shell/platform/ohos/flutter_embedding" % DIR_ROOT
-    )
-    targetFile = os.path.abspath(
-        "%s/flutter/src/main/ets/embedding/engine/loader/FlutterApplicationInfo.ets"
-        % dirEmbedding
-    )
-    logging.info("isDebugMode=%s, isProfile=%s" % (isDebug, isProfile))
-    replaceStr(targetFile, "isDebugMode = .*", "isDebugMode = %s;" % isDebug)
-    replaceStr(targetFile, "isProfile = .*", "isProfile = %s;" % isProfile)
+    buildOut = getOutput(buildInfo)
     runCommand(
-        ("cd %s && " % dirEmbedding)
-        + (".%s" % os.sep)
-        + "hvigorw --mode module -p module=flutter@default -p product=default assembleHar --no-daemon"
-        + " && cd %s" % DIR_ROOT
-    )
-    fileSrc = os.path.abspath(
-        "%s/flutter/build/default/outputs/default/flutter.har" % (dirEmbedding)
-    )
-    fileDest = safeGetPath(
-        "%s/src/out/%s/ohos/flutter_embedding.har" % (DIR_ROOT, getOutput(buildInfo)),
-        isDirectory=False,
-    )
-    shutil.copy(fileSrc, fileDest)
-    logging.info(
-        "Copy result is %s, from %s to %s"
-        % (os.path.exists(fileDest), fileSrc, fileDest)
+        "python3 ./src/build/ohos/ohos_create_flutter_har.py "
+        + "--embedding_src ./src/flutter/shell/platform/ohos/flutter_embedding "
+        + "--build_dir ./src/out/%s/obj/ohos/flutter_embedding " % buildOut
+        + "--build_type %s " % buildType
+        + "--output ./src/out/%s/flutter.har " % buildOut
+        + "--native_lib ./src/out/%s/libflutter.so " % buildOut
+        + "--ohos_abi %s " % "arm64-v8a"
+        + "--ohos_api_int %s " % 11
     )
+    
 
 
 def isPathValid(filepath, filename, includes, excludes):
@@ -307,7 +273,7 @@ def zipFiles(buildInfo, useZip2=False):
         sdkVer = getNdkHome()[-30:-12]
     outputName = getOutput(buildInfo)
     fileIn = os.path.abspath("%s/src/out/%s" % (DIR_ROOT, outputName))
-    fileName = "ohos_api%s_%s-%s-%s-%s" % (
+    fileName = "ohos_%s_%s-%s-%s-%s" % (
         sdkVer,
         buildInfo.buildType,
         OS_NAME,
@@ -315,17 +281,9 @@ def zipFiles(buildInfo, useZip2=False):
         TIME_STR,
     )
     prefixInZip = os.path.join("src", "out", outputName)
+    excludes = ["obj", "exe.unstripped", "so.unstripped"]
     if IS_WINDOWS:
-        excludes = [
-            ".*\.ilk",
-            ".*\.pdb",
-        ]
-    else:
-        excludes = [
-            "obj",
-            "exe.unstripped",
-            "so.unstripped",
-        ]
+        excludes.extend([".*\.ilk", ".*\.pdb"])
     zipFileDir(fileIn, fileName, prefixInZip, excludes=excludes, useZip2=useZip2)
 
 
@@ -367,6 +325,7 @@ def updateCode(args):
         runCommand("git -C %s stash save 'Auto stash save.'" % dir)
         runCommand("git -C %s checkout %s" % (dir, args.branch))
         runCommand("git -C %s pull --rebase" % dir, checkCode=False)
+        runCommand("git -C %s log -1" % dir)
         runCommand("python3 src/flutter/attachment/scripts/ohos_setup.py")
 
 
diff --git a/attachment/repos/build.patch b/attachment/repos/build.patch
index c3df91e35fb66e5af9b41004b66ad0e6af1f644f..7dd52e5b16332809ddd85dcf3a179af9737c7778 100644
--- a/attachment/repos/build.patch
+++ b/attachment/repos/build.patch
@@ -12,18 +12,10 @@ index 4e62965..ea49a53 100644
      libs = [ "dl" ]
    }
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
-index b8d0f47..d789796 100644
+index b8d0f47..a3d1ed9 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
-@@ -34,6 +34,7 @@
- # When writing build files, to do something only for the host:
- #   if (current_toolchain == host_toolchain) { ...
- 
-+
- if (target_os == "") {
-   target_os = host_os
- }
-@@ -190,6 +191,7 @@ if (current_os == "win") {
+@@ -190,6 +190,7 @@ if (current_os == "win") {
    is_fuchsia_host = false
    is_ios = false
    is_linux = false
@@ -31,7 +23,7 @@ index b8d0f47..d789796 100644
    is_mac = false
    is_posix = false
    is_win = true
-@@ -198,6 +200,7 @@ if (current_os == "win") {
+@@ -198,6 +199,7 @@ if (current_os == "win") {
    is_android = false
    is_chromeos = false
    is_fuchsia = false
@@ -39,7 +31,7 @@ index b8d0f47..d789796 100644
    is_fuchsia_host = false
    is_ios = false
    is_linux = false
-@@ -212,6 +215,7 @@ if (current_os == "win") {
+@@ -212,6 +214,7 @@ if (current_os == "win") {
    is_fuchsia_host = false
    is_ios = false
    is_linux = false
@@ -47,7 +39,7 @@ index b8d0f47..d789796 100644
    is_mac = false
    is_posix = true
    is_win = false
-@@ -223,6 +227,7 @@ if (current_os == "win") {
+@@ -223,6 +226,7 @@ if (current_os == "win") {
    is_fuchsia_host = false
    is_ios = false
    is_linux = true
@@ -55,7 +47,7 @@ index b8d0f47..d789796 100644
    is_mac = false
    is_posix = true
    is_win = false
-@@ -237,6 +242,7 @@ if (current_os == "win") {
+@@ -237,6 +241,7 @@ if (current_os == "win") {
    is_fuchsia_host = false
    is_ios = false
    is_linux = false
@@ -63,7 +55,7 @@ index b8d0f47..d789796 100644
    is_mac = false
    is_posix = true
    is_win = false
-@@ -248,6 +254,19 @@ if (current_os == "win") {
+@@ -248,6 +253,19 @@ if (current_os == "win") {
    is_fuchsia_host = false
    is_ios = true
    is_linux = false
@@ -83,7 +75,7 @@ index b8d0f47..d789796 100644
    is_mac = false
    is_posix = true
    is_win = false
-@@ -259,6 +278,7 @@ if (current_os == "win") {
+@@ -259,6 +277,7 @@ if (current_os == "win") {
    is_fuchsia_host = false
    is_ios = false
    is_linux = true
@@ -91,7 +83,7 @@ index b8d0f47..d789796 100644
    is_mac = false
    is_posix = true
    is_win = false
-@@ -270,6 +290,7 @@ if (current_os == "win") {
+@@ -270,6 +289,7 @@ if (current_os == "win") {
    is_fuchsia_host = false
    is_ios = false
    is_linux = false
@@ -99,7 +91,7 @@ index b8d0f47..d789796 100644
    is_mac = false
    is_posix = true
    is_win = false
-@@ -281,6 +302,7 @@ if (current_os == "win") {
+@@ -281,6 +301,7 @@ if (current_os == "win") {
    is_fuchsia_host = false
    is_ios = false
    is_linux = false
@@ -107,7 +99,7 @@ index b8d0f47..d789796 100644
    is_mac = false
    is_posix = false
    is_win = false
-@@ -313,7 +335,7 @@ if (!is_clang && using_sanitizer) {
+@@ -313,7 +334,7 @@ if (!is_clang && using_sanitizer) {
    is_clang = true
  }
  
@@ -116,18 +108,18 @@ index b8d0f47..d789796 100644
  
  if (is_msan && !is_linux) {
    assert(false, "Memory sanitizer is only available on Linux.")
-@@ -365,7 +387,9 @@ if (is_posix) {
+@@ -365,7 +386,9 @@ if (is_posix) {
    ]
  }
  
 -if (is_linux) {
-+if(is_ohos || (is_linux && host_os == "mac")){
++if (is_ohos || (is_linux && host_os == "mac")) {
 +  _native_compiler_configs += [ "//build/config/ohos:sdk" ]
-+  }else if (is_linux) {
++} else if (is_linux) {
    _native_compiler_configs += [ "//build/config/linux:sdk" ]
  } else if (is_mac) {
    _native_compiler_configs += [ "//build/config/mac:sdk" ]
-@@ -510,8 +534,18 @@ shlib_toolchain = false
+@@ -510,8 +533,18 @@ shlib_toolchain = false
  if (custom_toolchain != "") {
    assert(custom_sysroot != "")
    assert(custom_target_triple != "")
@@ -147,22 +139,20 @@ index b8d0f47..d789796 100644
  } else if (is_win) {
    if (is_clang) {
      host_toolchain = "//build/toolchain/win:clang_$host_cpu"
-@@ -544,6 +578,21 @@ if (custom_toolchain != "") {
+@@ -544,6 +577,19 @@ if (custom_toolchain != "") {
    } else {
      set_default_toolchain("//build/toolchain/android:$current_cpu")
    }
 +} else if (is_ohos) {
++  set_default_toolchain("//build/toolchain/custom")
 +  if (host_os == "linux") {
 +    if (is_clang) {
 +      host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
-+      set_default_toolchain("//build/toolchain/linux:clang_$current_cpu")
 +    } else {
 +      host_toolchain = "//build/toolchain/linux:$host_cpu"
-+      set_default_toolchain("//build/toolchain/linux:$current_cpu")
 +    }
 +  } else if (host_os == "mac") {
 +    host_toolchain = "//build/toolchain/mac:clang_$host_cpu"
-+    set_default_toolchain("//build/toolchain/ohos:clang_$current_cpu")
 +  } else {
 +    assert(false, "Unknown host for ohos cross compile")
 +  }
@@ -170,10 +160,10 @@ index b8d0f47..d789796 100644
    if (is_clang) {
      host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index ba20010..24a7d4e 100644
+index ba20010..67371f5 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -191,11 +191,18 @@ config("compiler") {
+@@ -191,10 +191,16 @@ config("compiler") {
      # CPU architecture. We may or may not be doing a cross compile now, so for
      # simplicity we always explicitly set the architecture.
      if (current_cpu == "x64") {
@@ -181,61 +171,64 @@ index ba20010..24a7d4e 100644
 -        "-m64",
 -        "-march=x86-64",
 -      ]
-+      if  ( is_ohos ){
++      if (is_ohos) {
 +        cflags += [
 +          "-m64",
 +        ]
-+      }else {
++      } else {
 +        cflags += [
 +          "-m64",
 +          "-march=x86-64",
 +        ]
 +      }
        ldflags += [ "-m64" ]
-+
      } else if (current_cpu == "x86") {
        cflags += [ "-m32" ]
-       ldflags += [ "-m32" ]
-@@ -315,7 +322,7 @@ config("compiler") {
+@@ -315,7 +321,7 @@ config("compiler") {
  
    # Linux/Android common flags setup.
    # ---------------------------------
 -  if (is_linux || is_android) {
-+  if (is_linux || is_android || is_ohos ) {
++  if (is_linux || is_android || is_ohos) {
      cflags += [
        "-fPIC",
        "-pipe",  # Use pipes for communicating between sub-processes. Faster.
-@@ -334,7 +341,16 @@ config("compiler") {
+@@ -334,7 +340,16 @@ config("compiler") {
  
    # Linux-specific compiler flags setup.
    # ------------------------------------
 -  if (is_linux) {
-+  if (is_ohos ) {
++  if (is_ohos) {
 +    cflags += [ "-pthread" ]
 +    ldflags += [ "-pthread" ]
 +
 +    if (current_cpu == "arm64") {
-+    cflags += [ "--target=aarch64-linux-ohos" ]
-+    ldflags += [ "--target=aarch64-linux-ohos" ]
++      cflags += [ "--target=aarch64-linux-ohos" ]
++      ldflags += [ "--target=aarch64-linux-ohos" ]
 +      cflags += [ "-DBORINGSSL_CLANG_SUPPORTS_DOT_ARCH" ]
 +    }
-+  }else if (is_linux  ) {
++  } else if (is_linux) {
      cflags += [ "-pthread" ]
      ldflags += [ "-pthread" ]
  
-@@ -521,8 +537,8 @@ config("runtime_library") {
+@@ -521,9 +536,13 @@ config("runtime_library") {
        ldflags += [ "-nostdlib++" ]
      }
      include_dirs = [
 -      "//third_party/libcxx/include",
        "//third_party/libcxxabi/include",
-+      "$custom_toolchain/include/c++/v1",
      ]
++    if (custom_toolchain != "") {
++      include_dirs += [ "$custom_toolchain/include/c++/v1" ]
++    } else {
++      include_dirs += [ "//third_party/libcxx/include" ]
++    }
    }
  
+   # Android standard library setup.
 diff --git a/build/config/ohos/BUILD.gn b/build/config/ohos/BUILD.gn
 new file mode 100644
-index 0000000..1d29b40
+index 0000000..b2675d2
 --- /dev/null
 +++ b/build/config/ohos/BUILD.gn
 @@ -0,0 +1,29 @@
@@ -243,6 +236,7 @@ index 0000000..1d29b40
 +# Use of this source code is governed by a BSD-style license that can be
 +# found in the LICENSE file.
 +
++import("//build/config/ohos/config.gni")
 +import("//build/config/ohos/pkg_config.gni")
 +import("//build/config/features.gni")
 +import("//build/config/sysroot.gni")
@@ -267,7 +261,25 @@ index 0000000..1d29b40
 +config("fontconfig") {
 +  libs = [  ]
 +}
+diff --git a/build/config/ohos/config.gni b/build/config/ohos/config.gni
+new file mode 100644
+index 0000000..0022d70
+--- /dev/null
++++ b/build/config/ohos/config.gni
+@@ -0,0 +1,13 @@
++# Copyright 2014 The Chromium Authors. All rights reserved.
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
 +
++# This file contains common system config stuff for the Ohos build.
++
++if (is_ohos) {
++  if (current_cpu == "arm64") {
++    ohos_app_abi = "arm64-v8a"
++  } else {
++    assert(false, "Unknown Ohos ABI: " + current_cpu)
++  }
++}
 diff --git a/build/config/ohos/pkg-config.py b/build/config/ohos/pkg-config.py
 new file mode 100644
 index 0000000..b4a6aff
@@ -703,6 +715,145 @@ index 7987e51..cd7b060 100644
      if (current_cpu == "x64") {
        sysroot = rebase_path("//build/linux/debian_sid_amd64-sysroot")
      } else {
+diff --git a/build/ohos/ohos_create_flutter_har.py b/build/ohos/ohos_create_flutter_har.py
+new file mode 100644
+index 0000000..fc46359
+--- /dev/null
++++ b/build/ohos/ohos_create_flutter_har.py
+@@ -0,0 +1,133 @@
++#!/usr/bin/env python3
++#
++# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
++# 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.
++
++"""Create a HAR incorporating all the components required to build a Flutter application"""
++
++import argparse
++import logging
++import os
++import re
++import shutil
++import subprocess
++import sys
++
++
++HAR_CONFIG_TEMPLATE = """
++{
++  "app": {
++    "signingConfigs": [],
++    "products": [
++      {
++        "name": "default",
++        "signingConfig": "default",
++        "compileSdkVersion": "%s",
++        "compatibleSdkVersion": "%s",
++        "runtimeOS": "HarmonyOS",
++      }
++    ],
++    "buildModeSet": [
++      {
++        "name": "debug",
++      },
++      {
++        "name": "release"
++      },
++      {
++        "name": "profile"
++      },
++    ]
++  },
++  "modules": [
++    {
++      "name": "flutter",
++      "srcPath": "./flutter"
++    }
++  ]
++}
++"""
++
++
++# 更新har的配置文件，指定编译使用的api版本
++def updateConfig(buildDir, apiInt):
++    apiStr = "4.1.0(11)" if apiInt == 11 else "4.0.0(10)"
++    jsonFile = os.path.join(buildDir, "build-profile.json5")
++    with open(jsonFile, "w", encoding="utf-8") as file:
++        file.write(HAR_CONFIG_TEMPLATE % (apiStr, apiStr))
++
++
++# 执行命令
++def runCommand(command, checkCode=True, timeout=None):
++    logging.info("runCommand start, command = %s" % (command))
++    code = subprocess.Popen(command, shell=True).wait(timeout)
++    if code != 0:
++        logging.error("runCommand error, code = %s, command = %s" % (code, command))
++        if checkCode:
++            exit(code)
++    else:
++        logging.info("runCommand finish, code = %s, command = %s" % (code, command))
++
++
++# 编译har文件，通过hvigorw的命令行参数指定编译类型(debug/release/profile)
++def buildHar(buildDir, apiInt, buildType):
++    updateConfig(buildDir, apiInt)
++    runCommand(
++        "cd %s && .%shvigorw clean --mode module " % (buildDir, os.sep)
++        + "-p module=flutter@default -p product=default -p buildMode=%s " % buildType
++        + "assembleHar --no-daemon"
++    )
++
++
++def main():
++    parser = argparse.ArgumentParser()
++    parser.add_argument("--embedding_src", help="Path of embedding source code.")
++    parser.add_argument("--build_dir", help="Path to build.")
++    parser.add_argument(
++        "--build_type",
++        choices=["debug", "release", "profile"],
++        help="Type to build har.",
++    )
++    parser.add_argument("--output", help="Path to output har.")
++    parser.add_argument("--native_lib", action="append", help="Native code library.")
++    parser.add_argument("--ohos_abi", help="Native code ABI.")
++    parser.add_argument(
++        "--ohos_api_int", type=int, choices=[10, 11], help="Ohos api int."
++    )
++    options = parser.parse_args()
++    # copy source code
++    if os.path.exists(options.build_dir):
++        shutil.rmtree(options.build_dir)
++    shutil.copytree(options.embedding_src, options.build_dir)
++
++    # copy so files
++    for file in options.native_lib:
++        dir_name, full_file_name = os.path.split(file)
++        targetDir = os.path.join(options.build_dir, "flutter/libs", options.ohos_abi)
++        if not os.path.exists(targetDir):
++            os.makedirs(targetDir)
++        shutil.copyfile(
++            file,
++            os.path.join(targetDir, full_file_name),
++        )
++    buildHar(options.build_dir, options.ohos_api_int, options.build_type)
++    shutil.copyfile(
++        os.path.join(
++            options.build_dir, "flutter/build/default/outputs/default/flutter.har"
++        ),
++        options.output,
++    )
++
++
++if __name__ == "__main__":
++    sys.exit(main())
 diff --git a/build/ohos/sysroot_ld_path.sh b/build/ohos/sysroot_ld_path.sh
 new file mode 100755
 index 0000000..4b8bf73
diff --git a/attachment/repos/dart.patch0 b/attachment/repos/dart.patch0
index 86799577ec6d66883c4e47daf241eb9d430e358d..04ca043cec6ffd71361c290ec56a2728f68b4704 100644
--- a/attachment/repos/dart.patch0
+++ b/attachment/repos/dart.patch0
@@ -1,4 +1,4 @@
-diff --git a/pkg/dds/lib/dds.dart b/pkg/dds/lib/dds.dart
+diff --git a/pkg/dds/lib/dds.dart b/pkg/dds/lib/dds.dart 
 index 177a9265649..c7038c56ad7 100644
 --- a/pkg/dds/lib/dds.dart
 +++ b/pkg/dds/lib/dds.dart
diff --git a/attachment/repos/dart.patch1 b/attachment/repos/dart.patch1
index c76a5933e7dc7772ec96ac9d07326877398f7dad..ebab5d27e1353fa757c6b2deeb80110dada49b04 100644
--- a/attachment/repos/dart.patch1
+++ b/attachment/repos/dart.patch1
@@ -1,4 +1,4 @@
-diff --git a/BUILD.gn b/BUILD.gn
+diff --git a/BUILD.gn b/BUILD.gn 
 index a25f379b0ff..c413327b217 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
diff --git a/attachment/repos/dart.patch2 b/attachment/repos/dart.patch2
index 853cce68f56963e202ccc957cfe49b91a19ba5c2..04bfb0b5d8d315f8809983b58e70df2bd2aafcd1 100644
--- a/attachment/repos/dart.patch2
+++ b/attachment/repos/dart.patch2
@@ -1,4 +1,4 @@
-diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn
+diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn 
 index 7f89f9fcd06..edeb765c7e4 100644
 --- a/runtime/BUILD.gn
 +++ b/runtime/BUILD.gn
diff --git a/attachment/repos/skia.patch b/attachment/repos/skia.patch
index 455594c1ba654eb1d776fe23ed272fe9cdcd9a1d..d993bdffa7bae8ef54f07c45fbb2824284ef191c 100644
--- a/attachment/repos/skia.patch
+++ b/attachment/repos/skia.patch
@@ -327,59 +327,6 @@ index b43526fe1f..fb34289da7 100644
      ldflags = [
        "-rdynamic",
        "-Wl,-rpath,\$ORIGIN",
-diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
-index ab23b24edd..c5f714712b 100644
---- a/src/core/SkCanvas.cpp
-+++ b/src/core/SkCanvas.cpp
-@@ -82,6 +82,16 @@ static_assert(std::max(3,4) == 4);
- 
- using Slug = sktext::gpu::Slug;
- 
-+#ifdef  TARGET_OS_OHOS
-+#include <hilog/log.h>
-+#define  SKIA_LOG_INFO     LOG_INFO
-+#define  SKIA_TAG  "XComSkia"
-+//int OH_LOG_Print(int type, HiLog_LogLevel level, unsigned int domain, const char *tag, const char *fmt, ...) ;
-+#define OHOS_LOG_DEBUG(...)   (void) OH_LOG_Print(LOG_APP,SKIA_LOG_INFO,LOG_DOMAIN,SKIA_TAG,__VA_ARGS__)
-+#else
-+#define OHOS_LOG_DEBUG(...)
-+#endif
-+
- ///////////////////////////////////////////////////////////////////////////////////////////////////
- 
- /*
-@@ -2044,7 +2054,7 @@ void SkCanvas::onDrawPaint(const SkPaint& paint) {
- }
- 
- void SkCanvas::internalDrawPaint(const SkPaint& paint) {
--    // drawPaint does not call internalQuickReject() because computing its geometry is not free
-+    // drawPaint does not call exitinternalQuickReject() because computing its geometry is not free
-     // (see getLocalClipBounds(), and the two conditions below are sufficient.
-     if (paint.nothingToDraw() || this->isClipEmpty()) {
-         return;
-@@ -2358,16 +2368,22 @@ void SkCanvas::onDrawImageRect2(const SkImage* image, const SkRect& src, const S
-     SkPaint realPaint = clean_paint_for_drawImage(paint);
-     SkSamplingOptions realSampling = clean_sampling_for_constraint(sampling, constraint);
- 
-+    OHOS_LOG_DEBUG("SkCanvas::onDrawImageRect2 ...enter ");
-     if (this->internalQuickReject(dst, realPaint)) {
-+        OHOS_LOG_DEBUG("SkCanvas::onDrawImageRect2 ...internalQuickReject  rejected");
-         return;
-     }
- 
-+    OHOS_LOG_DEBUG("SkCanvas::onDrawImageRect2 ...aboutToDraw");
-     auto layer = this->aboutToDraw(this, realPaint, &dst, CheckForOverwrite::kYes,
-                                    image->isOpaque() ? kOpaque_ShaderOverrideOpacity
-                                                      : kNotOpaque_ShaderOverrideOpacity);
-+
-     if (layer) {
-+        OHOS_LOG_DEBUG("SkCanvas::onDrawImageRect2 ...topDevice->drawImageRect");
-         this->topDevice()->drawImageRect(image, &src, dst, realSampling, layer->paint(), constraint);
-     }
-+    OHOS_LOG_DEBUG("SkCanvas::onDrawImageRect2 ...exit");
- }
- 
- void SkCanvas::onDrawImageLattice2(const SkImage* image, const Lattice& lattice, const SkRect& dst,
 diff --git a/src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp b/src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp
 index 78225b4610..c2105852b1 100644
 --- a/src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp
diff --git a/build/archives/BUILD.gn b/build/archives/BUILD.gn
index 90993ddb427930aab584a484190c10e702028f19..dd4fbdc66517078e684b9062cc3b0a526219a797 100644
--- a/build/archives/BUILD.gn
+++ b/build/archives/BUILD.gn
@@ -20,7 +20,7 @@ generated_file("artifacts_entitlement_config") {
   }
 }
 
-if (build_engine_artifacts && !is_android) {
+if (build_engine_artifacts && !is_android && !is_ohos) {
   zip_bundle("artifacts") {
     deps = [
       "//flutter/flutter_frontend_server:frontend_server",
@@ -129,6 +129,12 @@ if (build_engine_artifacts && !is_android) {
   }
 }
 
+if (is_ohos) {
+  group("artifacts") {
+    deps = [ "//flutter/shell/platform/ohos:flutter_har_zip" ]
+  }
+}
+
 if (host_os == "linux" || host_os == "win") {
   group("embedder") {
     deps = [ "//flutter/shell/platform/embedder:embedder-archive" ]
diff --git a/build/dart/rules.gni b/build/dart/rules.gni
index c239d536c13fbaf70b242396b5543ae0c2ec3886..d92acff60e6fc61214addbdd9089046f7dd3c281 100644
--- a/build/dart/rules.gni
+++ b/build/dart/rules.gni
@@ -155,7 +155,7 @@ template("flutter_snapshot") {
         } else {
           output_aot_lib = "libapp.so"
         }
-        libapp = "$target_gen_dir/ohos/libs/$output_aot_lib"
+        libapp = "$target_gen_dir/ohos/libs/$ohos_app_abi/$output_aot_lib"
         outputs += [ libapp ]
         args += [
           "--snapshot_kind=app-aot-elf",
diff --git a/common/config.gni b/common/config.gni
index 21a43ba4f89a36eeb0ed60772bc9d3b05fb2ca62..d74f2c9bc20c612c9b8e7fb48876a73d3c971e6f 100644
--- a/common/config.gni
+++ b/common/config.gni
@@ -6,6 +6,10 @@ if (is_android) {
   import("//build/config/android/config.gni")
 }
 
+if (is_ohos) {
+  import("//build/config/ohos/config.gni")
+}
+
 if (target_cpu == "arm" || target_cpu == "arm64") {
   import("//build/config/arm.gni")
 }
diff --git a/fml/logging_unittests.cc b/fml/logging_unittests.cc
index a64d33e52f3fbfe07eb0711d869470998b7d6141..74caf80d71735d5a80c619c0dd00f4810b796189 100644
--- a/fml/logging_unittests.cc
+++ b/fml/logging_unittests.cc
@@ -16,6 +16,10 @@
 #include "gmock/gmock.h"
 #endif
 
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wreturn-type"
+#endif
+
 namespace fml {
 namespace testing {
 
diff --git a/fml/message_loop_impl_unittests.cc b/fml/message_loop_impl_unittests.cc
index 1846f8c9d46bc07fd1318a8464948f040e6e6b9e..4225ef84e5f5bbd2108b70a1ae9807be9fd42fab 100644
--- a/fml/message_loop_impl_unittests.cc
+++ b/fml/message_loop_impl_unittests.cc
@@ -13,7 +13,7 @@
 #define TIMESENSITIVE(x) TimeSensitiveTest_##x
 
 TEST(MessageLoopImpl, TIMESENSITIVE(WakeUpTimersAreSingletons)) {
-  auto loop_impl = fml::MessageLoopImpl::Create();
+  auto loop_impl = fml::MessageLoopImpl::Create(nullptr);
 
   const auto t1 = fml::TimeDelta::FromMilliseconds(10);
   const auto t2 = fml::TimeDelta::FromMilliseconds(30);
diff --git a/impeller/playground/playground_impl.cc b/impeller/playground/playground_impl.cc
index 613de6e411a0cbb1230275c34aa915b2da6bc14a..e26f84ff6b1dde295c2d3b70c22c936e19dcb5c9 100644
--- a/impeller/playground/playground_impl.cc
+++ b/impeller/playground/playground_impl.cc
@@ -19,6 +19,10 @@
 #include "impeller/playground/backend/vulkan/playground_impl_vk.h"
 #endif  // IMPELLER_ENABLE_VULKAN
 
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wreturn-type"
+#endif
+
 namespace impeller {
 
 std::unique_ptr<PlaygroundImpl> PlaygroundImpl::Create(
diff --git a/impeller/renderer/backend/vulkan/context_vk.cc b/impeller/renderer/backend/vulkan/context_vk.cc
index db5574ce4ff941691548b3d3178294ce24f7b2fb..0427f9fdf0d928231b574473adf2a442d27ba442 100644
--- a/impeller/renderer/backend/vulkan/context_vk.cc
+++ b/impeller/renderer/backend/vulkan/context_vk.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 // FLUTTER_NOLINT: https://github.com/flutter/flutter/issues/68331
+#pragma clang diagnostic ignored "-Wc++11-narrowing"
 
 #include "impeller/renderer/backend/vulkan/context_vk.h"
 
diff --git a/impeller/renderer/backend/vulkan/render_pass_vk.cc b/impeller/renderer/backend/vulkan/render_pass_vk.cc
index 08d4cd6fadc26d83d29c0f120eb54411bff50ab9..2d20bd051043cf9001e1ca7f48750515fd9dd4a1 100644
--- a/impeller/renderer/backend/vulkan/render_pass_vk.cc
+++ b/impeller/renderer/backend/vulkan/render_pass_vk.cc
@@ -1,7 +1,9 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+#ifdef __clang__
 #pragma clang diagnostic ignored "-Wreturn-type"
+#endif
 
 #include "impeller/renderer/backend/vulkan/render_pass_vk.h"
 
diff --git a/impeller/tools/impeller.gni b/impeller/tools/impeller.gni
index 3df2553437f568f3cef604c7f748976abc9c08c2..e5dea68e12b99484f010137f0ed7545139c56b1d 100644
--- a/impeller/tools/impeller.gni
+++ b/impeller/tools/impeller.gni
@@ -14,11 +14,10 @@ declare_args() {
   impeller_enable_metal = is_ios
 
   # Whether the OpenGLES backend is enabled.
-  impeller_enable_opengles = is_linux || is_win || is_android ||is_ohos
+  impeller_enable_opengles = is_linux || is_win || is_android || is_ohos
 
   # Whether the Vulkan backend is enabled.
-  #impeller_enable_vulkan = is_mac || is_linux || is_win || is_android
-  impeller_enable_vulkan = is_win || is_android
+  impeller_enable_vulkan = (is_win || is_android || is_linux) && !is_ohos
 
   # Whether to use a prebuilt impellerc.
   # If this is the empty string, impellerc will be built.
diff --git a/shell/platform/android/android_surface_gl_impeller.cc b/shell/platform/android/android_surface_gl_impeller.cc
index 89cbf668a7d16597645209be641a20d4c830f7b3..5d66ab422ffd7d910c1b5c0248022c6a34872f5b 100644
--- a/shell/platform/android/android_surface_gl_impeller.cc
+++ b/shell/platform/android/android_surface_gl_impeller.cc
@@ -12,6 +12,10 @@
 #include "flutter/impeller/toolkit/egl/surface.h"
 #include "flutter/shell/gpu/gpu_surface_gl_impeller.h"
 
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wreturn-type"
+#endif
+
 namespace flutter {
 
 class AndroidSurfaceGLImpeller::ReactorWorker final
diff --git a/shell/platform/ohos/BUILD.gn b/shell/platform/ohos/BUILD.gn
index 8d18085468e772ad3fbb9ab6c40482c61e7fb387..7b888c0d6e3e9ab29fbd6c831731c0a7e0bef259 100644
--- a/shell/platform/ohos/BUILD.gn
+++ b/shell/platform/ohos/BUILD.gn
@@ -13,17 +13,25 @@
 
 assert(is_ohos)
 
+import("//build/config/ohos/config.gni")
+import("//build/toolchain/clang.gni")
 import("//flutter/build/zip_bundle.gni")
-import("//flutter/shell/platform/glfw/config.gni")
-import("//flutter/testing/testing.gni")
-import("//build/config/ohos/pkg_config.gni")
+import("//flutter/common/config.gni")
 import("//flutter/shell/gpu/gpu.gni")
+import("//flutter/shell/version/version.gni")
+import("//flutter/testing/testing.gni")
 
 group("ohos") {
   deps = [
-    ":flutter",
+    ":flutter_shell_native",
     #":publish_headers_ohos",
+    #":ohos_har",
+    ":flutter_har_zip",
+    ":ohos_symbols",
   ]
+  if (target_cpu != "x86") {
+    deps += [ ":gen_snapshot" ]
+  }
 }
 shell_gpu_configuration("ohos_gpu_configuration") {
   enable_software = true
@@ -192,13 +200,10 @@ executable("flutter_ohos_unittests") {
   ]
 }
 
-shared_library("flutter") {
+shared_library("flutter_shell_native") {
+  output_name = "flutter"
   deps = [ ":flutter_ohos_src" ]
 
-  if (flutter_runtime_mode == "profile") {
-    deps += [ "//flutter/shell/vmservice:vmservice_snapshot" ]
-  }
-
   ldflags = ["--rtlib=compiler-rt",
   "-fuse-ld=lld",
   "-static-libstdc++",
@@ -220,6 +225,9 @@ shared_library("flutter") {
   ldflags += ["-lrawfile.z"]
   ldflags += ["-lEGL"]
   ldflags += ["-lGLESv3"]
+  # ldflags += ["-lGLESv2"]
+  ldflags += ["-limage_ndk.z"]
+  ldflags += ["-lnative_image"]
 
   ldflags += ["-lc++_shared"]
   ldflags += ["-lm"]
@@ -268,3 +276,232 @@ shared_library("flutter") {
 #  ]
 #  files = tmp_files
 #}
+
+declare_args() {
+  embedding_artifact_id = "flutter_embedding_$flutter_runtime_mode"
+  embedding_har_filename = "$embedding_artifact_id.har"
+  embedding_har_path = "$root_out_dir/$embedding_har_filename"
+  engine_artifact_id =
+      string_replace(ohos_app_abi, "-", "_") + "_" + flutter_runtime_mode
+  engine_har_filename = "$engine_artifact_id.har"
+
+  ohos_zip_archive_dir = "ohos-$target_cpu"
+  if (flutter_runtime_mode != "debug") {
+    ohos_zip_archive_dir += "-$flutter_runtime_mode"
+  }
+  ohos_api_int = 11
+}
+
+action("ohos_har") {
+  script = "//build/ohos/ohos_create_flutter_har.py"
+
+  if (stripped_symbols) {
+    engine_library = "libflutter.so"
+  } else {
+    engine_library = "so.unstripped/libflutter.so"
+  }
+
+  inputs = [
+    # "$root_build_dir/$embedding_har_filename",
+    "$root_build_dir/$engine_library",
+  ]
+
+  outputs = [
+    "$root_build_dir/flutter.har",
+    # "$root_build_dir/$engine_har_filename",
+  ]
+
+  args = [
+    "--embedding_src",
+    "../../flutter/shell/platform/ohos/flutter_embedding",
+    "--build_dir",
+    "./obj/ohos/flutter_embedding",
+    "--build_type",
+    flutter_runtime_mode,
+    "--output",
+    rebase_path("flutter.har", root_build_dir, root_build_dir),
+    "--native_lib",
+    rebase_path("$engine_library", root_build_dir, root_build_dir),
+    "--ohos_abi",
+    ohos_app_abi,
+    "--ohos_api_int",
+    ohos_api_int
+  ]
+
+  deps = [
+    ":flutter_shell_native"
+  ]
+
+  if (flutter_runtime_mode == "profile") {
+    deps += [ "//flutter/shell/vmservice:vmservice_snapshot" ]
+    args += [
+      "--native_lib",
+      rebase_path(
+          "$root_gen_dir/flutter/shell/vmservice/ohos/libs/$ohos_app_abi/libvmservice_snapshot.so",
+          root_build_dir,
+          root_build_dir),
+    ]
+  }
+}
+
+zip_bundle("flutter_har_zip") {
+  output = "$ohos_zip_archive_dir/artifacts.zip"
+  files = [
+    {
+      source = "$root_build_dir/flutter.har"
+      destination = "flutter.har"
+    }
+  ]
+
+  deps = [ ":ohos_har" ]
+}
+
+zip_bundle("ohos_symbols") {
+  output = "$ohos_zip_archive_dir/symbols.zip"
+  files = [
+    {
+      source = "$root_build_dir/so.unstripped/libflutter.so"
+      destination = "libflutter.so"
+    },
+  ]
+
+  deps = [ ":flutter_shell_native" ]
+}
+
+generated_file("ohos_entitlement_config") {
+  outputs = [ "$target_gen_dir/ohos_entitlements.txt" ]
+  contents = [ "gen_snapshot" ]
+  deps = []
+}
+
+if (target_cpu != "x86") {
+  zip_bundle("gen_snapshot") {
+    gen_snapshot_bin = "gen_snapshot"
+    gen_snapshot_out_dir = get_label_info(
+            "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)",
+            "root_out_dir")
+    gen_snapshot_path = rebase_path("$gen_snapshot_out_dir/$gen_snapshot_bin")
+
+    if (host_os == "linux") {
+      output = "$ohos_zip_archive_dir/linux-x64.zip"
+    } else if (host_os == "mac") {
+      output = "$ohos_zip_archive_dir/darwin-x64.zip"
+    } else if (host_os == "win") {
+      output = "$ohos_zip_archive_dir/windows-x64.zip"
+      gen_snapshot_bin = "gen_snapshot.exe"
+      gen_snapshot_path = rebase_path("$root_out_dir/$gen_snapshot_bin")
+    }
+
+    files = [
+      {
+        source = gen_snapshot_path
+        destination = gen_snapshot_bin
+      },
+    ]
+
+    deps = [ "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)" ]
+  }
+
+  # TODO(godofredoc): Remove gen_snapshot and rename new_gen_snapshot when v2 migration is complete.
+  # BUG: https://github.com/flutter/flutter/issues/105351
+  zip_bundle("new_gen_snapshot") {
+    gen_snapshot_bin = "gen_snapshot"
+    gen_snapshot_out_dir = get_label_info(
+            "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)",
+            "root_out_dir")
+    gen_snapshot_path = rebase_path("$gen_snapshot_out_dir/$gen_snapshot_bin")
+
+    if (host_os == "linux") {
+      output = "$ohos_zip_archive_dir/$full_platform_name-$flutter_runtime_mode/linux-x64.zip"
+    } else if (host_os == "mac") {
+      output = "$ohos_zip_archive_dir/$full_platform_name-$flutter_runtime_mode/darwin-x64.zip"
+    } else if (host_os == "win") {
+      output = "$ohos_zip_archive_dir/$full_platform_name-$flutter_runtime_mode/windows-x64.zip"
+      gen_snapshot_bin = "gen_snapshot.exe"
+      gen_snapshot_path = rebase_path("$root_out_dir/$gen_snapshot_bin")
+    }
+
+    files = [
+      {
+        source = gen_snapshot_path
+        destination = gen_snapshot_bin
+      },
+    ]
+
+    deps = [ "//third_party/dart/runtime/bin:gen_snapshot($host_toolchain)" ]
+
+    if (host_os == "mac") {
+      deps += [ ":ohos_entitlement_config" ]
+      files += [
+        {
+          source = "$target_gen_dir/ohos_entitlements.txt"
+          destination = "entitlements.txt"
+        },
+      ]
+    }
+  }
+}
+
+if (target_cpu == "x64" || target_cpu == "arm64") {
+  zip_bundle("analyze_snapshot") {
+    deps =
+        [ "//third_party/dart/runtime/bin:analyze_snapshot($host_toolchain)" ]
+
+    analyze_snapshot_bin = "analyze_snapshot"
+    analyze_snapshot_out_dir =
+        get_label_info(
+            "//third_party/dart/runtime/bin:analyze_snapshot($host_toolchain)",
+            "root_out_dir")
+    analyze_snapshot_path =
+        rebase_path("$analyze_snapshot_out_dir/$analyze_snapshot_bin")
+
+    if (host_os == "linux") {
+      output = "$ohos_zip_archive_dir/analyze-snapshot-linux-x64.zip"
+    } else if (host_os == "mac") {
+      output = "$ohos_zip_archive_dir/analyze-snapshot-darwin-x64.zip"
+    } else if (host_os == "win") {
+      output = "$ohos_zip_archive_dir/analyze-snapshot-windows-x64.zip"
+      analyze_snapshot_bin = "analyze-snapshot.exe"
+      analyze_snapshot_path = rebase_path("$root_out_dir/$analyze_snapshot_bin")
+    }
+
+    files = [
+      {
+        source = analyze_snapshot_path
+        destination = analyze_snapshot_bin
+      },
+    ]
+  }
+
+  # TODO(godofredoc): Remove analyze_snapshot and rename new_analyze_snapshot when v2 migration is complete.
+  # BUG: https://github.com/flutter/flutter/issues/105351
+  zip_bundle("new_analyze_snapshot") {
+    deps =
+        [ "//third_party/dart/runtime/bin:analyze_snapshot($host_toolchain)" ]
+
+    analyze_snapshot_bin = "analyze_snapshot"
+    analyze_snapshot_out_dir =
+        get_label_info(
+            "//third_party/dart/runtime/bin:analyze_snapshot($host_toolchain)",
+            "root_out_dir")
+    analyze_snapshot_path =
+        rebase_path("$analyze_snapshot_out_dir/$analyze_snapshot_bin")
+
+    if (host_os == "linux") {
+      output = "$ohos_zip_archive_dir/$full_platform_name-$flutter_runtime_mode/analyze-snapshot-linux-x64.zip"
+    } else if (host_os == "mac") {
+      output = "$ohos_zip_archive_dir/$full_platform_name-$flutter_runtime_mode/analyze-snapshot-darwin-x64.zip"
+    } else if (host_os == "win") {
+      output = "$ohos_zip_archive_dir/$full_platform_name-$flutter_runtime_mode/analyze-snapshot-windows-x64.zip"
+      analyze_snapshot_bin = "analyze-snapshot.exe"
+      analyze_snapshot_path = rebase_path("$root_out_dir/$analyze_snapshot_bin")
+    }
+
+    files = [
+      {
+        source = analyze_snapshot_path
+        destination = analyze_snapshot_bin
+      },
+    ]
+  }
+}
diff --git a/shell/platform/ohos/flutter_embedding/.gitignore b/shell/platform/ohos/flutter_embedding/.gitignore
index 4510e76666c8541e4a1195a0ed2850754c9fc243..c5c48a55d35b577e3812111c745f37f9a3b56e44 100644
--- a/shell/platform/ohos/flutter_embedding/.gitignore
+++ b/shell/platform/ohos/flutter_embedding/.gitignore
@@ -8,3 +8,5 @@
 /.clang-format
 /.clang-tidy
 **/.test
+local.properties
+oh-package-lock.json5
diff --git a/shell/platform/ohos/flutter_embedding/build-profile.json5 b/shell/platform/ohos/flutter_embedding/build-profile.json5
index ae4533ee39e5c2954b75b7b19fe2ea1ef2b4ea82..2d2ee025698136d74f0a9ec4e9472bb263df8834 100755
--- a/shell/platform/ohos/flutter_embedding/build-profile.json5
+++ b/shell/platform/ohos/flutter_embedding/build-profile.json5
@@ -24,6 +24,17 @@
         "compatibleSdkVersion": "4.1.0(11)",
         "runtimeOS": "HarmonyOS",
       }
+    ],
+    "buildModeSet": [
+      {
+        "name": "debug",
+      },
+      {
+        "name": "release"
+      },
+      {
+        "name": "profile"
+      },
     ]
   },
   "modules": [
diff --git a/shell/platform/ohos/flutter_embedding/flutter/.gitignore b/shell/platform/ohos/flutter_embedding/flutter/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..0f8d09bf4527a826ed8b8d3b53150dd5bfd420a9
--- /dev/null
+++ b/shell/platform/ohos/flutter_embedding/flutter/.gitignore
@@ -0,0 +1,12 @@
+/node_modules
+/oh_modules
+/.idea
+**/build
+/.hvigor
+.cxx
+/.clangd
+/.clang-format
+/.clang-tidy
+**/.test
+oh-package-lock.json5
+BuildProfile.ets
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/index.ets b/shell/platform/ohos/flutter_embedding/flutter/index.ets
index 3c96b70703b57d3e53a171aabf07727db248e94b..0be0015aba85757fa58b91b0b9f8ba3196aa02df 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/index.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/index.ets
@@ -13,6 +13,193 @@
 * limitations under the License.
 */
 
-export { FlutterAbility } from './src/main/ets/embedding/ohos/FlutterAbility'
+import FlutterInjector from './src/main/ets/FlutterInjector';
+import FlutterPluginRegistry from './src/main/ets/app/FlutterPluginRegistry';
+import FlutterComponent from './src/main/ets/component/FlutterComponent';
+import FlutterEngine from './src/main/ets/embedding/engine/FlutterEngine';
+import FlutterEngineCache from './src/main/ets/embedding/engine/FlutterEngineCache';
+import FlutterEngineConnectionRegistry from './src/main/ets/embedding/engine/FlutterEngineConnectionRegistry';
+import FlutterEngineGroup from './src/main/ets/embedding/engine/FlutterEngineGroup';
+import FlutterEngineGroupCache from './src/main/ets/embedding/engine/FlutterEngineGroupCache';
+import FlutterNapi from './src/main/ets/embedding/engine/FlutterNapi';
+import { FlutterOverlaySurface } from './src/main/ets/embedding/engine/FlutterOverlaySurface';
+import FlutterShellArgs from './src/main/ets/embedding/engine/FlutterShellArgs';
+import DartExecutor from './src/main/ets/embedding/engine/dart/DartExecutor';
+import { DartMessenger } from './src/main/ets/embedding/engine/dart/DartMessenger';
+import { PlatformMessageHandler } from './src/main/ets/embedding/engine/dart/PlatformMessageHandler';
+import ApplicationInfoLoader from './src/main/ets/embedding/engine/loader/ApplicationInfoLoader';
+import FlutterApplicationInfo from './src/main/ets/embedding/engine/loader/FlutterApplicationInfo';
+import FlutterLoader from './src/main/ets/embedding/engine/loader/FlutterLoader';
+import { FlutterMutatorView } from './src/main/ets/embedding/engine/mutatorsstack/FlutterMutatorView';
+import { FlutterMutatorsStack } from './src/main/ets/embedding/engine/mutatorsstack/FlutterMutatorsStack';
+import { FlutterPlugin } from './src/main/ets/embedding/engine/plugins/FlutterPlugin';
+import AbilityAware from './src/main/ets/embedding/engine/plugins/ability/AbilityAware';
+import AbilityControlSurface from './src/main/ets/embedding/engine/plugins/ability/AbilityControlSurface';
+import { AbilityPluginBinding } from './src/main/ets/embedding/engine/plugins/ability/AbilityPluginBinding';
+import { FlutterUiDisplayListener } from './src/main/ets/embedding/engine/renderer/FlutterUiDisplayListener';
+import AccessibilityChannel from './src/main/ets/embedding/engine/systemchannels/AccessibilityChannel';
+import KeyEventChannel from './src/main/ets/embedding/engine/systemchannels/KeyEventChannel';
+import LifecycleChannel from './src/main/ets/embedding/engine/systemchannels/LifecycleChannel';
+import LocalizationChannel from './src/main/ets/embedding/engine/systemchannels/LocalizationChannel';
+import MouseCursorChannel from './src/main/ets/embedding/engine/systemchannels/MouseCursorChannel';
+import NavigationChannel from './src/main/ets/embedding/engine/systemchannels/NavigationChannel';
+import PlatformChannel from './src/main/ets/embedding/engine/systemchannels/PlatformChannel';
+import PlatformViewsChannel from './src/main/ets/embedding/engine/systemchannels/PlatformViewsChannel';
+import RestorationChannel from './src/main/ets/embedding/engine/systemchannels/RestorationChannel';
+import SettingsChannel from './src/main/ets/embedding/engine/systemchannels/SettingsChannel';
+import SystemChannel from './src/main/ets/embedding/engine/systemchannels/SystemChannel';
+import TestChannel from './src/main/ets/embedding/engine/systemchannels/TestChannel';
+import TextInputChannel from './src/main/ets/embedding/engine/systemchannels/TextInputChannel';
+import ExclusiveAppComponent from './src/main/ets/embedding/ohos/ExclusiveAppComponent';
+import { FlutterAbility } from './src/main/ets/embedding/ohos/FlutterAbility';
+import { FlutterAbilityAndEntryDelegate } from './src/main/ets/embedding/ohos/FlutterAbilityAndEntryDelegate';
+import FlutterAbilityLaunchConfigs from './src/main/ets/embedding/ohos/FlutterAbilityLaunchConfigs';
+import FlutterEngineConfigurator from './src/main/ets/embedding/ohos/FlutterEngineConfigurator';
+import FlutterEngineProvider from './src/main/ets/embedding/ohos/FlutterEngineProvider';
+import FlutterEntry from './src/main/ets/embedding/ohos/FlutterEntry';
+import FlutterManager from './src/main/ets/embedding/ohos/FlutterManager';
+import { FlutterPage } from './src/main/ets/embedding/ohos/FlutterPage';
+import KeyboardManager from './src/main/ets/embedding/ohos/KeyboardManager';
+import OhosTouchProcessor from './src/main/ets/embedding/ohos/OhosTouchProcessor';
+import Settings from './src/main/ets/embedding/ohos/Settings';
+import { TouchEventTracker } from './src/main/ets/embedding/ohos/TouchEventTracker';
+import WindowInfoRepositoryCallbackAdapterWrapper
+  from './src/main/ets/embedding/ohos/WindowInfoRepositoryCallbackAdapterWrapper';
+import PlatformPlugin from './src/main/ets/plugin/PlatformPlugin';
+import BasicMessageChannel from './src/main/ets/plugin/common/BasicMessageChannel';
+import BinaryCodec from './src/main/ets/plugin/common/BinaryCodec';
+import { BinaryMessenger } from './src/main/ets/plugin/common/BinaryMessenger';
+import EventChannel from './src/main/ets/plugin/common/EventChannel';
+import FlutterException from './src/main/ets/plugin/common/FlutterException';
+import JSONMessageCodec from './src/main/ets/plugin/common/JSONMessageCodec';
+import JSONMethodCodec from './src/main/ets/plugin/common/JSONMethodCodec';
+import MessageCodec from './src/main/ets/plugin/common/MessageCodec';
+import MethodCall from './src/main/ets/plugin/common/MethodCall';
+import MethodChannel from './src/main/ets/plugin/common/MethodChannel';
+import MethodCodec from './src/main/ets/plugin/common/MethodCodec';
+import StandardMessageCodec from './src/main/ets/plugin/common/StandardMessageCodec';
+import StandardMethodCodec from './src/main/ets/plugin/common/StandardMethodCodec';
+import StringCodec from './src/main/ets/plugin/common/StringCodec';
+import { ListenableEditingState } from './src/main/ets/plugin/editing/ListenableEditingState';
+import { TextEditingDelta } from './src/main/ets/plugin/editing/TextEditingDelta';
+import TextInputPlugin from './src/main/ets/plugin/editing/TextInputPlugin';
+import LocalizationPlugin from './src/main/ets/plugin/localization/LocalizationPlugin';
+import MouseCursorPlugin from './src/main/ets/plugin/mouse/MouseCursorPlugin';
+import { AccessibilityEventsDelegate } from './src/main/ets/plugin/platform/AccessibilityEventsDelegate';
+import { PlatformOverlayView } from './src/main/ets/plugin/platform/PlatformOverlayView';
+import PlatformView from './src/main/ets/plugin/platform/PlatformView';
+import PlatformViewFactory from './src/main/ets/plugin/platform/PlatformViewFactory';
+import PlatformViewRegistry from './src/main/ets/plugin/platform/PlatformViewRegistry';
+import PlatformViewRegistryImpl from './src/main/ets/plugin/platform/PlatformViewRegistryImpl';
+import { PlatformViewWrapper } from './src/main/ets/plugin/platform/PlatformViewWrapper';
+import { PlatformViewsAccessibilityDelegate } from './src/main/ets/plugin/platform/PlatformViewsAccessibilityDelegate';
+import PlatformViewsController from './src/main/ets/plugin/platform/PlatformViewsController';
+import AccessibilityBridge from './src/main/ets/view/AccessibilityBridge';
+import { FlutterCallbackInformation } from './src/main/ets/view/FlutterCallbackInformation';
+import FlutterRunArguments from './src/main/ets/view/FlutterRunArguments';
+import { FlutterView } from './src/main/ets/view/FlutterView';
+import { TextureRegistry } from './src/main/ets/view/TextureRegistry';
+import { ByteBuffer } from './src/main/ets/util/ByteBuffer';
+import Log from './src/main/ets/util/Log';
+import MessageChannelUtils from './src/main/ets/util/MessageChannelUtils';
+import PathUtils from './src/main/ets/util/PathUtils';
+import StringUtils from './src/main/ets/util/StringUtils';
+import ToolUtils from './src/main/ets/util/ToolUtils';
+import { TraceSection } from './src/main/ets/util/TraceSection';
+import Any from './src/main/ets/plugin/common/Any';
 
-export { FlutterPage } from './src/main/ets/embedding/ohos/FlutterPage'
+export {
+  FlutterInjector,
+  FlutterPluginRegistry,
+  FlutterComponent,
+  FlutterEngine,
+  FlutterEngineCache,
+  FlutterEngineConnectionRegistry,
+  FlutterEngineGroup,
+  FlutterEngineGroupCache,
+  FlutterNapi,
+  FlutterOverlaySurface,
+  FlutterShellArgs,
+  DartExecutor,
+  DartMessenger,
+  PlatformMessageHandler,
+  ApplicationInfoLoader,
+  FlutterApplicationInfo,
+  FlutterLoader,
+  FlutterMutatorView,
+  FlutterMutatorsStack,
+  FlutterPlugin,
+  AbilityAware,
+  AbilityControlSurface,
+  AbilityPluginBinding,
+  FlutterUiDisplayListener,
+  AccessibilityChannel,
+  KeyEventChannel,
+  LifecycleChannel,
+  LocalizationChannel,
+  MouseCursorChannel,
+  NavigationChannel,
+  PlatformChannel,
+  PlatformViewsChannel,
+  RestorationChannel,
+  SettingsChannel,
+  SystemChannel,
+  TestChannel,
+  TextInputChannel,
+  ExclusiveAppComponent,
+  FlutterAbility,
+  FlutterAbilityAndEntryDelegate,
+  FlutterAbilityLaunchConfigs,
+  FlutterEngineConfigurator,
+  FlutterEngineProvider,
+  FlutterEntry,
+  FlutterManager,
+  FlutterPage,
+  KeyboardManager,
+  OhosTouchProcessor,
+  Settings,
+  TouchEventTracker,
+  WindowInfoRepositoryCallbackAdapterWrapper,
+  PlatformPlugin,
+  BasicMessageChannel,
+  BinaryCodec,
+  BinaryMessenger,
+  EventChannel,
+  FlutterException,
+  JSONMessageCodec,
+  JSONMethodCodec,
+  MessageCodec,
+  MethodCall,
+  MethodChannel,
+  MethodCodec,
+  StandardMessageCodec,
+  StandardMethodCodec,
+  StringCodec,
+  ListenableEditingState,
+  TextEditingDelta,
+  TextInputPlugin,
+  LocalizationPlugin,
+  MouseCursorPlugin,
+  AccessibilityEventsDelegate,
+  PlatformOverlayView,
+  PlatformView,
+  PlatformViewFactory,
+  PlatformViewRegistry,
+  PlatformViewRegistryImpl,
+  PlatformViewWrapper,
+  PlatformViewsAccessibilityDelegate,
+  PlatformViewsController,
+  AccessibilityBridge,
+  FlutterCallbackInformation,
+  FlutterRunArguments,
+  FlutterView,
+  TextureRegistry,
+  ByteBuffer,
+  Log,
+  MessageChannelUtils,
+  PathUtils,
+  StringUtils,
+  ToolUtils,
+  TraceSection,
+  Any,
+}
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 c53957c7aaee4402afa25585c981d83830351ce5..6cb09bd9f02b4c6798e4778451f57c48ec925b0d 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
@@ -99,4 +99,12 @@ export const nativeXComponentDetachFlutterEngine: (xcomponentId: number, nativeS
  */
 export const nativeDestroy: (
   nativeShellHolderId: number
-) => void;
\ No newline at end of file
+) => void;
+
+export const nativeInitNativeImage: (nativeShellHolderId: number, textureId: number, aImage: image.Image) => void;
+
+export const nativeUnregisterTexture: (nativeShellHolderId: number, textureId: number) => void;
+
+export const nativeRegisterPixelMap: (nativeShellHolderId: number, textureId: number, pixelMap: PixelMap) => void;
+
+export const nativeRegisterTexture: (nativeShellHolderId: number, textureId: number) => number;
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/app/FlutterPluginRegistry.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/app/FlutterPluginRegistry.ets
index 2a2a44964d3903c884f533e2bed115a4b624b745..758b5f6e1ce5fd7c97312ab4cc0cfe76954fc422 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/app/FlutterPluginRegistry.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/app/FlutterPluginRegistry.ets
@@ -18,11 +18,13 @@ import PlatformViewController from '../plugin/platform/PlatformViewsController'
 
 export default class FlutterPluginRegistry {
   private mPlatformViewsController: PlatformViewController;
-  private mFlutterView: FlutterView;
-  private mContext: common.Context;
+  private mFlutterView: FlutterView | null = null;
+  private mContext: common.Context | null = null;
 
   constructor() {
     this.mPlatformViewsController = new PlatformViewController();
+    this.mFlutterView = null;
+    this.mContext = null;
   }
 
   attach(flutterView: FlutterView, context: common.Context): void {
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/component/XComponentStruct.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/component/XComponentStruct.ets
index e9d66ef987b8c8f070bb6279a2035fc06fc8c054..322ffd13a83b3e91c9ab038edcdca7049480df8e 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/component/XComponentStruct.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/component/XComponentStruct.ets
@@ -12,22 +12,45 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+import Any from '../plugin/common/Any';
+import ApplicationInfoLoader from '../embedding/engine/loader/ApplicationInfoLoader';
 
 import { BuilderParams, DVModelParameters } from '../view/DynamicView/dynamicView';
 
 @Component
 struct XComponentStruct {
-  private context:ESObject;
+  private context: Any;
+  private applicationInfo = ApplicationInfoLoader.load(getContext());
   dvModelParams: DVModelParameters = new DVModelParameters();
 
   build() {
-    XComponent({ id: (this.dvModelParams as Record<string, ESObject>)["xComponentId"], type: 'texture', libraryname: 'flutter'})
-      .onLoad((context) => {
-        this.context = context;
+    // todo OS解决默认背景色后可以移除冗余重复代码,仅保留差异的backgroundColor属性条件配置
+    if (this.applicationInfo.isDebugMode) {
+      XComponent({
+        id: (this.dvModelParams as Record<string, Any>)["xComponentId"],
+        type: XComponentType.SURFACE,
+        libraryname: 'flutter'
       })
-      .onDestroy(() => {
+        .onLoad((context) => {
+          this.context = context;
+        })
+        .onDestroy(() => {
+        })
+        .backgroundColor(Color.White)
+    } else {
+      XComponent({
+        id: (this.dvModelParams as Record<string, Any>)["xComponentId"],
+        type: XComponentType.SURFACE,
+        libraryname: 'flutter'
       })
+        .onLoad((context) => {
+          this.context = context;
+        })
+        .onDestroy(() => {
+        })
+    }
   }
+
 }
 
 @Builder export function BuildXComponentStruct(buildParams: BuilderParams) {
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngine.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngine.ets
index 880e9bc78517cedba409c6e9939680f4fe503d71..f6950fde1e1386b9d9f89607ea1c8f1cfa0e8e44 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngine.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngine.ets
@@ -30,7 +30,6 @@ import AbilityControlSurface from './plugins/ability/AbilityControlSurface';
 import TextInputChannel from './systemchannels/TextInputChannel';
 import TextInputPlugin from '../../plugin/editing/TextInputPlugin';
 import PlatformChannel from './systemchannels/PlatformChannel';
-import FlutterEngineGroup from './FlutterEngineGroup';
 import SystemChannel from './systemchannels/SystemChannel';
 import MouseCursorChannel from './systemchannels/MouseCursorChannel';
 import RestorationChannel from './systemchannels/RestorationChannel';
@@ -39,10 +38,7 @@ import AccessibilityChannel from './systemchannels/AccessibilityChannel';
 import LocalizationPlugin from '../../plugin/localization/LocalizationPlugin'
 import SettingsChannel from './systemchannels/SettingsChannel';
 import PlatformViewsController from '../../plugin/platform/PlatformViewsController';
-import { FlutterPlugin } from './plugins/FlutterPlugin';
-import List from '@ohos.util.List';
-import GeneratedPluginRegister from './plugins/util/GeneratedPluginRegister';
-
+import { FlutterRenderer } from './renderer/FlutterRenderer';
 
 const TAG = "FlutterEngine";
 
@@ -68,6 +64,7 @@ export default class FlutterEngine implements EngineLifecycleListener{
   private accessibilityChannel: AccessibilityChannel | null = null;
   private localeChannel: LocalizationChannel | null = null;
   private flutterNapi: FlutterNapi;
+  private renderer: FlutterRenderer;
   private pluginRegistry: FlutterEngineConnectionRegistry | null = null;
   private textInputPlugin: TextInputPlugin | null = null;
   private localizationPlugin: LocalizationPlugin | null = null;
@@ -99,6 +96,8 @@ export default class FlutterEngine implements EngineLifecycleListener{
     }
     this.flutterLoader = flutterLoader;
 
+    this.renderer = new FlutterRenderer(this.flutterNapi);
+
     if(platformViewsController == null) {
       platformViewsController = new PlatformViewsController();
     }
@@ -106,8 +105,7 @@ export default class FlutterEngine implements EngineLifecycleListener{
     this.platformViewsController.attach(context, null, this.dartExecutor);
   }
 
-  async init(context: common.Context, dartVmArgs: Array<string> | null, automaticallyRegisterPlugins: boolean,
-             waitForRestorationData: boolean, group: FlutterEngineGroup | null, plugins: List<FlutterPlugin> | null) {
+  async init(context: common.Context, dartVmArgs: Array<string> | null, waitForRestorationData: boolean) {
     if (!this.flutterNapi.isAttached()) {
       await this.flutterLoader.startInitialization(context)
       this.flutterLoader.ensureInitializationComplete(dartVmArgs);
@@ -138,9 +136,7 @@ export default class FlutterEngine implements EngineLifecycleListener{
     this.pluginRegistry = new FlutterEngineConnectionRegistry(context.getApplicationContext(), this, this.flutterLoader);
     this.localizationPlugin.sendLocaleToFlutter();
 
-    if (automaticallyRegisterPlugins && plugins) {
-      GeneratedPluginRegister.registerGeneratedPlugins(this, plugins);
-    }
+    Log.d(TAG, "Call init finished.")
   }
 
   private attachToNapi(): void {
@@ -158,9 +154,7 @@ export default class FlutterEngine implements EngineLifecycleListener{
               initialRoute: string,
               dartEntrypointArgs: Array<string>,
               platformViewsController: PlatformViewsController,
-              automaticallyRegisterPlugins: boolean,
-              waitForRestorationData: boolean,
-              plugins: List<FlutterPlugin> | null) {
+              waitForRestorationData: boolean) {
     if (!this.isAttachedToNapi()) {
       throw new Error(
         "Spawn can only be called on a fully constructed FlutterEngine");
@@ -178,7 +172,7 @@ export default class FlutterEngine implements EngineLifecycleListener{
       newFlutterNapi,
       platformViewsController
     );
-    await flutterEngine.init(context, null, automaticallyRegisterPlugins, waitForRestorationData, null, plugins)
+    await flutterEngine.init(context, null, waitForRestorationData)
     return flutterEngine
   }
 
@@ -218,6 +212,10 @@ export default class FlutterEngine implements EngineLifecycleListener{
     return this.flutterNapi;
   }
 
+  getFlutterRenderer(): FlutterRenderer {
+    return this.renderer;
+  }
+
   getDartExecutor(): DartExecutor {
     return this.dartExecutor
   }
@@ -234,6 +232,10 @@ export default class FlutterEngine implements EngineLifecycleListener{
     return this.settingsChannel;
   }
 
+  getFlutterLoader() {
+    return this.flutterLoader;
+  }
+
   onPreEngineRestart(): void {
 
   }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngineConnectionRegistry.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngineConnectionRegistry.ets
index be25395a31aa20a1b9cfc4d470964d1bf387d724..ca424fc894cc3241269a88044e87c805ec257195 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngineConnectionRegistry.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngineConnectionRegistry.ets
@@ -34,6 +34,7 @@ import ToolUtils from '../../util/ToolUtils';
 import AbilityControlSurface from './plugins/ability/AbilityControlSurface';
 import ExclusiveAppComponent from '../ohos/ExclusiveAppComponent';
 import FlutterEngineGroup from './FlutterEngineGroup';
+import Any from '../../plugin/common/Any';
 
 const TAG = "FlutterEngineCxnRegistry";
 
@@ -55,7 +56,7 @@ export default class FlutterEngineConnectionRegistry implements PluginRegistry,
 
   constructor(appContext: common.Context, flutterEngine: FlutterEngine, flutterLoader: FlutterLoader) {
     this.flutterEngine = flutterEngine;
-    this.pluginBinding = new FlutterPluginBinding(appContext, flutterEngine, flutterEngine.getDartExecutor(), new DefaultFlutterAssets(flutterLoader), flutterEngine.getPlatformViewsController()?.getRegistry());
+    this.pluginBinding = new FlutterPluginBinding(appContext, flutterEngine, flutterEngine.getDartExecutor(), new DefaultFlutterAssets(flutterLoader), flutterEngine.getFlutterRenderer(), flutterEngine.getPlatformViewsController()?.getRegistry());
   }
 
   add(plugin: FlutterPlugin): void {
@@ -82,7 +83,7 @@ export default class FlutterEngineConnectionRegistry implements PluginRegistry,
       // plugins, and if this engine is currently attached to an Ability,
       // notify the AbilityAware plugin that it is now attached to an Ability.
       if (ToolUtils.implementsInterface(plugin, "onAttachedToAbility")) {
-        const abilityAware: ESObject = plugin;
+        const abilityAware: Any = plugin;
         this.abilityAwarePlugins.set(plugin.getUniqueClassName(), abilityAware);
         if (this.isAttachedToAbility()) {
           abilityAware.onAttachedToAbility(this.abilityPluginBinding);
@@ -112,7 +113,7 @@ export default class FlutterEngineConnectionRegistry implements PluginRegistry,
     }
     if (ToolUtils.implementsInterface(plugin, "onAttachedToAbility")) {
       if (this.isAttachedToAbility()) {
-        const abilityAware: ESObject = plugin;
+        const abilityAware: Any = plugin;
         abilityAware.onDetachedFromAbility();
       }
       this.abilityAwarePlugins.delete(pluginClassName);
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngineGroup.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngineGroup.ets
index d0b61daf80de6df248c4712fdc3c063ea0b49274..bd4c494cc1543c76877f4518ac179c97da6bd0f9 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngineGroup.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterEngineGroup.ets
@@ -20,8 +20,6 @@ import FlutterInjector from '../../FlutterInjector'
 import { DartEntrypoint } from './dart/DartExecutor'
 import PlatformViewsController from '../../plugin/platform/PlatformViewsController'
 import ArrayList from '@ohos.util.ArrayList'
-import { FlutterPlugin } from './plugins/FlutterPlugin'
-import List from '@ohos.util.List';
 import Log from '../../util/Log';
 
 const TAG = "FlutterEngineGroup"
@@ -48,9 +46,7 @@ export default class FlutterEngineGroup {
     let initialRoute: string = options.getInitialRoute();
     let dartEntrypointArgs: Array<string> = options.getDartEntrypointArgs();
     let platformViewsController: PlatformViewsController | null = options.getPlatformViewsController();
-    let automaticallyRegisterPlugins: boolean = options.getAutomaticallyRegisterPlugins();
     let waitForRestorationData: boolean = options.getWaitForRestorationData();
-    let plugins: List<FlutterPlugin>| null = options.getPlugins()
 
     if (dartEntrypoint == null) {
       dartEntrypoint = DartEntrypoint.createDefault();
@@ -64,13 +60,11 @@ export default class FlutterEngineGroup {
     if (this.activeEngines.length == 0) {
       engine = this.createEngine(context, platformViewsController);
       await engine.init(context, null, // String[]. The Dart VM has already started, this arguments will have no effect.
-        automaticallyRegisterPlugins, // boolean.
-        waitForRestorationData, // boolean.
-        null,
-        plugins)
+        waitForRestorationData)
       if (initialRoute != null) {
         engine.getNavigationChannel()?.setInitialRoute(initialRoute);
       }
+      engine.getDartExecutor().executeDartEntrypoint(dartEntrypoint, dartEntrypointArgs)
     } else {
       engine = await this.activeEngines[0]
         .spawn(
@@ -79,7 +73,6 @@ export default class FlutterEngineGroup {
           initialRoute,
           dartEntrypointArgs,
           platformViewsController,
-          automaticallyRegisterPlugins,
           waitForRestorationData);
     }
     this.activeEngines.add(engine);
@@ -125,9 +118,7 @@ export class Options {
   private initialRoute: string = '';
   private dartEntrypointArgs: Array<string> = [];
   private platformViewsController: PlatformViewsController | null = null;
-  private automaticallyRegisterPlugins: boolean = true;
   private waitForRestorationData: boolean = false;
-  private plugins: List<FlutterPlugin> | null = null;
 
   constructor(context: common.Context) {
     this.context = context;
@@ -149,10 +140,6 @@ export class Options {
     return this.dartEntrypointArgs;
   }
 
-  getAutomaticallyRegisterPlugins(): boolean {
-    return this.automaticallyRegisterPlugins;
-  }
-
   getWaitForRestorationData(): boolean {
     return this.waitForRestorationData;
   }
@@ -161,10 +148,6 @@ export class Options {
     return this.platformViewsController;
   }
 
-  getPlugins(): List<FlutterPlugin> | null {
-    return this.plugins;
-  }
-
   setDartEntrypoint(dartEntrypoint: DartEntrypoint): Options {
     this.dartEntrypoint = dartEntrypoint;
     return this;
@@ -180,11 +163,6 @@ export class Options {
     return this;
   }
 
-  setAutomaticallyRegisterPlugins(automaticallyRegisterPlugins: boolean): Options {
-    this.automaticallyRegisterPlugins = automaticallyRegisterPlugins;
-    return this;
-  }
-
   setWaitForRestorationData(waitForRestorationData: boolean): Options {
     this.waitForRestorationData = waitForRestorationData;
     return this;
@@ -194,9 +172,4 @@ export class Options {
     this.platformViewsController = platformViewsController;
     return this;
   }
-
-  setPlugins(plugins: List<FlutterPlugin>): Options {
-    this.plugins = plugins;
-    return this;
-  }
 }
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterNapi.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterNapi.ets
index 4b8d9a3a54eb434722429bae904d14da1226b2d9..6cced21f249cba5c10192aa6c4dea18b0447e567 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterNapi.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/FlutterNapi.ets
@@ -25,6 +25,7 @@ import { ByteBuffer } from '../../util/ByteBuffer';
 import { Action } from '../../view/AccessibilityBridge'
 import LocalizationPlugin from '../../plugin/localization/LocalizationPlugin';
 import i18n from '@ohos.i18n';
+import Any from '../../plugin/common/Any';
 
 const TAG = "FlutterNapi";
 
@@ -279,7 +280,7 @@ export default class FlutterNapi {
     }).then(imageInfo => {
       Log.d(TAG, `nativeImageHeaderCallback width=${imageInfo.size.width}  height=${imageInfo.size.height} imageGeneratorAddress=${imageGeneratorAddress}`)
       flutter.nativeImageDecodeCallback(imageInfo.size.width, imageInfo.size.height, imageGeneratorAddress, tempPixelMap)
-    }).catch((error: ESObject) => {
+    }).catch((error: Any) => {
       Log.d(TAG, "decodeImage error=" + JSON.stringify(error))
       flutter.nativeImageDecodeCallback(0, 0, imageGeneratorAddress, null);
     })
@@ -373,6 +374,26 @@ export default class FlutterNapi {
   detachFromNativeAndReleaseResources() {
     flutter.nativeDestroy(this.nativeShellHolderId!!);
   }
+
+  initNativeImage(textureId: number, aImage: image.Image) {
+    Log.d(TAG, "called initNativeImage ");
+    flutter.nativeInitNativeImage(this.nativeShellHolderId!, textureId, aImage);
+  }
+
+  unregisterTexture(textureId: number): void {
+    Log.d(TAG, "called unregisterTexture ");
+    flutter.nativeUnregisterTexture(this.nativeShellHolderId!, textureId);
+  }
+
+  registerPixelMap(textureId: number, pixelMap: PixelMap): void {
+    Log.d(TAG, "called registerPixelMap ");
+    flutter.nativeRegisterPixelMap(this.nativeShellHolderId!, textureId, pixelMap);
+  }
+
+  registerTexture(textureId: number): number {
+    Log.d(TAG, "called unregisterTexture ");
+    return flutter.nativeRegisterTexture(this.nativeShellHolderId!, textureId);
+  }
 }
 
 export interface AccessibilityDelegate {
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/dart/DartExecutor.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/dart/DartExecutor.ets
index 46d08cd458b5795d1daaa1f4379a088b129d5dc7..383927204c7bc83df203d2e779430c3969762a20 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/dart/DartExecutor.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/dart/DartExecutor.ets
@@ -172,7 +172,7 @@ export default class DartExecutor implements  BinaryMessenger {
     this.getBinaryMessenger().send(channel, message, callback);
   }
 
-  setMessageHandler(channel: String, handler: BinaryMessageHandler, taskQueue?: TaskQueue): void {
+  setMessageHandler(channel: String, handler: BinaryMessageHandler | null, taskQueue?: TaskQueue): void {
     this.getBinaryMessenger().setMessageHandler(channel, handler, taskQueue);
   }
 
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 6e9bfab834fbdc2b0929e774ecd94c78d4683e7a..3567d610f4ddafb1e845baf55a0d7d8028e878a5 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
@@ -68,7 +68,7 @@ export class DartMessenger implements BinaryMessenger, PlatformMessageHandler {
   }
 
 
-  setMessageHandler(channel: String, handler: BinaryMessageHandler, taskQueue?: TaskQueue): void {
+  setMessageHandler(channel: String, handler: BinaryMessageHandler | null, taskQueue?: TaskQueue): void {
     if (handler == null) {
       Log.d(TAG, "Removing handler for channel '" + channel + "'");
       this.messageHandlers.delete(channel);
@@ -255,7 +255,7 @@ class Reply implements BinaryReply {
     this.replyId = replyId;
   }
 
-  reply(reply: ArrayBuffer) {
+  reply(reply: ArrayBuffer | null) {
     if (this.done) {
       throw new Error("Reply already submitted");
     }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/loader/FlutterApplicationInfo.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/loader/FlutterApplicationInfo.ets
index 272615d612c8d056fb3a58c280f9f2e69b02d502..8ff3aec5b8e0a72c4427b0cfab711d62e266a9b3 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/loader/FlutterApplicationInfo.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/loader/FlutterApplicationInfo.ets
@@ -13,6 +13,8 @@
 * limitations under the License.
 */
 
+import BuildProfile from "../../../../../../BuildProfile.ets";
+
 const DEFAULT_AOT_SHARED_LIBRARY_NAME = "libapp.so";
 const DEFAULT_VM_SNAPSHOT_DATA = "vm_snapshot_data";
 const DEFAULT_ISOLATE_SNAPSHOT_DATA = "isolate_snapshot_data";
@@ -49,7 +51,7 @@ export default class FlutterApplicationInfo {
     this.domainNetworkPolicy = domainNetworkPolicy == null ? "" : domainNetworkPolicy;
     this.nativeLibraryDir = nativeLibraryDir;
     this.automaticallyRegisterPlugins = automaticallyRegisterPlugins;
-    this.isDebugMode = false;
-    this.isProfile = false;
+    this.isDebugMode = "debug" == String(BuildProfile.BUILD_MODE_NAME);
+    this.isProfile = "profile" == String(BuildProfile.BUILD_MODE_NAME);
   }
 }
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/loader/FlutterLoader.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/loader/FlutterLoader.ets
index 89e7cf3264c881a0c61e4503f25b645e979b4ed7..2317af9f61ca4d70aecbc77d162305ed9c45f615 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/loader/FlutterLoader.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/loader/FlutterLoader.ets
@@ -170,7 +170,6 @@ export default class FlutterLoader {
     if (this.initialized) {
       return;
     }
-    Log.d(TAG, "ensureInitializationComplete")
     if (shellArgs == null) {
       shellArgs = new Array<string>();
     }
@@ -231,6 +230,7 @@ export default class FlutterLoader {
       costTime
     );
     this.initialized = true;
+    Log.d(TAG, "ensureInitializationComplete")
   }
 
   findAppBundlePath(): string {
@@ -274,6 +274,10 @@ export default class FlutterLoader {
     }) : new Array();
   }
 
+  isInitialized(): boolean {
+    return this.initialized;
+  }
+
 }
 
 class InitResult {
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/mutatorsstack/FlutterMutatorView.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/mutatorsstack/FlutterMutatorView.ets
index f2544f8e20b9041a7db93d99ba3e1a2db3da67a5..f439b570473a9abf5d278d2446b7965e11c3bc1d 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/mutatorsstack/FlutterMutatorView.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/mutatorsstack/FlutterMutatorView.ets
@@ -18,6 +18,7 @@ import { DVModel, DVModelEvents, DVModelParameters } from '../../../view/Dynamic
 import { createDVModelFromJson } from '../../../view/DynamicView/dynamicViewJson';
 import OhosTouchProcessor from '../../ohos/OhosTouchProcessor';
 import { FlutterMutator, FlutterMutatorsStack } from './FlutterMutatorsStack'
+import Any from '../../../plugin/common/Any';
 
 export class FlutterMutatorView {
   private mutatorsStack: FlutterMutatorsStack | null = null;
@@ -27,7 +28,7 @@ export class FlutterMutatorView {
   private prevLeft: number = 0;
   private prevTop: number = 0;
 
-  private onTouch = (touchEvent: ESObject) => {
+  private onTouch = (touchEvent: Any) => {
     let params = this.model.params as Record<string, number>;
     switch (touchEvent.type) {
       case TouchType.Down:
@@ -123,10 +124,10 @@ export class FlutterMutatorView {
 class DVModelParam {
   compType: string
   children: []
-  attributes: ESObject
-  events: ESObject
+  attributes: Any
+  events: Any
 
-  constructor(compType: string, children: [], attributes: ESObject, events: ESObject) {
+  constructor(compType: string, children: [], attributes: Any, events: Any) {
     this.compType = compType;
     this.children = children;
     this.attributes = attributes;
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/plugins/FlutterPlugin.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/plugins/FlutterPlugin.ets
index 1b8ea40a0513043a824ea0fd997f70cf0ab27e8d..92e08f8dd9c22e441ecfe852895522a7417f859b 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/plugins/FlutterPlugin.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/plugins/FlutterPlugin.ets
@@ -17,6 +17,7 @@ import common from '@ohos.app.ability.common';
 import { BinaryMessenger } from '../../../plugin/common/BinaryMessenger';
 import PlatformViewFactory from '../../../plugin/platform/PlatformViewFactory';
 import PlatformViewRegistry from '../../../plugin/platform/PlatformViewRegistry';
+import { TextureRegistry } from '../../../view/TextureRegistry';
 import FlutterEngine from '../FlutterEngine';
 
 export interface FlutterPlugin {
@@ -52,13 +53,15 @@ export class FlutterPluginBinding {
   private flutterEngine: FlutterEngine;
   private binaryMessenger: BinaryMessenger;
   private flutterAssets: FlutterAssets;
+  private textureRegistry: TextureRegistry;
   private platformViewRegistry: PlatformViewRegistry;
 
-  constructor(applicationContext: common.Context, flutterEngine: FlutterEngine, binaryMessenger: BinaryMessenger, flutterAssets: FlutterAssets, platformViewRegistry?: PlatformViewRegistry) {
+  constructor(applicationContext: common.Context, flutterEngine: FlutterEngine, binaryMessenger: BinaryMessenger, flutterAssets: FlutterAssets, textureRegistry: TextureRegistry, platformViewRegistry?: PlatformViewRegistry) {
     this.applicationContext = applicationContext;
     this.flutterEngine = flutterEngine;
     this.binaryMessenger = binaryMessenger;
     this.flutterAssets = flutterAssets;
+    this.textureRegistry = textureRegistry;
     this.platformViewRegistry = platformViewRegistry ?? new EmptyPlatformViewRegistry();
   }
 
@@ -78,6 +81,10 @@ export class FlutterPluginBinding {
     return this.flutterAssets;
   }
 
+  getTextureRegistry(): TextureRegistry {
+    return this.textureRegistry;
+  }
+  
   public getPlatformViewRegistry(): PlatformViewRegistry {
     return this.platformViewRegistry;
   }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/plugins/util/GeneratedPluginRegister.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/plugins/util/GeneratedPluginRegister.ets
deleted file mode 100644
index d10dcd0f4119ae36d096548fa169a2a3ce1a6273..0000000000000000000000000000000000000000
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/plugins/util/GeneratedPluginRegister.ets
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
-* 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 List from '@ohos.util.List';
-import Log from '../../../../util/Log';
-import FlutterEngine from '../../FlutterEngine';
-import { FlutterPlugin } from '../FlutterPlugin';
-
-const TAG = "GeneratedPluginRegister";
-
-export default class GeneratedPluginRegister {
-  // 因为ets不支持类似java反射功能能找到GeneratedPluginRegistrant，所以这里只能直接获取List<FlutterPlugin>
-  public static registerGeneratedPlugins(flutterEngine: FlutterEngine, plugins: List<FlutterPlugin>) {
-    try {
-      for (let index = 0; index < plugins.length; index++) {
-        const plugin = plugins[index] as FlutterPlugin;
-        flutterEngine.getPlugins()?.add(plugin)
-      }
-    } catch (e) {
-      Log.e(
-        TAG,
-        "Tried to automatically register plugins with FlutterEngine ("
-          + flutterEngine
-          + ") but could not find or invoke the GeneratedPluginRegistrant.");
-      Log.e(TAG, "Received exception while registering", e);
-    }
-  }
-}
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/renderer/FlutterRenderer.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/renderer/FlutterRenderer.ets
new file mode 100644
index 0000000000000000000000000000000000000000..f1624aaa4d9ef4b4cbcee420e3d0d6645ad4365a
--- /dev/null
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/renderer/FlutterRenderer.ets
@@ -0,0 +1,138 @@
+/*
+* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
+* 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 image from '@ohos.multimedia.image';
+import { BusinessError } from '@ohos.base';
+import { SurfaceTextureEntry, TextureRegistry } from '../../../view/TextureRegistry';
+import { FlutterAbility } from '../../ohos/FlutterAbility';
+import FlutterNapi from '../FlutterNapi';
+import { SurfaceTextureWrapper } from './SurfaceTextureWrapper';
+import Log from '../../../util/Log';
+
+const TAG = "FlutterRenderer"
+export class FlutterRenderer implements TextureRegistry {
+  private nextTextureId: number = 0;
+  private flutterNapi: FlutterNapi;
+
+  constructor(flutterNapi: FlutterNapi) {
+    this.flutterNapi = flutterNapi;
+  }
+  createSurfaceTexture(): SurfaceTextureEntry {
+    let receiver: image.ImageReceiver = this.getImageReceiver();
+    return this.registerSurfaceTexture(receiver);
+  }
+
+  getTextureId(): number {
+    this.nextTextureId = this.nextTextureId + 1;
+    Log.i(TAG, "getTextureId: ", this.nextTextureId )
+    return this.nextTextureId;
+  }
+
+  registerTexture(textureId: number): SurfaceTextureEntry {
+    let surfaceTextureRegistryEntry = new SurfaceTextureRegistryEntry(this.nextTextureId);
+    let surfaceId = this.flutterNapi.registerTexture(textureId);
+    Log.i(TAG, "registerTexture, surfaceId=" + surfaceId);
+    surfaceTextureRegistryEntry.setSurfaceId(surfaceId);
+    return surfaceTextureRegistryEntry;
+  }
+
+  registerSurfaceTexture(receiver: image.ImageReceiver): SurfaceTextureEntry {
+    this.nextTextureId = this.nextTextureId + 1;
+    let surfaceTextureRegistryEntry = new SurfaceTextureRegistryEntry(this.nextTextureId);
+    surfaceTextureRegistryEntry.setImageReceiver(receiver);
+    this.registerImage(surfaceTextureRegistryEntry.getTextureId(), surfaceTextureRegistryEntry.textureWrapper());
+    return surfaceTextureRegistryEntry;
+  }
+
+  registerPixelMap(pixelMap: PixelMap): number {
+    this.nextTextureId = this.nextTextureId + 1;
+    this.flutterNapi.registerPixelMap(this.nextTextureId, pixelMap);
+    return this.nextTextureId;
+  }
+
+  unregisterTexture(textureId: number): void {
+    this.flutterNapi.unregisterTexture(textureId);
+  }
+  onTrimMemory(level: number) {
+    throw new Error('Method not implemented.');
+  }
+
+  private getImageReceiver(): image.ImageReceiver {
+    let receiver: image.ImageReceiver = image.createImageReceiver(640, 480, 4, 8);
+    if (receiver !== undefined) {
+      console.info('[camera test] ImageReceiver is ok');
+    } else {
+      console.info('[camera test] ImageReceiver is not ok');
+    }
+    return receiver;
+  }
+  private registerImage(textureId: number, surfaceTextureWrapper: SurfaceTextureWrapper): void {
+    let receiver = surfaceTextureWrapper.getImageReceiver();
+    receiver.on('imageArrival', () => {
+      receiver.readNextImage((err: BusinessError, nextImage: image.Image) => {
+        if (err || nextImage === undefined) {
+          return;
+        }
+        this.flutterNapi.initNativeImage(textureId, nextImage);
+        console.log("[camera test] format: " + nextImage.format);
+        nextImage.release((err : BusinessError) =>{
+          if (err != undefined) {
+            console.log('Failed to release the image source instance.');
+          } else {
+            console.log('Succeeded in releasing the image source instance.');
+          }
+        });
+      })
+    })
+  }
+}
+
+export class SurfaceTextureRegistryEntry implements SurfaceTextureEntry {
+  private textureId: number = 0;
+  private surfaceId: number = 0;
+  private surfaceTextureWrapper: SurfaceTextureWrapper | null = null;
+  private released: boolean = false;
+
+  constructor(id: number) {
+    this.textureId = id;
+  }
+
+  getImageReceiver(): image.ImageReceiver {
+    return this.surfaceTextureWrapper!.getImageReceiver();
+  }
+
+  setImageReceiver(receiver: image.ImageReceiver): void {
+    this.surfaceTextureWrapper = new SurfaceTextureWrapper(receiver);
+  }
+
+  getTextureId(): number {
+    return this.textureId;
+  }
+
+  getSurfaceId(): number {
+    return this.surfaceId;
+  }
+
+  setSurfaceId(surfaceId: number): void {
+    this.surfaceId = surfaceId;
+  }
+
+  textureWrapper(): SurfaceTextureWrapper {
+    return this.surfaceTextureWrapper!;
+  }
+  release() {
+    throw new Error('Method not implemented.');
+  }
+}
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/renderer/SurfaceTextureWrapper.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/renderer/SurfaceTextureWrapper.ets
new file mode 100644
index 0000000000000000000000000000000000000000..b1da18061bc2398f9ce0acd5f9f2c42e248b9204
--- /dev/null
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/renderer/SurfaceTextureWrapper.ets
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
+ * 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 image from '@ohos.multimedia.image';
+
+export class SurfaceTextureWrapper {
+  private receiver: image.ImageReceiver;
+  private released: boolean = false;
+  private attached: boolean = false;
+
+  constructor(receiver: image.ImageReceiver) {
+    this.receiver = receiver;
+  }
+
+  getImageReceiver(): image.ImageReceiver {
+    return this.receiver;
+  }
+}
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/AccessibilityChannel.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/AccessibilityChannel.ets
index 804994eda64980ff6d23470994cf32cebfed977b..9b2f9ee6cfdcfa5bbee616474617b936344c7e42 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/AccessibilityChannel.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/AccessibilityChannel.ets
@@ -21,6 +21,7 @@ import FlutterNapi, {AccessibilityDelegate} from '../FlutterNapi';
 import { Action } from '../../../view/AccessibilityBridge'
 import StandardMessageCodec from '../../../plugin/common/StandardMessageCodec';
 import StringUtils from '../../../util/StringUtils';
+import Any from '../../../plugin/common/Any';
 
 /**
 * 辅助功能channel
@@ -39,9 +40,9 @@ export default class AccessibilityChannel implements MessageHandler<object>{
             reply.reply(StringUtils.stringToArrayBuffer(""));
             return;
         }
-        let annotatedEvent: HashMap<string, ESObject> = message as HashMap<string, ESObject>;
+        let annotatedEvent: HashMap<string, Any> = message as HashMap<string, Any>;
         let type: string = annotatedEvent.get("type") as string;
-        let data: HashMap<string, ESObject> = annotatedEvent.get("data") as HashMap<string, ESObject>;
+        let data: HashMap<string, Any> = annotatedEvent.get("data") as HashMap<string, Any>;
 
         Log.i(AccessibilityChannel.TAG, "Received " + type + " message.");
         switch (type) {
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/PlatformChannel.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/PlatformChannel.ets
index 4b90f2f63cd7d8a6f96d8862ae39c13e501f7c05..faff77ef3c58254e1ba2a05d4ff0479189fb47d7 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/PlatformChannel.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/PlatformChannel.ets
@@ -21,6 +21,7 @@ import DartExecutor from '../dart/DartExecutor';
 import pasteboard from '@ohos.pasteboard';
 import bundleManager from '@ohos.bundle.bundleManager';
 import window from '@ohos.window';
+import Any from '../../../plugin/common/Any';
 
 export default class PlatformChannel {
   private static TAG = "PlatformChannel";
@@ -273,7 +274,7 @@ export class SystemChromeStyle {
   }
 }
 
-enum DeviceOrientation {
+export enum DeviceOrientation {
   PORTRAIT_UP = "DeviceOrientation.portraitUp",
   PORTRAIT_DOWN = "DeviceOrientation.portraitDown",
   LANDSCAPE_LEFT = "DeviceOrientation.landscapeLeft",
@@ -295,7 +296,7 @@ class PlatformMethodCallback implements MethodCallHandler {
     }
 
     let method: string = call.method;
-    let args: ESObject = call.args;
+    let args: Any = call.args;
     Log.d(PlatformMethodCallback.TAG, "Received '" + method + "' message.");
     try {
       switch (method) {
@@ -381,10 +382,10 @@ class PlatformMethodCallback implements MethodCallHandler {
           let pasteBoard = pasteboard.getSystemPasteboard();
           pasteBoard.getData().then((pasteData) => {
             let text = pasteData.getPrimaryText();
-            let response: ESObject = new Map().set("text", "");
+            let response: Any = new Map().set("text", "");
             response.text = text;
             result.success(response);
-          }).catch((err: ESObject) => {
+          }).catch((err: Any) => {
             Log.e(PlatformMethodCallback.TAG, "Failed to get PasteData. Cause: " + JSON.stringify(err));
           });
           break;
@@ -395,21 +396,21 @@ class PlatformMethodCallback implements MethodCallHandler {
           break;
         case "Clipboard.hasStrings":
           let hasStrings: boolean = false;
-          let response: ESObject = new Map().set("value", false);
+          let response: Any = new Map().set("value", false);
           let systemPasteboard = pasteboard.getSystemPasteboard();
           systemPasteboard.hasData().then((hasData) => {
             if (!hasData) {
               response.value = hasData;
               result.success(response);
             }
-          }).catch((err: ESObject) => {
+          }).catch((err: Any) => {
             Log.e(PlatformMethodCallback.TAG, "systemPasteboard.hasData err: " + JSON.stringify(err));
           })
           systemPasteboard.getData().then((pasteData) => {
             hasStrings = pasteData.hasType(pasteboard.MIMETYPE_TEXT_PLAIN);
             response.value = hasStrings;
             result.success(response);
-          }).catch((err: ESObject) => {
+          }).catch((err: Any) => {
             Log.e(PlatformMethodCallback.TAG, "getData err: " + JSON.stringify(err));
           })
           break;
@@ -454,7 +455,7 @@ class PlatformMethodCallback implements MethodCallHandler {
     }
   }
 
-  private decodeSystemChromeStyle(encodedStyle: ESObject): SystemChromeStyle {
+  private decodeSystemChromeStyle(encodedStyle: Any): SystemChromeStyle {
     let statusBarColor: number | null = null;
     let statusBarIconBrightness: Brightness | null = null;
     let systemStatusBarContrastEnforced: boolean | null = null;
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/PlatformViewsChannel.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/PlatformViewsChannel.ets
index 5da4a68f2f5101f6eb12f36a2921d3c93249ead8..66531efde816b11f903d4d946dc697051d5f5c3a 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/PlatformViewsChannel.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/PlatformViewsChannel.ets
@@ -12,6 +12,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+import Any from '../../../plugin/common/Any';
 
 import MethodCall from '../../../plugin/common/MethodCall';
 import MethodChannel, { MethodCallHandler, MethodResult } from '../../../plugin/common/MethodChannel';
@@ -58,7 +59,7 @@ export default class PlatformViewsChannel {
   }
 
   create(call: MethodCall, result: MethodResult): void {
-    const createArgs: Map<string, ESObject> = call.args;
+    const createArgs: Map<string, Any> = call.args;
     const usesPlatformViewLayer: boolean = createArgs.has("hybrid") && createArgs.get("hybrid") as boolean;
     const additionalParams: ByteBuffer = createArgs.has("params") ? createArgs.get("params") : null;
 
@@ -129,7 +130,7 @@ export default class PlatformViewsChannel {
   }
 
   dispose(call: MethodCall, result: MethodResult): void {
-    const disposeArgs: Map<string, ESObject> = call.args;
+    const disposeArgs: Map<string, Any> = call.args;
     const viewId: number = disposeArgs.get("id");
     try {
       this.handler?.dispose(viewId);
@@ -141,7 +142,7 @@ export default class PlatformViewsChannel {
   }
 
   resize(call: MethodCall, result: MethodResult): void {
-    const resizeArgs: Map<string, ESObject> = call.args;
+    const resizeArgs: Map<string, Any> = call.args;
     const resizeRequest: PlatformViewResizeRequest = new PlatformViewResizeRequest(
       resizeArgs.get("id"),
       resizeArgs.get("width"),
@@ -158,7 +159,7 @@ export default class PlatformViewsChannel {
   }
 
   offset(call: MethodCall, result: MethodResult): void {
-    const offsetArgs: Map<string, ESObject> = call.args;
+    const offsetArgs: Map<string, Any> = call.args;
     try {
       this.handler?.offset(
         offsetArgs.get("id"),
@@ -172,7 +173,7 @@ export default class PlatformViewsChannel {
   }
 
   touch(call: MethodCall, result: MethodResult): void {
-    const args: Array<ESObject> = call.args;
+    const args: Array<Any> = call.args;
     let index = 0;
     const touch: PlatformViewTouch = new PlatformViewTouch(
       args[index++],
@@ -203,7 +204,7 @@ export default class PlatformViewsChannel {
   }
 
   setDirection(call: MethodCall, result: MethodResult): void {
-    const setDirectionArgs: Map<string, ESObject> = call.args;
+    const setDirectionArgs: Map<string, Any> = call.args;
     const newDirectionViewId: number = setDirectionArgs.get("id");
     const direction: number = setDirectionArgs.get("direction");
 
@@ -427,10 +428,10 @@ export class PlatformViewTouch {
   public pointerCount: number;
 
   /** Properties for each pointer, encoded in a raw format. */
-  public rawPointerPropertiesList: ESObject;
+  public rawPointerPropertiesList: Any;
 
   /** Coordinates for each pointer, encoded in a raw format. */
-  public rawPointerCoords: ESObject;
+  public rawPointerCoords: Any;
 
   public metaState: number;
 
@@ -457,8 +458,8 @@ export class PlatformViewTouch {
               eventTime: number,
               action: number,
               pointerCount: number,
-              rawPointerPropertiesList: ESObject,
-              rawPointerCoords: ESObject,
+              rawPointerPropertiesList: Any,
+              rawPointerCoords: Any,
               metaState: number,
               buttonState: number,
               xPrecision: number,
@@ -542,7 +543,7 @@ class ResizeCallback extends PlatformViewBufferResized {
     if (bufferSize == null) {
       this.result?.error("error", "Failed to resize the platform view", null);
     } else {
-      const response: Map<string, ESObject> = new Map();
+      const response: Map<string, Any> = new Map();
       response.set("width", bufferSize.width);
       response.set("height", bufferSize.height);
       this.result?.success(response);
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/RestorationChannel.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/RestorationChannel.ets
index 23568f97b2acf1379e41ba9f7f329b44a1e3e37d..c23d09ecb359444b07586fcbad448f941072634c 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/RestorationChannel.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/RestorationChannel.ets
@@ -12,6 +12,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+import Any from '../../../plugin/common/Any';
 
 import MethodCall from '../../../plugin/common/MethodCall';
 import MethodChannel, { MethodCallHandler, MethodResult } from '../../../plugin/common/MethodChannel';
@@ -110,11 +111,11 @@ export default class RestorationChannel {
       // e.g. when the engine is attached to a new activity.
       this.channel?.invokeMethod(
         "push", RestorationChannelMethodCallHandler.packageData(data), {
-        success: (result: ESObject): void => {
+        success: (result: Any): void => {
           this.restorationData = data;
         },
 
-        error: (errorCode: string, errorMessage: string, errorDetails: ESObject): void => {
+        error: (errorCode: string, errorMessage: string, errorDetails: Any): void => {
           Log.e(
             RestorationChannel.TAG,
             "Error " + errorCode + " while sending restoration data to framework: " + errorMessage
@@ -151,7 +152,7 @@ class RestorationChannelMethodCallHandler implements MethodCallHandler {
 
   onMethodCall(call: MethodCall, result: MethodResult): void {
     const method = call.method;
-    const args: ESObject = call.args;
+    const args: Any = call.args;
     switch (method) {
       case "put": {
         this.channel.setRestorationDataOnly(args);
@@ -178,8 +179,8 @@ class RestorationChannelMethodCallHandler implements MethodCallHandler {
     }
   }
 
-  static packageData(data: Uint8Array): Map<string, ESObject> {
-    const packaged: Map<string, ESObject> = new Map();
+  static packageData(data: Uint8Array): Map<string, Any> {
+    const packaged: Map<string, Any> = new Map();
     packaged.set("enabled", true);
     packaged.set("data", data);
     return packaged;
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/SystemChannel.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/SystemChannel.ets
index 9f9ef28154563799368fbbe816ceed3cd78f0d3e..b478ee36461aa2f6bb9833b1f49c595e368f4bf3 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/SystemChannel.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/SystemChannel.ets
@@ -14,6 +14,7 @@
 */
 
 import BasicMessageChannel from '../../../plugin/common/BasicMessageChannel';
+import Any from '../../../plugin/common/Any';
 import JSONMessageCodec from '../../../plugin/common/JSONMessageCodec';
 import Log from '../../../util/Log';
 import DartExecutor from '../dart/DartExecutor';
@@ -26,7 +27,7 @@ export default class SystemChannel {
   public channel: BasicMessageChannel<object>;
 
   constructor(dartExecutor: DartExecutor) {
-    this.channel = new BasicMessageChannel<ESObject>(dartExecutor, "flutter/system", JSONMessageCodec.INSTANCE);
+    this.channel = new BasicMessageChannel<Any>(dartExecutor, "flutter/system", JSONMessageCodec.INSTANCE);
   }
 
   public sendMemoryPressureWarning(): void {
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/TextInputChannel.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/TextInputChannel.ets
index c02c3ad005371a98e50fed4d23ca2b3852c89cd6..88cf23ec7b48d6fe5bfa5e163f2df934dcd25925 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/TextInputChannel.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/engine/systemchannels/TextInputChannel.ets
@@ -20,6 +20,9 @@ import TextInputPlugin from '../../../plugin/editing/TextInputPlugin';
 import Log from '../../../util/Log';
 import DartExecutor from '../dart/DartExecutor';
 import inputMethod from '@ohos.inputMethod';
+import ArrayList from '@ohos.util.ArrayList';
+import { TextEditingDelta, TextEditingDeltaJson } from '../../../plugin/editing/TextEditingDelta';
+import Any from '../../../plugin/common/Any';
 
 const TAG = "TextInputChannel";
 
@@ -56,6 +59,18 @@ export default class TextInputChannel {
     return state;
   }
 
+  createEditingDeltaJSON(batchDeltas: ArrayList<TextEditingDelta>): EditingDelta {
+    let deltas: Array<TextEditingDeltaJson> = [];
+    batchDeltas.forEach((val, idx, array) => {
+      deltas.push(val.toJSON());
+    })
+
+    let state: EditingDelta = {
+      deltas: deltas,
+    };
+    return state;
+  }
+
   /**
    * Instructs Flutter to update its text input editing state to reflect the given configuration.
    */
@@ -68,10 +83,16 @@ export default class TextInputChannel {
     Log.d(TAG, "updateEditingState:"
       + "Text: " + text + " Selection start: " + selectionStart + " Selection end: "
       + selectionEnd + " Composing start: " + composingStart + " Composing end: " + composingEnd);
-    const state: ESObject = this.createEditingStateJSON(text, selectionStart, selectionEnd, composingStart, composingEnd);
+    const state: Any = this.createEditingStateJSON(text, selectionStart, selectionEnd, composingStart, composingEnd);
     this.channel.invokeMethod('TextInputClient.updateEditingState', [inputClientId, state]);
   }
 
+  updateEditingStateWithDeltas(inputClientId: number, batchDeltas: ArrayList<TextEditingDelta>): void {
+    Log.d(TAG, "updateEditingStateWithDeltas:" + "batchDeltas length: " + batchDeltas.length);
+    const state: Any = this.createEditingDeltaJSON(batchDeltas);
+    this.channel.invokeMethod('TextInputClient.updateEditingStateWithDeltas', [inputClientId, state]);
+  }
+
   newline(inputClientId: number): void {
     Log.d(TAG, "Sending 'newline' message.");
     this.channel.invokeMethod("TextInputClient.performAction", [inputClientId, "TextInputAction.newline"]);
@@ -121,10 +142,9 @@ export default class TextInputChannel {
     Log.d(TAG, "Sending 'onConnectionClosed' message.");
   }
 
-  performPrivateCommand(inputClientId: number, action: string, data: ESObject) {
+  performPrivateCommand(inputClientId: number, action: string, data: Any) {
 
   }
-
 }
 
 interface EditingState {
@@ -135,6 +155,12 @@ interface EditingState {
   composingExtent: number;
 }
 
+
+interface EditingDelta {
+  deltas: Array<TextEditingDeltaJson>;
+}
+
+
 export interface TextInputMethodHandler {
   show(): void;
 
@@ -175,12 +201,12 @@ export class Configuration {
               enableSuggestions: boolean,
               enableIMEPersonalizedLearning: boolean,
               enableDeltaModel: boolean,
-              textCapitalization:TextCapitalization,
+              textCapitalization: TextCapitalization,
               inputType: InputType,
               inputAction: Number,
               actionLabel: String,
-              autofill :boolean,
-              contentListString:[],
+              autofill: boolean,
+              contentListString: [],
               fields: Configuration[]
   ) {
     this.obscureText = obscureText;
@@ -197,8 +223,9 @@ export class Configuration {
     this.fields = fields
 
   }
+
   static getTextCapitalizationFromValue(encodedName: string): TextCapitalization {
-    let textKeys= ["CHARACTERS", "WORDS","SENTENCES", "NONE"];
+    let textKeys = ["CHARACTERS", "WORDS", "SENTENCES", "NONE"];
     for (let textKey of textKeys) {
       if (TextCapitalization[textKey] === encodedName) {
         return textKey as TextCapitalization;
@@ -206,8 +233,9 @@ export class Configuration {
     }
     throw new Error("No such TextCapitalization: " + encodedName);
   }
-  private static inputActionFromTextInputAction(inputActionName:string):number{
-    switch(inputActionName){
+
+  private static inputActionFromTextInputAction(inputActionName: string): number {
+    switch (inputActionName) {
       case "TextInputAction.previous":
         return inputMethod.EnterKeyType.PREVIOUS
       case "TextInputAction.unspecified":
@@ -228,23 +256,24 @@ export class Configuration {
 
     }
   }
-  static fromJson(json:ESObject) {
-    const inputActionName:string = json.inputAction;
+
+  static fromJson(json: Any) {
+    const inputActionName: string = json.inputAction;
     if (!inputActionName) {
       throw new Error("Configuration JSON missing 'inputAction' property.");
     }
 
-    let fields:Array<ESObject> = new Array();
+    let fields: Array<Any> = new Array();
     if (json.fields !== null && json.fields !== undefined) {
-      fields = json.fields.map((field:ESObject):ESObject => Configuration.fromJson(field));
+      fields = json.fields.map((field: Any): Any => Configuration.fromJson(field));
     }
 
-    const inputAction:number = Configuration.inputActionFromTextInputAction(inputActionName);
+    const inputAction: number = Configuration.inputActionFromTextInputAction(inputActionName);
 
     // Build list of content commit mime types from the data in the JSON list.
-    const contentList:Array<ESObject> = [];
+    const contentList: Array<Any> = [];
     if (json.contentCommitMimeTypes !== null && json.contentCommitMimeTypes !== undefined) {
-      json.contentCommitMimeTypes.forEach((type:ESObject) => {
+      json.contentCommitMimeTypes.forEach((type: Any) => {
         contentList.push(type);
       });
     }
@@ -259,11 +288,10 @@ export class Configuration {
       inputAction,
       json.actionLabel ?? null,
       json.autofill ?? null,
-      contentList as ESObject,
+      contentList as Any,
       fields
     );
   }
-
 }
 
 enum TextCapitalization {
@@ -298,13 +326,13 @@ export class InputType {
     this.isDecimal = isDecimal;
   }
 
-  static fromJson(json: ESObject): InputType {
+  static fromJson(json: Any): InputType {
     return new InputType(InputType.getTextInputTypeFromValue(json.name as string),
       json.signed as boolean, json.decimal as boolean)
   }
 
   static getTextInputTypeFromValue(encodedName: string): TextInputType {
-    let textKeys = [  "TEXT", "DATETIME","NAME" , "POSTAL_ADDRESS", "NUMBER", "PHONE", "MULTILINE", "EMAIL_ADDRESS", "URL", "VISIBLE_PASSWORD", "NONE" ,];
+    let textKeys = ["TEXT", "DATETIME", "NAME", "POSTAL_ADDRESS", "NUMBER", "PHONE", "MULTILINE", "EMAIL_ADDRESS", "URL", "VISIBLE_PASSWORD", "NONE",];
     for (let textKey of textKeys) {
       if (TextInputType[textKey] === encodedName) {
         return textKey as TextInputType;
@@ -366,7 +394,7 @@ export class TextEditState {
     return this.composingStart >= 0 && this.composingEnd > this.composingStart;
   }
 
-  static fromJson(textEditState: ESObject): TextEditState {
+  static fromJson(textEditState: Any): TextEditState {
     return new TextEditState(
       textEditState.text,
       textEditState.selectionBase,
@@ -389,7 +417,7 @@ class TextInputCallback implements MethodCallHandler {
       return;
     }
     let method: string = call.method;
-    let args: ESObject = call.args;
+    let args: Any = call.args;
     Log.d(TAG, "Received '" + method + "' message.");
     switch (method) {
       case "TextInput.show":
@@ -403,7 +431,7 @@ class TextInputCallback implements MethodCallHandler {
         break;
       case "TextInput.setClient":
         const textInputClientId: number = args[0] as number;
-        const jsonConfiguration :string = args[1] ;
+        const jsonConfiguration: string = args[1];
         const config: Configuration | null = Configuration.fromJson(jsonConfiguration);
 
         this.textInputMethodHandler.setClient(textInputClientId, config);
@@ -442,5 +470,4 @@ class TextInputCallback implements MethodCallHandler {
         break;
     }
   }
-
 }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterAbility.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterAbility.ets
index a5869a3cbf58fcf336c338cfc1d3619538ed7cef..338c28452a52969fbb6d776f4669f0e033395254 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterAbility.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterAbility.ets
@@ -18,6 +18,7 @@ import window from '@ohos.window';
 import { FlutterAbilityAndEntryDelegate, Host } from './FlutterAbilityAndEntryDelegate';
 import Log from '../../util/Log';
 import FlutterEngine from '../engine/FlutterEngine';
+import PlatformPlugin from '../../plugin/PlatformPlugin';
 import FlutterShellArgs from '../engine/FlutterShellArgs';
 import FlutterAbilityLaunchConfigs from './FlutterAbilityLaunchConfigs';
 import common from '@ohos.app.ability.common';
@@ -124,7 +125,7 @@ export class FlutterAbility extends UIAbility implements Host {
    * window状态改变回调
    * @param windowStage
    */
-  async onWindowStageCreate(windowStage: window.WindowStage) {
+  onWindowStageCreate(windowStage: window.WindowStage) {
     FlutterManager.getInstance().pushWindowStage(this, windowStage);
     this.mainWindow = windowStage.getMainWindowSync();
     try {
@@ -161,6 +162,7 @@ export class FlutterAbility extends UIAbility implements Host {
           Log.e(TAG, 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? '');
           return;
         }
+        this.flutterView?.onWindowCreated();
 
         Log.i(TAG, 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? '');
       });
@@ -208,6 +210,10 @@ export class FlutterAbility extends UIAbility implements Host {
     return this;
   }
 
+  getFlutterAbilityAndEntryDelegate(): FlutterAbilityAndEntryDelegate | null{
+    return this.delegate ?? null;
+  }
+
   shouldDispatchAppLifecycleState(): boolean {
     return true;
   }
@@ -216,10 +222,12 @@ export class FlutterAbility extends UIAbility implements Host {
     return null;
   }
 
+  providePlatformPlugin(flutterEngine: FlutterEngine): PlatformPlugin | undefined {
+    return new PlatformPlugin(flutterEngine.getPlatformChannel()!, this.context, this);
+  }
+
   configureFlutterEngine(flutterEngine: FlutterEngine) {
-    let _UIContext = this.mainWindow?.getUIContext();
-    this.delegate?.setUIContext(_UIContext);
-    this.delegate?.sendSettings();
+
   }
 
   cleanUpFlutterEngine(flutterEngine: FlutterEngine) {
@@ -296,11 +304,6 @@ export class FlutterAbility extends UIAbility implements Host {
     return true;
   }
 
-  getPlugins(): List<FlutterPlugin>{
-    // Subclasses should override this function.
-    return new List()
-  }
-
   getExclusiveAppComponent(): ExclusiveAppComponent<UIAbility> | null {
     return this.delegate ? this.delegate : null
   }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterAbilityAndEntryDelegate.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterAbilityAndEntryDelegate.ets
index 056d8c0b5cad796975b3121ef57848fa606cd23b..733a4f24d4919eb9a26646fd50a91488eb4aeadd 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterAbilityAndEntryDelegate.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterAbilityAndEntryDelegate.ets
@@ -32,13 +32,11 @@ import { FlutterPlugin } from '../engine/plugins/FlutterPlugin';
 import FlutterEngineCache from '../engine/FlutterEngineCache';
 import FlutterEngineGroupCache from '../engine/FlutterEngineGroupCache';
 import FlutterEngineGroup, { Options } from '../engine/FlutterEngineGroup';
-import Settings from './Settings';
 import FlutterNapi from '../engine/FlutterNapi';
-import List from '@ohos.util.List';
-import GeneratedPluginRegister from '../engine/plugins/util/GeneratedPluginRegister';
-import { UIContext } from '@ohos.arkui.UIContext';
 import { FlutterView } from '../../view/FlutterView';
 import FlutterManager from './FlutterManager';
+import router from '@ohos.router';
+import Any from '../../plugin/common/Any';
 
 const TAG = "FlutterAbilityDelegate";
 const PLUGINS_RESTORATION_BUNDLE_KEY = "plugins";
@@ -54,11 +52,9 @@ class FlutterAbilityAndEntryDelegate implements ExclusiveAppComponent<UIAbility>
   flutterEngine?: FlutterEngine | null;
   platformPlugin?: PlatformPlugin;
   private context?: common.Context;
-  private uiContext?: UIContext | undefined;
   private textInputPlugin?: TextInputPlugin;
   private isFlutterEngineFromHostOrCache: boolean = false;
   private engineGroup?: FlutterEngineGroup;
-  private settings?: Settings;
   private isHost:boolean = false;
   private flutterView?: FlutterView
 
@@ -88,17 +84,11 @@ class FlutterAbilityAndEntryDelegate implements ExclusiveAppComponent<UIAbility>
       this.flutterEngine?.getAbilityControlSurface()?.attachToAbility(this);
     }
     //providePlatformPlugin
-
+    this.platformPlugin = this.host?.providePlatformPlugin(this.flutterEngine!)
     //configureFlutterEngine
     this.isAttached = true;
-    const plugins = this.host?.getPlugins()
-    if (plugins) {
-      GeneratedPluginRegister.registerGeneratedPlugins(this.flutterEngine!, plugins);
-    }
     if (this.flutterEngine) {
       this.textInputPlugin = new TextInputPlugin(this.flutterEngine.getTextInputChannel()!);
-      this.platformPlugin = new PlatformPlugin(this.flutterEngine.getPlatformChannel()!, this.context);
-      this.settings = new Settings(this.flutterEngine.getSettingsChannel()!);
       this.flutterEngine.getSystemLanguages();
     }
     if (this.flutterEngine && this.flutterView) {
@@ -107,6 +97,11 @@ class FlutterAbilityAndEntryDelegate implements ExclusiveAppComponent<UIAbility>
     this.host?.configureFlutterEngine(this.flutterEngine!!);
   }
 
+  popSystemNavigator(): boolean {
+    router.back();
+    return true;
+  }
+
   /**
    * 加载app.so资源或者snapshot
    */
@@ -164,8 +159,8 @@ class FlutterAbilityAndEntryDelegate implements ExclusiveAppComponent<UIAbility>
       return result
     }
     if (typeof wantParam[FRAMEWORK_RESTORATION_BUNDLE_KEY] == 'object') {
-      let data: Record<string, ESObject> = wantParam[FRAMEWORK_RESTORATION_BUNDLE_KEY] as Record<string,
-      ESObject>;
+      let data: Record<string, Any> = wantParam[FRAMEWORK_RESTORATION_BUNDLE_KEY] as Record<string,
+      Any>;
       let byteArray: Array<number> = new Array;
       Object.keys(data).forEach(
         key => {
@@ -241,7 +236,6 @@ class FlutterAbilityAndEntryDelegate implements ExclusiveAppComponent<UIAbility>
     }
     if (this.context) {
       this.flutterEngine = await group?.createAndRunEngineByOptions(this.addEntrypointOptions(new Options(this.context)
-        .setAutomaticallyRegisterPlugins(false)
         .setWaitForRestorationData(this.host?.shouldRestoreAndSaveState() || false)));
     }
     this.isFlutterEngineFromHostOrCache = false;
@@ -397,6 +391,10 @@ class FlutterAbilityAndEntryDelegate implements ExclusiveAppComponent<UIAbility>
     return this.flutterEngine?.getFlutterNapi() ?? null
   }
 
+  getFlutterEngine(): FlutterEngine | null {
+    return this.flutterEngine ?? null;
+  }
+
   detachFromFlutterEngine() {
     if (this.host?.shouldDestroyEngineWithHost()) {
       // The host owns the engine and should never have its engine taken by another exclusive
@@ -461,19 +459,6 @@ class FlutterAbilityAndEntryDelegate implements ExclusiveAppComponent<UIAbility>
     this.flutterEngine?.getPlugins()?.remove(plugin.getUniqueClassName())
   }
 
-  sendSettings(): void {
-    if (this.uiContext != undefined) {
-      this.settings?.sendSettings(this.uiContext.getMediaQuery());
-    } else {
-      Log.e(TAG, "UIContext is null, cannot send Settings!");
-    }
-
-  }
-
-  setUIContext(uiContext: UIContext | undefined): void {
-    this.uiContext = uiContext;
-  }
-
   isFlutterEngineFromHost(): boolean {
     return this.isFlutterEngineFromHostOrCache;
   }
@@ -532,11 +517,10 @@ interface Host extends FlutterEngineProvider, FlutterEngineConfigurator, Platfor
 
   shouldRestoreAndSaveState(): boolean;
 
-  /** Return the plugins */
-  getPlugins(): List<FlutterPlugin>;
-
   /* Return the ExclusiveAppComponent */
   getExclusiveAppComponent(): ExclusiveAppComponent<UIAbility> | null
+
+  providePlatformPlugin(flutterEngine: FlutterEngine): PlatformPlugin | undefined
 }
 
 export { Host, FlutterAbilityAndEntryDelegate }
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterEntry.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterEntry.ets
index e995319b549201eb1dfa72ce972df8d64d53138f..a8b4845d0f176a8b1978bda139a497443a37e077 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterEntry.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterEntry.ets
@@ -14,6 +14,7 @@
 */
 
 import FlutterEngine from '../engine/FlutterEngine';
+import PlatformPlugin from '../../plugin/PlatformPlugin';
 import Want from '@ohos.app.ability.Want';
 import FlutterShellArgs from '../engine/FlutterShellArgs';
 import UIAbility from '@ohos.app.ability.UIAbility';
@@ -38,26 +39,32 @@ export default class FlutterEntry implements Host {
   private flutterView: FlutterView | null = null
   private context: Context;
   private windowStage: window.WindowStage | null = null
-  private parameters: ESObject = {};
+  private parameters: Record<string, Object> = {};
   private engineConfigurator: FlutterEngineConfigurator | null = null
+  private hasInit: boolean = false;
 
-  constructor(context: Context, params: ESObject = {}) {
+  constructor(context: Context, params: Record<string, Object> = {}) {
     this.context = context;
     this.uiAbility = FlutterManager.getInstance().getUIAbility(context);
     this.parameters = params;
     this.windowStage = FlutterManager.getInstance().getWindowStage(this.uiAbility);
+    this.hasInit = false;
   }
 
   async aboutToAppear() {
     Log.i(TAG, 'aboutToAppear');
-    this.delegate = new FlutterAbilityAndEntryDelegate(this);
-    this.flutterView = this.delegate?.createView(this.context);
-    await this?.delegate?.onAttach(this.context);
-    Log.i(TAG, 'onAttach end');
-    this?.delegate?.platformPlugin?.setUIAbilityContext(this.uiAbility!!.context);
-    this.delegate?.onCreate();
-    this.delegate?.onWindowStageCreate()
-    this.windowStage?.on('windowStageEvent', this.windowStageEventCallback);
+    if (this.hasInit == false) {
+      this.delegate = new FlutterAbilityAndEntryDelegate(this);
+      this.flutterView = this.delegate?.createView(this.context);
+      this.flutterView?.onWindowCreated();
+      await this?.delegate?.onAttach(this.context);
+      Log.i(TAG, 'onAttach end');
+      this?.delegate?.platformPlugin?.setUIAbilityContext(this.uiAbility!!.context);
+      this.delegate?.onCreate();
+      this.delegate?.onWindowStageCreate()
+      this.windowStage?.on('windowStageEvent', this.windowStageEventCallback);
+      this.hasInit = true;
+    }
   }
 
   private windowStageEventCallback = (data: window.WindowStageEventType) => {
@@ -119,6 +126,11 @@ export default class FlutterEntry implements Host {
     this?.delegate?.onBackground();
   }
 
+  onBackPress() {
+    Log.d(TAG, "FlutterEntry onBackPress===");
+    this?.delegate?.flutterEngine?.getNavigationChannel()?.popRoute();
+  }
+
   shouldDispatchAppLifecycleState(): boolean {
     return true;
   }
@@ -205,10 +217,6 @@ export default class FlutterEntry implements Host {
     return true;
   }
 
-  getPlugins(): List<FlutterPlugin> {
-    return new List()
-  }
-
   getExclusiveAppComponent(): ExclusiveAppComponent<UIAbility> | null {
     return this.delegate ? this.delegate : null
   }
@@ -217,6 +225,10 @@ export default class FlutterEntry implements Host {
     return null;
   }
 
+  providePlatformPlugin(flutterEngine: FlutterEngine): PlatformPlugin | undefined {
+    return new PlatformPlugin(flutterEngine.getPlatformChannel()!, this.context, this);
+  }
+
   configureFlutterEngine(flutterEngine: FlutterEngine) {
     if (this.engineConfigurator) {
       this.engineConfigurator.configureFlutterEngine(flutterEngine)
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterManager.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterManager.ets
index 88362ab53af76e62848834d97076db1809598315..43f42053b87b839be3ec8d765e3993e64bf7ee56 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterManager.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterManager.ets
@@ -68,6 +68,10 @@ export default class FlutterManager {
     return this.flutterViewList.get(viewId) ?? null;
   }
 
+  getFlutterViewList(): Map<String, FlutterView> {
+    return this.flutterViewList;
+  }
+
   private putFlutterView(viewId: string, flutterView?: FlutterView): void {
     if (flutterView != null) {
       this.flutterViewList.set(viewId, flutterView);
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterPage.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterPage.ets
index 483813fa6ae5e97b4b79abf9c8748ecdac90eebb..92ef69d1119c44211dcd9fd47866543ff2847287 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterPage.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/FlutterPage.ets
@@ -12,6 +12,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+import Any from '../../plugin/common/Any';
 import { PlatformViewWrapper } from '../../plugin/platform/PlatformViewWrapper';
 import { RootDvModeManager } from '../../plugin/platform/RootDvModelManager';
 import Log from '../../util/Log';
@@ -25,6 +26,8 @@ import {
 } from '../../view/DynamicView/dynamicView';
 import { createDVModelFromJson } from '../../view/DynamicView/dynamicViewJson';
 import { FlutterView } from '../../view/FlutterView';
+import ApplicationInfoLoader from '../engine/loader/ApplicationInfoLoader';
+import FlutterApplicationInfo from '../engine/loader/FlutterApplicationInfo';
 import KeyEventChannel from '../engine/systemchannels/KeyEventChannel';
 import FlutterManager from './FlutterManager';
 
@@ -35,18 +38,20 @@ const TAG = "FlutterPage";
  */
 @Component
 export struct FlutterPage {
-  @State rootDvModel: DVModel | undefined = undefined
+  @State rootDvModel: DVModelChildren | undefined = undefined
   @Prop viewId: string = ""
+  @Prop xComponentType: XComponentType = XComponentType.SURFACE
   private flutterView?: FlutterView | null
+  private applicationInfo = ApplicationInfoLoader.load(getContext());
 
   aboutToAppear() {
     this.flutterView = FlutterManager.getInstance().getFlutterView(this.viewId);
-    this.rootDvModel = this.flutterView!!.getDVModel()
+    this.rootDvModel = this.flutterView!!.getDVModel().children
   }
 
   build() {
     Stack() {
-      XComponent({ id: this.viewId, type: 'texture', libraryname: 'flutter' })
+      XComponent({ id: this.viewId, type: this.xComponentType, libraryname: 'flutter' })
         .focusable(true)
         .onLoad((context) => {
           this.flutterView?.onSurfaceCreated()
@@ -56,13 +61,16 @@ export struct FlutterPage {
           Log.d(TAG, "XComponent onDestroy ");
           this.flutterView?.onSurfaceDestroyed()
         })
-      DynamicView({
-        model: this.rootDvModel,
-        params: this.rootDvModel!!.params as DVModelParameters,
-        events: this.rootDvModel!!.events as DVModelEvents,
-        children: this.rootDvModel!!.children as DVModelChildren,
-        customBuilder: this.rootDvModel!!.builder as ($$: Record<"params", DVModelParameters>) => void
-        //customBuilder: this.rootDvModel.model.builder as ($$: { params: DVModelParameters }) => void
+        .backgroundColor(Color.Transparent)
+
+      ForEach(this.rootDvModel!!, (child:Any) =>{
+        DynamicView({
+          model: child as DVModel,
+          params:child.params,
+          events:child.events,
+          children:child.children,
+          customBuilder:child.builder
+        })
       })
     }
     .onAreaChange((oldValue: Area, newValue: Area) => {
@@ -74,4 +82,4 @@ export struct FlutterPage {
       this.flutterView?.onKeyEvent(event)
     })
   }
-}
\ No newline at end of file
+}
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/OhosTouchProcessor.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/OhosTouchProcessor.ets
index 53f0f0a6c8f5e2ec858ad802a4e4653ed164c31e..46d0294ffce8763e71386296138281c45810d510 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/OhosTouchProcessor.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/embedding/ohos/OhosTouchProcessor.ets
@@ -14,6 +14,7 @@
 */
 
 import { TouchEvent } from '@ohos.multimodalInput.touchEvent';
+import Any from '../../plugin/common/Any';
 
 export default class OhosTouchProcessor {
   private static POINTER_DATA_FIELD_COUNT: number = 35;
@@ -22,7 +23,7 @@ export default class OhosTouchProcessor {
 
   private static POINTER_DATA_FLAG_BATCHED: number = 1;
 
-  public onTouchEvent(event: TouchEvent, transformMatrix: ESObject): void {
+  public onTouchEvent(event: TouchEvent, transformMatrix: Any): void {
 
   }
 }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/PlatformPlugin.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/PlatformPlugin.ets
index 44b8ebe6d96157670b6c8dce7a73d9d16ffb6f2b..1bec332a6369f5618ca8e46887edc490642eff76 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/PlatformPlugin.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/PlatformPlugin.ets
@@ -23,6 +23,7 @@ import PlatformChannel, {
   SystemUiMode,
   SystemUiOverlay
 } from '../embedding/engine/systemchannels/PlatformChannel';
+import FlutterManager from '../embedding/ohos/FlutterManager';
 import pasteboard from '@ohos.pasteboard';
 import Log from '../util/Log';
 import vibrator from '@ohos.vibrator';
@@ -34,7 +35,7 @@ import common from '@ohos.app.ability.common';
  */
 export default class PlatformPlugin {
   private static TAG = "PlatformPlugin";
-  private callback = new PlatformPluginCallback();
+  callback = new PlatformPluginCallback();
 
   constructor(platformChannel: PlatformChannel, context: common.Context, platformPluginDelegate?: PlatformPluginDelegate) {
     this.callback.platformChannel = platformChannel;
@@ -48,8 +49,11 @@ export default class PlatformPlugin {
           Log.e(PlatformPlugin.TAG, "Failed to obtain the top window. Cause: " + JSON.stringify(err));
           return;
         }
-        this.callback.windowClass = data;
+        this.callback.lastWindow = data;
       });
+      const uiAbility = FlutterManager.getInstance().getUIAbility(context);
+      const windowStage = FlutterManager.getInstance().getWindowStage(uiAbility);
+      this.callback.mainWindow = windowStage.getMainWindowSync();
     } catch (err) {
       Log.e(PlatformPlugin.TAG, "Failed to obtain the top window. Cause: " + JSON.stringify(err));
     }
@@ -59,7 +63,7 @@ export default class PlatformPlugin {
 
 
   updateSystemUiOverlays(): void {
-    this.callback.windowClass?.setWindowSystemBarEnable(this.callback.showBarOrNavigation);
+    this.callback.mainWindow?.setWindowSystemBarEnable(this.callback.showBarOrNavigation);
     if (this.callback.currentTheme != null) {
       this.callback.setSystemChromeSystemUIOverlayStyle(this.callback.currentTheme);
     }
@@ -92,10 +96,11 @@ export interface PlatformPluginDelegate {
   popSystemNavigator(): boolean;
 }
 
-class PlatformPluginCallback implements PlatformMessageHandler {
+export class PlatformPluginCallback implements PlatformMessageHandler {
   private static TAG = "PlatformPluginCallback";
   platform: PlatformPlugin | null = null;
-  windowClass: window.Window | null = null;
+  mainWindow: window.Window | null = null;
+  lastWindow: window.Window | null = null;
   platformChannel: PlatformChannel | null = null;
   platformPluginDelegate: PlatformPluginDelegate | null = null;
   context: common.Context | null = null;
@@ -135,7 +140,7 @@ class PlatformPluginCallback implements PlatformMessageHandler {
 
   setPreferredOrientations(ohosOrientation: number) {
     Log.d(PlatformPluginCallback.TAG, "ohosOrientation: " + ohosOrientation);
-    this.windowClass?.setPreferredOrientation(ohosOrientation);
+    this.mainWindow?.setPreferredOrientation(ohosOrientation);
   }
 
   setApplicationSwitcherDescription(description: AppSwitcherDescription) {
@@ -200,19 +205,19 @@ class PlatformPluginCallback implements PlatformMessageHandler {
     let uiConfig: ('status' | 'navigation')[] = [];
     if (mode == SystemUiMode.LEAN_BACK) {
       //全屏显示，通过点击显示器上的任何位置都可以显示状态和导航栏
-      this.windowClass?.setWindowLayoutFullScreen(false);
+      this.lastWindow?.setWindowLayoutFullScreen(false);
 
     } else if (mode == SystemUiMode.IMMERSIVE) {
       //全屏显示，通过在显示器边缘的滑动手势可以显示状态和导航栏,应用程序不会接收到此手势
-      this.windowClass?.setWindowLayoutFullScreen(true);
+      this.lastWindow?.setWindowLayoutFullScreen(true);
 
     } else if (mode == SystemUiMode.IMMERSIVE_STICKY) {
       //全屏显示，通过在显示器边缘的滑动手势可以显示状态和导航栏,此手势由应用程序接收
-      this.windowClass?.setWindowLayoutFullScreen(true);
+      this.lastWindow?.setWindowLayoutFullScreen(true);
 
     } else if (mode == SystemUiMode.EDGE_TO_EDGE) {
       //全屏显示，在应用程序上呈现状态和导航元素
-      this.windowClass?.setWindowLayoutFullScreen(false);
+      this.lastWindow?.setWindowLayoutFullScreen(false);
       uiConfig = ['status', 'navigation'];
 
     } else {
@@ -233,9 +238,11 @@ class PlatformPluginCallback implements PlatformMessageHandler {
       switch (systemChromeStyle.statusBarIconBrightness) {
         case Brightness.DARK:
           isStatusBarLightIconValue = false;
+          statusBarContentColorValue = '#000000';
           break;
         case Brightness.LIGHT:
           isStatusBarLightIconValue = true;
+          statusBarContentColorValue = '#FFFFFF';
           break;
       }
     }
@@ -274,7 +281,7 @@ class PlatformPluginCallback implements PlatformMessageHandler {
     systemBarProperties.isNavigationBarLightIcon = isNavigationBarLightIconValue;
     systemBarProperties.navigationBarContentColor = navigationBarContentColorValue;
     Log.d(PlatformPluginCallback.TAG, "systemBarProperties: " + JSON.stringify(systemBarProperties));
-    this.windowClass?.setWindowSystemBarProperties(systemBarProperties);
+    this.mainWindow?.setWindowSystemBarProperties(systemBarProperties);
   }
 
   setSystemChromeEnabledSystemUIOverlays(overlays: SystemUiOverlay[]): void {
diff --git a/shell/platform/ohos/flutter_embedding/oh-package-lock.json5 b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/Any.ets
old mode 100755
new mode 100644
similarity index 56%
rename from shell/platform/ohos/flutter_embedding/oh-package-lock.json5
rename to shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/Any.ets
index 1171a787ccbe8a160fae3b16422800af1563e12d..47b276990d36ba41a03de1c954dbc52867a7c6e8
--- a/shell/platform/ohos/flutter_embedding/oh-package-lock.json5
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/Any.ets
@@ -12,17 +12,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-{
-  "lockfileVersion": 1,
-  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
-  "specifiers": {
-    "@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6",
-    "@ohos/hypium@^1.0.6": "@ohos/hypium@1.0.6"
-  },
-  "packages": {
-    "@ohos/hypium@1.0.6": {
-      "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz",
-      "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ=="
-    }
-  }
-}
\ No newline at end of file
+
+declare type Any = ESObject;
+export default Any;
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/BasicMessageChannel.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/BasicMessageChannel.ets
index 796f8edb8936927b11819282e8721b41da55a103..5a58b8c3ca0daa6bd51f0281aa968904b1e68411 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/BasicMessageChannel.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/BasicMessageChannel.ets
@@ -74,7 +74,7 @@ export default class BasicMessageChannel<T> {
    *
    * @param handler a {@link MessageHandler}, or null to deregister.
    */
-  setMessageHandler(handler: MessageHandler<T>): void {
+  setMessageHandler(handler: MessageHandler<T> | null): void {
     // We call the 2 parameter variant specifically to avoid breaking changes in
     // mock verify calls.
     // See https://github.com/flutter/flutter/issues/92582.
@@ -136,7 +136,7 @@ class IncomingReplyHandler <T> implements BinaryReply {
     this.codec = codec
   }
 
-  reply(reply: ArrayBuffer) {
+  reply(reply: ArrayBuffer | null) {
     try {
       this.callback(this.codec.decodeMessage(reply));
     } catch (e) {
@@ -146,17 +146,17 @@ class IncomingReplyHandler <T> implements BinaryReply {
 }
 
 class IncomingMessageHandler<T> implements BinaryMessageHandler {
-  private handler: MessageHandler<T>
+  private handler: MessageHandler<T> | null
   private codec: MessageCodec<T>
 
-  constructor(handler: MessageHandler<T>, codec: MessageCodec<T>) {
+  constructor(handler: MessageHandler<T> | null, codec: MessageCodec<T>) {
     this.handler = handler;
     this.codec = codec
   }
 
   onMessage(message: ArrayBuffer, callback: BinaryReply) {
     try {
-      this.handler.onMessage(
+      this.handler?.onMessage(
         this.codec.decodeMessage(message),
         {
           reply: (reply: T): void => {
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/BinaryCodec.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/BinaryCodec.ets
index 578436417dc4a23cfaf2c5adbb9c8340efa5795d..1c15c762108efc389aef0b9d2bf3ff8b07b01991 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/BinaryCodec.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/BinaryCodec.ets
@@ -37,9 +37,9 @@ export default class BinaryCodec implements MessageCodec<ArrayBuffer> {
     return message
   }
 
-  decodeMessage(message: ArrayBuffer): ArrayBuffer {
+  decodeMessage(message: ArrayBuffer | null): ArrayBuffer {
     if (message == null) {
-      return message;
+      return new ArrayBuffer(0);
     } else if (this.returnsDirectByteBufferFromDecoding) {
       return message;
     } else {
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/BinaryMessenger.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/BinaryMessenger.ets
index e0b55276beb3893f0347d9893ecaab9d2754174c..68925a8b1abcaf1f99964f67e52da6e99cc8ba8c 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/BinaryMessenger.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/BinaryMessenger.ets
@@ -49,7 +49,7 @@ export interface BinaryReply {
      *     outgoing replies must place the reply bytes between position zero and current position.
      *     Reply receivers can read from the buffer directly.
      */
-    reply(reply: ArrayBuffer): void;
+    reply(reply: ArrayBuffer | null): void;
 }
 
 /** Handler for incoming binary messages from Flutter. */
@@ -96,7 +96,7 @@ export interface BinaryMessenger {
      * @param message the message payload, a direct-allocated {@link ByteBuffer} with the message
      *     bytes between position zero and current position, or null.
      */
-    send(channel: String, message: ArrayBuffer): void;
+    send(channel: String, message: ArrayBuffer | null): void;
 
     /**
      * Sends a binary message to the Flutter application, optionally expecting a reply.
@@ -127,7 +127,7 @@ export interface BinaryMessenger {
      *     the handler. Specifying null means execute on the platform thread.
      */
     //setMessageHandler(channel: String, handler: BinaryMessageHandler)
-    setMessageHandler(channel: String, handler: BinaryMessageHandler, taskQueue?: TaskQueue): void;
+    setMessageHandler(channel: String, handler: BinaryMessageHandler | null, taskQueue?: TaskQueue): void;
     // {
     //     if (taskQueue != null) {
     //         throw new Error("setMessageHandler called with nonnull taskQueue is not supported.")
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/EventChannel.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/EventChannel.ets
index 166659a32e819580f2d433886f763dc453d8a597..f0aacdd8453e6f418fea0b57507b71283f453193 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/EventChannel.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/EventChannel.ets
@@ -31,6 +31,7 @@
  */
 import Log from '../../util/Log';
 import { BinaryMessageHandler, BinaryMessenger, BinaryReply, TaskQueue } from './BinaryMessenger';
+import Any from './Any';
 import MethodCodec from './MethodCodec';
 import StandardMethodCodec from './StandardMethodCodec';
 
@@ -40,13 +41,13 @@ export default class EventChannel {
   private messenger: BinaryMessenger;
   private name: string;
   private codec: MethodCodec;
-  private taskQueue: TaskQueue;
+  private taskQueue: TaskQueue | null;
 
   constructor(messenger: BinaryMessenger, name: string, codec?: MethodCodec, taskQueue?: TaskQueue) {
     this.messenger = messenger
     this.name = name
     this.codec = codec ? codec : StandardMethodCodec.INSTANCE
-    this.taskQueue = taskQueue
+    this.taskQueue = taskQueue ?? null
   }
 
 
@@ -93,7 +94,7 @@ export interface StreamHandler {
    * @param arguments stream configuration arguments, possibly null.
    * @param events an {@link EventSink} for emitting events to the Flutter receiver.
    */
-  onListen(args: ESObject, events: EventSink): void;
+  onListen(args: Any, events: EventSink): void;
 
   /**
    * Handles a request to tear down the most recently created event stream.
@@ -107,7 +108,7 @@ export interface StreamHandler {
    *
    * @param arguments stream configuration arguments, possibly null.
    */
-  onCancel(args: ESObject): void;
+  onCancel(args: Any): void;
 }
 
 /**
@@ -121,7 +122,7 @@ export interface EventSink {
    *
    * @param event the event, possibly null.
    */
-  success(event: ESObject): void;
+  success(event: Any): void;
 
   /**
    * Consumes an error event.
@@ -130,7 +131,7 @@ export interface EventSink {
    * @param errorMessage a human-readable error message String, possibly null.
    * @param errorDetails error details, possibly null
    */
-  error(errorCode: string, errorMessage: string, errorDetails: ESObject): void;
+  error(errorCode: string, errorMessage: string, errorDetails: Any): void;
 
   /**
    * Consumes end of stream. Ensuing calls to {@link #success(Object)} or {@link #error(String,
@@ -164,7 +165,7 @@ class IncomingStreamRequestHandler implements BinaryMessageHandler {
     }
   }
 
-  onListen(args: ESObject, callback: BinaryReply): void {
+  onListen(args: Any, callback: BinaryReply): void {
     const eventSink = new EventSinkImplementation(this.activeSink, this.name, this.codec, this.messenger);
     const oldSink = this.activeSink.getAndSet(eventSink);
     if (oldSink != null) {
@@ -186,7 +187,7 @@ class IncomingStreamRequestHandler implements BinaryMessageHandler {
     }
   }
 
-  onCancel(args: ESObject, callback: BinaryReply): void {
+  onCancel(args: Any, callback: BinaryReply): void {
     const oldSink = this.activeSink.getAndSet(null);
     if (oldSink != null) {
       try {
@@ -216,14 +217,14 @@ class EventSinkImplementation implements EventSink {
     this.messenger = messenger;
   }
 
-  success(event: ESObject): void {
+  success(event: Any): void {
     if (this.hasEnded || this.activeSink.get() != this) {
       return;
     }
     this.messenger.send(this.name, this.codec.encodeSuccessEnvelope(event));
   }
 
-  error(errorCode: string, errorMessage: string, errorDetails: ESObject) {
+  error(errorCode: string, errorMessage: string, errorDetails: Any) {
     if (this.hasEnded || this.activeSink.get() != this) {
       return;
     }
@@ -236,26 +237,26 @@ class EventSinkImplementation implements EventSink {
       return;
     }
     this.hasEnded = true;
-    this.messenger.send(this.name, null);
+    this.messenger.send(this.name, new ArrayBuffer(0));
   }
 }
 
 class AtomicReference<T> {
-  private value: T;
+  private value: T | null;
 
-  constructor(value: T) {
+  constructor(value: T | null) {
     this.value = value
   }
 
-  get(): T {
+  get(): T | null {
     return this.value;
   }
 
-  set(newValue: T): void {
+  set(newValue: T | null): void {
     this.value = newValue;
   }
 
-  getAndSet(newValue: T) {
+  getAndSet(newValue: T | null) {
     const oldValue = this.value;
     this.value = newValue;
     return oldValue;
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/FlutterException.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/FlutterException.ets
index 204dd8e3eabf85edcdecf84a78e86517f424f4cb..260d5ad1d10e2f9da9d18e9ebc4548266c08d433 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/FlutterException.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/FlutterException.ets
@@ -12,15 +12,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+import Any from './Any';
 
 export default class FlutterException implements Error {
   stack?: string;
   message: string;
   name: string = "";
   code: string;
-  details: ESObject
+  details: Any
 
-  constructor(code: string, message: string, details: ESObject) {
+  constructor(code: string, message: string, details: Any) {
     this.message = message;
     this.code = code;
     this.details =details;
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/JSONMessageCodec.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/JSONMessageCodec.ets
index e766db57fc08160e21e5061e525a2c03e986621f..b082b2414e03f41bfdde310af12bfb730b68c1f0 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/JSONMessageCodec.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/JSONMessageCodec.ets
@@ -22,7 +22,8 @@ import HashMap from '@ohos.util.HashMap';
 import LightWeightMap from '@ohos.util.LightWeightMap';
 import PlainArray from '@ohos.util.PlainArray';  
 import List from '@ohos.util.List';
-import LinkedList from '@ohos.util.LinkedList';  
+import LinkedList from '@ohos.util.LinkedList';
+import Any from './Any';
 
 /**
  * A {@link MethodCodec} using UTF-8 encoded JSON method calls and result envelopes.
@@ -37,16 +38,16 @@ import LinkedList from '@ohos.util.LinkedList';
 export default class JSONMessageCodec implements MessageCodec<Object> {
   static INSTANCE = new JSONMessageCodec();
 
-  encodeMessage(message: ESObject): ArrayBuffer {
+  encodeMessage(message: Any): ArrayBuffer {
     if (message == null) {
       return StringUtils.stringToArrayBuffer("");
     }
     return StringCodec.INSTANCE.encodeMessage(JSON.stringify(this.toBaseData(message)));
   }
 
-  decodeMessage(message: ArrayBuffer): ESObject {
+  decodeMessage(message: ArrayBuffer | null): Any {
     if (message == null) {
-      return null;
+      return StringUtils.stringToArrayBuffer("");
     }
     try {
       const jsonStr = StringCodec.INSTANCE.decodeMessage(message);
@@ -56,18 +57,30 @@ export default class JSONMessageCodec implements MessageCodec<Object> {
     }
   }
 
-  toBaseData(message: ESObject): ESObject {
+  toBaseData(message: Any): Any {
     if (message == null || message == undefined) {
         return "";
     } else if (message instanceof List || message instanceof LinkedList) {
         return message.convertToArray();
     } else if (message instanceof Map || message instanceof HashMap || message instanceof TreeMap
         || message instanceof LightWeightMap || message instanceof PlainArray) {
-        let messageObj: ESObject = {};
-        message.forEach((value: ESObject, key: ESObject) => {
+        let messageObj: Any = {};
+        message.forEach((value: Any, key: Any) => {
           messageObj[this.toBaseData(key)] = this.toBaseData(value);
         });
         return messageObj;
+    } else if (message instanceof Array) {
+      let messageArr:Array<Any> = [];
+      message.forEach((value:Any)=>{
+        messageArr.push(this.toBaseData(value));
+      })
+      return messageArr;
+    } else if (message instanceof Object) {
+      let messageObj: Any = {};
+      Object.keys(message).forEach((key:Any)=>{
+        messageObj[this.toBaseData(key)] = this.toBaseData(message[key]);
+      })
+      return messageObj;
     } else {
         return message;
     }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/JSONMethodCodec.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/JSONMethodCodec.ets
index 7b5bf1d0891fe841d7380e0e6166ca5b82793e7b..895aa995dd6ba5644177c9c69dbd8039d3082394 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/JSONMethodCodec.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/JSONMethodCodec.ets
@@ -16,6 +16,7 @@ import Log from '../../util/Log';
 
 import ToolUtils from '../../util/ToolUtils';
 import FlutterException from './FlutterException';
+import Any from './Any';
 import JSONMessageCodec from './JSONMessageCodec';
 import MethodCall from './MethodCall';
 import MethodCodec from './MethodCodec';
@@ -35,7 +36,7 @@ export default class JSONMethodCodec implements MethodCodec {
 
   encodeMethodCall(methodCall: MethodCall): ArrayBuffer {
     try {
-      const map: Record<string, ESObject> = {
+      const map: Record<string, Any> = {
         "method": methodCall.method, "args": methodCall.args
       }
 
@@ -47,10 +48,10 @@ export default class JSONMethodCodec implements MethodCodec {
 
   decodeMethodCall(message: ArrayBuffer): MethodCall {
     try {
-      const json: ESObject = JSONMessageCodec.INSTANCE.decodeMessage(message);
+      const json: Any = JSONMessageCodec.INSTANCE.decodeMessage(message);
       if (ToolUtils.isObj(json)) {
         const method: string = json["method"];
-        const args: ESObject = json["args"];
+        const args: Any = json["args"];
         if (typeof method == 'string') {
           return new MethodCall(method, args);
         }
@@ -61,21 +62,21 @@ export default class JSONMethodCodec implements MethodCodec {
     }
   }
 
-  encodeSuccessEnvelope(result: ESObject): ArrayBuffer {
+  encodeSuccessEnvelope(result: Any): ArrayBuffer {
     return JSONMessageCodec.INSTANCE.encodeMessage([result]);
   }
 
-  encodeErrorEnvelope(errorCode: ESObject, errorMessage: string, errorDetails: ESObject) {
+  encodeErrorEnvelope(errorCode: Any, errorMessage: string, errorDetails: Any) {
     return JSONMessageCodec.INSTANCE.encodeMessage([errorCode, errorMessage, errorDetails]);
   }
 
-  encodeErrorEnvelopeWithStacktrace(errorCode: string, errorMessage: string, errorDetails: ESObject, errorStacktrace: string): ArrayBuffer {
+  encodeErrorEnvelopeWithStacktrace(errorCode: string, errorMessage: string, errorDetails: Any, errorStacktrace: string): ArrayBuffer {
     return JSONMessageCodec.INSTANCE.encodeMessage([errorCode, errorMessage, errorDetails, errorStacktrace])
   }
 
-  decodeEnvelope(envelope: ArrayBuffer): ESObject {
+  decodeEnvelope(envelope: ArrayBuffer): Any {
     try {
-      const json: ESObject = JSONMessageCodec.INSTANCE.decodeMessage(envelope);
+      const json: Any = JSONMessageCodec.INSTANCE.decodeMessage(envelope);
       if (json instanceof Array) {
         if (json.length == 1) {
           return json[0];
@@ -83,7 +84,7 @@ export default class JSONMethodCodec implements MethodCodec {
         if (json.length == 3) {
           const code: string = json[0];
           const message: string = json[1];
-          const details: ESObject = json[2];
+          const details: Any = json[2];
           if (typeof code == 'string' && (message == null || typeof message == 'string')) {
             throw new FlutterException(code, message, details);
           }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/MessageCodec.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/MessageCodec.ets
index 663d57af19c70523e44a5f48cc61e22ab0dc5b33..6cb2c033b63e20323e89aaecec9893bdfbadb92e 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/MessageCodec.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/MessageCodec.ets
@@ -26,5 +26,5 @@ export default interface MessageCodec<T> {
    * Decodes the specified message from binary.
    *
    */
-  decodeMessage(message: ArrayBuffer): T;
+  decodeMessage(message: ArrayBuffer | null): T;
 }
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/MethodCall.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/MethodCall.ets
index 0042c25c3b21f484cda8158e5485bb57e73dfd82..1588f617fb9e52fe9ebd4e4e66833ec83ebdf3ee 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/MethodCall.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/MethodCall.ets
@@ -14,6 +14,11 @@
 */
 
 import ToolUtils from '../../util/ToolUtils';
+import TreeMap from '@ohos.util.TreeMap';
+import HashMap from '@ohos.util.HashMap';
+import LightWeightMap from '@ohos.util.LightWeightMap';
+import Any from './Any';
+
 /** Command object representing a method call on a {@link MethodChannel}. */
 export default class MethodCall {
   /** The name of the called method. */
@@ -26,18 +31,18 @@ export default class MethodCall {
    * Consider using {@link #argument(String)} when that run-time type is {@link Map} or {@link
    * JSONObject}.
    */
-  args: ESObject;
+  args: Any;
 
-  constructor(method: string, args: ESObject) {
-    this.method = method
-    this.args = args
+  constructor(method: string, args: Any) {
+    this.method = method;
+    this.args = args;
   }
 
-  argument(key: string): ESObject {
+  argument(key: string): Any {
     if (this.args == null) {
       return null;
     } else if (this.args instanceof Map) {
-      return (this.args as Map<ESObject, ESObject>).get(key);
+      return (this.args as Map<Any, Any>).get(key);
     } else if (ToolUtils.isObj(this.args)) {
       return this.args[key]
     } else {
@@ -46,10 +51,10 @@ export default class MethodCall {
   }
 
   hasArgument(key: string): boolean {
-    if (arguments == null) {
+    if (this.args == null) {
       return false;
-    } else if (arguments instanceof Map) {
-      return (this.args as Map<ESObject, ESObject>).has(key);
+    } else if (this.args instanceof Map) {
+      return (this.args as Map<Any, Any>).has(key);
     } else if (ToolUtils.isObj(this.args)) {
       return this.args.hasOwnProperty(key);
     } else {
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/MethodChannel.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/MethodChannel.ets
index f42df11830d1a0eab1adc73acc30bde2d09406e1..a5af095a62b5c2f65e37c65dad4224e8a5aad8d7 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/MethodChannel.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/MethodChannel.ets
@@ -17,6 +17,7 @@ import Log from '../../util/Log';
 import MessageChannelUtils from '../../util/MessageChannelUtils';
 import StringUtils from '../../util/StringUtils';
 import { BinaryMessageHandler, BinaryMessenger, BinaryReply, TaskQueue } from './BinaryMessenger';
+import Any from './Any';
 import MethodCall from './MethodCall';
 import MethodCodec from './MethodCodec';
 import StandardMethodCodec from './StandardMethodCodec';
@@ -57,7 +58,7 @@ export default class MethodChannel {
    * @param arguments the arguments for the invocation, possibly null.
    * @param callback a {@link Result} callback for the invocation result, or null.
    */
-  invokeMethod(method: string, args: ESObject, callback?: MethodResult): void {
+  invokeMethod(method: string, args: Any, callback?: MethodResult): void {
     this.messenger.send(this.name, this.codec.encodeMethodCall(new MethodCall(method, args)), callback == null ? null : new IncomingResultHandler(callback, this.codec));
   }
 
@@ -139,7 +140,7 @@ export interface MethodResult {
    *     codec. For instance, if you are using {@link StandardMessageCodec} (default), please see
    *     its documentation on what types are supported.
    */
-  success: (result: ESObject) => void;
+  success: (result: Any) => void;
 
   /**
    * Handles an error result.
@@ -150,7 +151,7 @@ export interface MethodResult {
    *     supported by the codec. For instance, if you are using {@link StandardMessageCodec}
    *     (default), please see its documentation on what types are supported.
    */
-  error: (errorCode: string, errorMessage: string, errorDetails: ESObject) => void;
+  error: (errorCode: string, errorMessage: string, errorDetails: Any) => void;
 
   /** Handles a call to an unimplemented method. */
   notImplemented: () => void;
@@ -165,7 +166,7 @@ export class IncomingResultHandler implements BinaryReply {
     this.codec = codec
   }
 
-  reply(reply: ArrayBuffer): void {
+  reply(reply: ArrayBuffer | null): void {
     try {
       if (reply == null) {
         this.callback.notImplemented();
@@ -196,11 +197,11 @@ export class IncomingMethodCallHandler implements BinaryMessageHandler {
     try {
       this.handler.onMethodCall(
         call, {
-        success: (result: ESObject): void => {
+        success: (result: Any): void => {
           reply.reply(this.codec.encodeSuccessEnvelope(result));
         },
 
-        error: (errorCode: string, errorMessage: string, errorDetails: ESObject): void => {
+        error: (errorCode: string, errorMessage: string, errorDetails: Any): void => {
           reply.reply(this.codec.encodeErrorEnvelope(errorCode, errorMessage, errorDetails));
         },
 
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/MethodCodec.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/MethodCodec.ets
index 86ed92aca6d512fa8247d963619acf67f29b7fe4..445892d23809b823471da4edeecacb1e5050cf85 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/MethodCodec.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/MethodCodec.ets
@@ -12,6 +12,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+import Any from './Any';
 
 import MethodCall from './MethodCall';
 /**
@@ -49,7 +50,7 @@ export default interface MethodCodec {
    * @return a {@link ByteBuffer} containing the encoding between position 0 and the current
    *     position.
    */
-  encodeSuccessEnvelope(result: ESObject): ArrayBuffer;
+  encodeSuccessEnvelope(result: Any): ArrayBuffer;
 
   /**
    * Encodes an error result into a binary envelope message.
@@ -61,7 +62,7 @@ export default interface MethodCodec {
    * @return a {@link ByteBuffer} containing the encoding between position 0 and the current
    *     position.
    */
-  encodeErrorEnvelope(errorCode: string, errorMessage: string, errorDetails: ESObject): ArrayBuffer;
+  encodeErrorEnvelope(errorCode: string, errorMessage: string, errorDetails: Any): ArrayBuffer;
 
   /**
    * Encodes an error result into a binary envelope message with the native stacktrace.
@@ -74,7 +75,7 @@ export default interface MethodCodec {
    * @return a {@link ByteBuffer} containing the encoding between position 0 and the current
    *     position.
    */
-  encodeErrorEnvelopeWithStacktrace(errorCode: string, errorMessage: string, errorDetails: ESObject, errorStacktrace: string): ArrayBuffer
+  encodeErrorEnvelopeWithStacktrace(errorCode: string, errorMessage: string, errorDetails: Any, errorStacktrace: string): ArrayBuffer
 
   /**
    * Decodes a result envelope from binary.
@@ -83,5 +84,5 @@ export default interface MethodCodec {
    * @return the enveloped result Object.
    * @throws FlutterException if the envelope was an error envelope.
    */
-  decodeEnvelope(envelope: ArrayBuffer): ESObject
+  decodeEnvelope(envelope: ArrayBuffer): Any
 }
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/StandardMessageCodec.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/StandardMessageCodec.ets
index 2ee2ef39b25336d660cf74425d99f5477f11032e..5101b512135a4accff5d7ff08fd1acbb2a1700a8 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/StandardMessageCodec.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/StandardMessageCodec.ets
@@ -21,7 +21,8 @@ import HashMap from '@ohos.util.HashMap';
 import LightWeightMap from '@ohos.util.LightWeightMap';
 import PlainArray from '@ohos.util.PlainArray';  
 import List from '@ohos.util.List';
-import LinkedList from '@ohos.util.LinkedList'; 
+import LinkedList from '@ohos.util.LinkedList';
+import Any from './Any';
 
 /**
  * MessageCodec using the Flutter standard binary encoding.
@@ -66,17 +67,17 @@ import LinkedList from '@ohos.util.LinkedList';
  *
  * <p>To extend the codec, overwrite the writeValue and readValueOfType methods.
  */
-export default class StandardMessageCodec implements MessageCodec<ESObject> {
+export default class StandardMessageCodec implements MessageCodec<Any> {
     private static TAG = "StandardMessageCodec#";
     static INSTANCE = new StandardMessageCodec();
 
-    encodeMessage(message: ESObject): ArrayBuffer {
+    encodeMessage(message: Any): ArrayBuffer {
         const stream = ByteBuffer.from(new ArrayBuffer(1024))
         this.writeValue(stream, message);
         return stream.buffer
     }
 
-    decodeMessage(message: ArrayBuffer): ESObject {
+    decodeMessage(message: ArrayBuffer | null): Any {
         if (message == null) {
             return null
         }
@@ -101,7 +102,7 @@ export default class StandardMessageCodec implements MessageCodec<ESObject> {
     private static FLOAT32_ARRAY = 14;
 
 
-    writeValue(stream: ByteBuffer, value: ESObject): ESObject {
+    writeValue(stream: ByteBuffer, value: Any): Any {
         if (value == null || value == undefined) {
             stream.writeInt8(StandardMessageCodec.NULL);
         } else if (typeof value === "boolean") {
@@ -159,11 +160,11 @@ export default class StandardMessageCodec implements MessageCodec<ESObject> {
             || value instanceof LinkedList) {
             stream.writeInt8(StandardMessageCodec.LIST)
             this.writeSize(stream, value.length);
-            value.forEach((item: ESObject): void => this.writeValue(stream, item));
+            value.forEach((item: Any): void => this.writeValue(stream, item));
         } else if (value instanceof Map) {
             stream.writeInt8(StandardMessageCodec.MAP);
             this.writeSize(stream, value.size);
-            value.forEach((value: ESObject, key: ESObject) => {
+            value.forEach((value: Any, key: Any) => {
                 this.writeValue(stream, key);
                 this.writeValue(stream, value);
             });
@@ -171,12 +172,12 @@ export default class StandardMessageCodec implements MessageCodec<ESObject> {
             || value instanceof PlainArray) {
             stream.writeInt8(StandardMessageCodec.MAP);
             this.writeSize(stream, value.length);
-            value.forEach((value: ESObject, key: ESObject) => {
+            value.forEach((value: Any, key: Any) => {
                 this.writeValue(stream, key);
                 this.writeValue(stream, value);
             });
         } else if (typeof value == 'object') {
-            let map: Map<string, ESObject> = new Map();
+            let map: Map<string, Any> = new Map();
             Object.keys(value).forEach(key => {
                 map.set(key, value[key]);
             });
@@ -219,7 +220,7 @@ export default class StandardMessageCodec implements MessageCodec<ESObject> {
         if (value < 254) {
             return value;
         } else if (value == 254) {
-            return buffer.readInt16(true);
+            return buffer.readUint16(true);
         } else {
             return buffer.readInt32(true);
         }
@@ -232,8 +233,8 @@ export default class StandardMessageCodec implements MessageCodec<ESObject> {
         }
     }
 
-    readValue(buffer: ByteBuffer): ESObject {
-        let type = buffer.readInt8()
+    readValue(buffer: ByteBuffer): Any {
+        let type = buffer.readUint8()
         return this.readValueOfType(type, buffer);
     }
 
@@ -246,8 +247,8 @@ export default class StandardMessageCodec implements MessageCodec<ESObject> {
         return bytes;
     }
 
-    readValueOfType(type: number, buffer: ByteBuffer): ESObject {
-        let result: ESObject;
+    readValueOfType(type: number, buffer: ByteBuffer): Any {
+        let result: Any;
         switch (type) {
             case StandardMessageCodec.NULL:
                 result = null;
@@ -312,7 +313,7 @@ export default class StandardMessageCodec implements MessageCodec<ESObject> {
             }
             case StandardMessageCodec.LIST: {
                 let length = this.readSize(buffer);
-                let array: Array<ESObject> = new Array(length)
+                let array: Array<Any> = new Array(length)
                 for (let i = 0; i < length; i++) {
                     array[i] = this.readValue(buffer)
                 }
@@ -321,7 +322,7 @@ export default class StandardMessageCodec implements MessageCodec<ESObject> {
             }
             case StandardMessageCodec.MAP: {
                 let size = this.readSize(buffer);
-                let map: Map<ESObject, ESObject> = new Map()
+                let map: Map<Any, Any> = new Map()
                 for (let i = 0; i < size; i++) {
                     map.set(this.readValue(buffer), this.readValue(buffer));
                 }
@@ -339,7 +340,7 @@ export default class StandardMessageCodec implements MessageCodec<ESObject> {
                 break;
             }
             default:
-                throw new Error("Message corrupted");
+                throw new Error("Message corrupted, type=" + type);
         }
         return result;
     }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/StandardMethodCodec.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/StandardMethodCodec.ets
index d4417c54eb56d55355b73104ee8626a17836735f..279960f403444795148dd534546c5e145cfdfd07 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/StandardMethodCodec.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/StandardMethodCodec.ets
@@ -15,6 +15,7 @@
 
 import { ByteBuffer } from '../../util/ByteBuffer';
 import FlutterException from './FlutterException';
+import Any from './Any';
 import MethodCall from './MethodCall';
 import MethodCodec from './MethodCodec';
 import StandardMessageCodec from './StandardMessageCodec';
@@ -49,22 +50,22 @@ export default class StandardMethodCodec implements MethodCodec {
 
   decodeMethodCall(methodCall: ArrayBuffer): MethodCall {
     const buffer = ByteBuffer.from(methodCall);
-    const method: ESObject = this.messageCodec.readValue(buffer);
-    const args: ESObject = this.messageCodec.readValue(buffer);
+    const method: Any = this.messageCodec.readValue(buffer);
+    const args: Any = this.messageCodec.readValue(buffer);
     if (typeof method == 'string' && !buffer.hasRemaining()) {
       return new MethodCall(method, args);
     }
     throw new Error("Method call corrupted");
   }
 
-  encodeSuccessEnvelope(result: ESObject): ArrayBuffer {
+  encodeSuccessEnvelope(result: Any): ArrayBuffer {
     const stream = ByteBuffer.from(new ArrayBuffer(1024));
     stream.writeInt8(0);
     this.messageCodec.writeValue(stream, result);
     return stream.buffer;
   }
 
-  encodeErrorEnvelope(errorCode: string, errorMessage: string, errorDetails: ESObject): ArrayBuffer {
+  encodeErrorEnvelope(errorCode: string, errorMessage: string, errorDetails: Any): ArrayBuffer {
     const stream = ByteBuffer.from(new ArrayBuffer(1024));
     stream.writeInt8(1);
     this.messageCodec.writeValue(stream, errorCode);
@@ -77,7 +78,7 @@ export default class StandardMethodCodec implements MethodCodec {
     return stream.buffer;
   }
 
-  encodeErrorEnvelopeWithStacktrace(errorCode: string, errorMessage: string, errorDetails: ESObject, errorStacktrace: string): ArrayBuffer {
+  encodeErrorEnvelopeWithStacktrace(errorCode: string, errorMessage: string, errorDetails: Any, errorStacktrace: string): ArrayBuffer {
     const stream = ByteBuffer.from(new ArrayBuffer(1024));
     stream.writeInt8(1);
     this.messageCodec.writeValue(stream, errorCode);
@@ -91,21 +92,21 @@ export default class StandardMethodCodec implements MethodCodec {
     return stream.buffer;
   }
 
-  decodeEnvelope(envelope: ArrayBuffer): ESObject {
+  decodeEnvelope(envelope: ArrayBuffer): Any {
     const buffer = ByteBuffer.from(envelope);
     const flag = buffer.readInt8();
     switch (flag) {
       case 0: {
-        const result: ESObject = this.messageCodec.readValue(buffer);
+        const result: Any = this.messageCodec.readValue(buffer);
         if (!buffer.hasRemaining()) {
           return result;
         }
         // Falls through intentionally.
       }
       case 1: {
-        const code: ESObject = this.messageCodec.readValue(buffer);
-        const message: ESObject = this.messageCodec.readValue(buffer);
-        const details: ESObject = this.messageCodec.readValue(buffer);
+        const code: Any = this.messageCodec.readValue(buffer);
+        const message: Any = this.messageCodec.readValue(buffer);
+        const details: Any = this.messageCodec.readValue(buffer);
         if (typeof code == 'string' && (message == null || typeof message == 'string') && !buffer.hasRemaining()) {
           throw new FlutterException(code, message, details);
         }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/StringCodec.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/StringCodec.ets
index b824ac1f901b1dc9d1ae36f49e7fc74954595f4f..3ce96e365ce74d7e82bbf2f742c1bdb3800afb27 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/StringCodec.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/common/StringCodec.ets
@@ -33,7 +33,7 @@ export default class StringCodec implements MessageCodec<string> {
     return StringUtils.stringToArrayBuffer(message);
   }
 
-  decodeMessage(message: ArrayBuffer): string {
+  decodeMessage(message: ArrayBuffer | null): string {
     if (message == null) {
       return "";
     }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/ListenableEditingState.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/ListenableEditingState.ets
index 953f7cad09b96e97f5bbc45ee519cf70358d2eed..0726ab0fb43398a1d60062f472484c3f6b3601d5 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/ListenableEditingState.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/ListenableEditingState.ets
@@ -19,10 +19,11 @@ import inputMethod from '@ohos.inputMethod';
 import ArrayList from '@ohos.util.ArrayList';
 import { TextEditingDelta } from './TextEditingDelta';
 import TextInputChannel from '../../embedding/engine/systemchannels/TextInputChannel';
-const TAG =  "ListenableEditingState";
-export class ListenableEditingState {
 
-  private TextInputChannel: TextInputChannel | null = null ;
+const TAG = "ListenableEditingState";
+
+export class ListenableEditingState {
+  private TextInputChannel: TextInputChannel | null = null;
   private client: number = 0
   //Cache used to storage software keyboard input action
   private mStringCache: string;
@@ -56,6 +57,34 @@ export class ListenableEditingState {
     this.mComposingEndCache = -1;
   }
 
+  extractBatchTextEditingDeltas(): ArrayList<TextEditingDelta> {
+    let currentBatchDeltas = new ArrayList<TextEditingDelta>();
+    this.mBatchTextEditingDeltas.forEach((data) => {
+      currentBatchDeltas.add(data);
+    })
+    this.mBatchTextEditingDeltas.clear();
+    return currentBatchDeltas;
+  }
+
+  clearBatchDeltas(): void {
+    this.mBatchTextEditingDeltas.clear();
+  }
+
+  replace(start: number, end: number, tb: String, tbStart: number, tbEnd: number): void {
+    const placeIndex = this.mSelectionStartCache < this.mSelectionEndCache ? this.mSelectionStartCache : this.mSelectionEndCache;
+
+    this.mBatchTextEditingDeltas.add(
+      new TextEditingDelta(
+        this.mStringCache.toString(),
+        placeIndex + tbEnd,
+        placeIndex + tbEnd,
+        this.getComposingStart(),
+        this.getComposingEnd(),
+        start,
+        end + tbStart,
+        tb.toString()
+      ));
+  }
 
   getSelectionStart(): number {
     return this.mSelectionStartCache;
@@ -116,20 +145,26 @@ export class ListenableEditingState {
   }
 
   handleInsertTextEvent(text: string): void {
-    if(this.mStringCache.length == this.mSelectionStartCache) {
+    let start = this.mSelectionStartCache < this.mSelectionEndCache ? this.mSelectionStartCache : this.mSelectionEndCache;
+    let end = this.mSelectionStartCache > this.mSelectionEndCache ? this.mSelectionStartCache : this.mSelectionEndCache;
+    const length = text.length;
+    this.replace(start, end, text, 0, length);
+
+    if (this.mStringCache.length == this.mSelectionStartCache) {
       //Insert text one by one
-      this.mStringCache += text;
+      let tempStr: string = this.mStringCache.substring(0, start) + text + this.mStringCache.substring(end);
+      this.mStringCache = tempStr;
       this.setSelectionStart(this.mStringCache.length);
       this.setSelectionEnd(this.mStringCache.length);
 
-    } else if(this.mStringCache.length > this.mSelectionStartCache) {
+    } else if (this.mStringCache.length > this.mSelectionStartCache) {
       //Insert text in the middle of string
-      let tempStr: string = this.mStringCache.substring(0, this.mSelectionStartCache) + text + this.mStringCache.substring(this.mSelectionStartCache);
+      let tempStr: string = this.mStringCache.substring(0, start) + text + this.mStringCache.substring(end);
       this.mStringCache = tempStr;
-      this.mSelectionStartCache += text.length;
+      this.mSelectionStartCache = start + text.length;
       this.mSelectionEndCache = this.mSelectionStartCache;
     }
-    if(this.mListeners == null) {
+    if (this.mListeners == null) {
       Log.e(TAG, "mListeners is null");
       return;
     }
@@ -139,7 +174,7 @@ export class ListenableEditingState {
   updateTextInputState(state: TextEditState): void {
     this.beginBatchEdit();
     this.setStringCache(state.text);
-    if(state.hasSelection()) {
+    if (state.hasSelection()) {
       this.setSelectionStart(state.selectionStart);
       this.setSelectionEnd(state.selectionEnd);
     } else {
@@ -217,22 +252,30 @@ export class ListenableEditingState {
   }
 
   handleDeleteEvent(leftOrRight: boolean, length: number): void {
-    if(leftOrRight == false) {
+    let start = this.mSelectionStartCache < this.mSelectionEndCache ? this.mSelectionStartCache : this.mSelectionEndCache;
+    let end = this.mSelectionStartCache > this.mSelectionEndCache ? this.mSelectionStartCache : this.mSelectionEndCache;
+
+    if (leftOrRight == false) {
       //delete left
-      if(this.mSelectionStartCache  == 0) {
+      if (start == 0 && end == 0) {
         return;
       }
-      this.mSelectionStartCache -= length;
-      let tempStr: string = this.mStringCache.slice(0, this.mSelectionStartCache) + this.mStringCache.slice(this.mSelectionStartCache + length);
+      const startData = start == end ? start - 1 : start;
+      const tbEnd = start == end ? -1 : 0;
+      this.replace(startData, end, "", 0, tbEnd);
+      this.mSelectionStartCache = startData;
+      let tempStr: string = this.mStringCache.slice(0, startData) + this.mStringCache.slice(end);
       this.mStringCache = tempStr;
       this.mSelectionEndCache = this.mSelectionStartCache;
-    } else if(leftOrRight == true) {
+    } else if (leftOrRight == true) {
       //delete right
-      if(this.mSelectionStartCache == this.mStringCache.length) {
+      if (start == this.mStringCache.length) {
         return;
       }
-      this.mSelectionEndCache += length;
-      let tempStr: string = this.mStringCache.slice(0,this.mSelectionStartCache) + this.mStringCache.slice(this.mSelectionEndCache);
+      const tbStart = start == end ? 1 : 0;
+      this.replace(start, end, "", tbStart, 0);
+      this.mSelectionEndCache = start;
+      let tempStr: string = this.mStringCache.slice(0, start) + (end + 1 >= this.mStringCache.length ? "" : this.mStringCache.slice(end + 1));
       this.mStringCache = tempStr;
       this.mSelectionStartCache = this.mSelectionEndCache;
     }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/TextEditingDelta.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/TextEditingDelta.ets
index 1aa1b2d87245f029c1b8a630fecf02bceb41ea8d..495c4a51821d5b9279c56dc134138e5ccb17b41f 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/TextEditingDelta.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/TextEditingDelta.ets
@@ -38,11 +38,11 @@ export class TextEditingDelta {
     this.newSelectionEnd = selectionEnd;
     this.newComposingStart = composingStart;
     this.newComposingEnd = composingEnd;
-    if(replacementDestinationStart === undefined ||
+    if (replacementDestinationStart === undefined ||
       replacementDestinationEnd === undefined ||
       replacementSource === undefined) {
       this.setDeltas(oldEditable, "", -1, -1);
-    } else  {
+    } else {
       this.setDeltas(
         oldEditable,
         replacementSource,
@@ -58,4 +58,30 @@ export class TextEditingDelta {
     this.deltaStart = newStart;
     this.deltaEnd = newExtent;
   }
+
+  toJSON(): TextEditingDeltaJson {
+    let state: TextEditingDeltaJson = {
+      oldText: this.oldText.toString(),
+      deltaText: this.deltaText.toString(),
+      deltaStart: this.deltaStart,
+      deltaEnd: this.deltaEnd,
+      selectionBase: this.newSelectionStart,
+      selectionExtent: this.newSelectionEnd,
+      composingBase: this.newComposingStart,
+      composingExtent: this.newComposingEnd,
+    };
+    return state;
+  }
+}
+
+
+export interface TextEditingDeltaJson {
+  oldText: string;
+  deltaText: string;
+  deltaStart: number;
+  deltaEnd: number;
+  selectionBase: number;
+  selectionExtent: number;
+  composingBase: number;
+  composingExtent: number;
 }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/TextInputPlugin.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/TextInputPlugin.ets
index ca7f22a339dd13c6b6fcf4c06a1a1b4f40604e16..044d66d2bb8b2dbb4e87821017dc29aea45c8b11 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/TextInputPlugin.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/editing/TextInputPlugin.ets
@@ -13,14 +13,18 @@
 * limitations under the License.
 */
 
-import TextInputChannel, { Configuration, TextEditState,
+import TextInputChannel, {
+  Configuration,
+  TextEditState,
   TextInputMethodHandler,
-  TextInputType } from '../../embedding/engine/systemchannels/TextInputChannel';
+  TextInputType
+} from '../../embedding/engine/systemchannels/TextInputChannel';
 import inputMethod from '@ohos.inputMethod';
 import Log from '../../util/Log';
 import { EditingStateWatcher, ListenableEditingState } from './ListenableEditingState';
+import Any from '../common/Any';
 
-export default class TextInputPlugin implements EditingStateWatcher{
+export default class TextInputPlugin implements EditingStateWatcher {
   private static TAG = "TextInputPlugin";
   private textInputChannel: TextInputChannel;
   private mTextInputHandler: TextInputMethodHandlerImpl;
@@ -42,19 +46,25 @@ export default class TextInputPlugin implements EditingStateWatcher{
   didChangeEditingState(textChanged: boolean, selectionChanged: boolean, composingRegionChanged: boolean): void {
     let editable = this.mTextInputHandler.mEditable;
     let inputTarget = this.mTextInputHandler.inputTarget;
-    this.textInputChannel.updateEditingState(inputTarget.id, editable.getStringCache(),
-      editable.getSelectionStart(), editable.getSelectionEnd(),
-      editable.getComposingStart(), editable.getComposingEnd())
+    let configuration = this.mTextInputHandler.configuration;
+    if (configuration!= null && configuration.enableDeltaModel) {
+      this.textInputChannel.updateEditingStateWithDeltas(inputTarget.id,editable.extractBatchTextEditingDeltas());
+      editable.clearBatchDeltas();
+    } else {
+      this.textInputChannel.updateEditingState(inputTarget.id, editable.getStringCache(),
+        editable.getSelectionStart(), editable.getSelectionEnd(),
+        editable.getComposingStart(), editable.getComposingEnd())
+    }
+
   }
 
   detach(): void {
     this.mTextInputHandler.inputMethodController.detach((err) => {
-      if(err) {
+      if (err) {
         Log.e(TextInputPlugin.TAG, "Failed to detach: " + JSON.stringify(err));
       }
     })
   }
-
 }
 
 class TextInputMethodHandlerImpl implements TextInputMethodHandler {
@@ -62,19 +72,19 @@ class TextInputMethodHandlerImpl implements TextInputMethodHandler {
   private textConfig: inputMethod.TextConfig;
   inputMethodController: inputMethod.InputMethodController;
   inputTarget: InputTarget;
-  private configuration: Configuration | null = null;
+  public configuration: Configuration | null = null;
   mEditable: ListenableEditingState;
   private mRestartInputPending: boolean = false;
-  private plugin: EditingStateWatcher | ESObject;
+  private plugin: EditingStateWatcher | Any;
   private keyboardStatus: inputMethod.KeyboardStatus = KeyboardStatus.NONE;
   private imcFlag: boolean = false;
 
-  constructor(plugin: TextInputPlugin | ESObject) {
+  constructor(plugin: TextInputPlugin | Any) {
     this.textConfig = {
       inputAttribute: {
         textInputType: 0,
         enterKeyType: 1
-      }};
+      } };
     this.plugin = plugin;
     this.mEditable = new ListenableEditingState(null, 0);
     this.inputMethodController = inputMethod.getController();
@@ -82,7 +92,7 @@ class TextInputMethodHandlerImpl implements TextInputMethodHandler {
   }
 
   show(): void {
-    if(this.keyboardStatus == KeyboardStatus.SHOW){
+    if (this.keyboardStatus == KeyboardStatus.SHOW) {
       return;
     }
     this.showTextInput();
@@ -103,7 +113,7 @@ class TextInputMethodHandlerImpl implements TextInputMethodHandler {
   }
 
   setClient(textInputClientId: number, configuration: Configuration | null): void {
-    Log.d(TextInputMethodHandlerImpl.TAG,"textInputClientId: " + textInputClientId);
+    Log.d(TextInputMethodHandlerImpl.TAG, "textInputClientId: " + textInputClientId);
     this.setTextInputClient(textInputClientId, configuration);
   }
 
@@ -116,7 +126,7 @@ class TextInputMethodHandlerImpl implements TextInputMethodHandler {
   }
 
   setEditingState(editingState: TextEditState): void {
-    Log.d(TextInputMethodHandlerImpl.TAG, "text:" + editingState.text +" selectionStart:" + editingState.selectionStart + " selectionEnd:"
+    Log.d(TextInputMethodHandlerImpl.TAG, "text:" + editingState.text + " selectionStart:" + editingState.selectionStart + " selectionEnd:"
       + editingState.selectionEnd + " composingStart:" + editingState.composingStart + " composingEnd" + editingState.composingEnd);
     this.mEditable.updateTextInputState(editingState);
   }
@@ -127,12 +137,12 @@ class TextInputMethodHandlerImpl implements TextInputMethodHandler {
 
   private async showTextInput(): Promise<void> {
     await this.attach(true);
-    if(this.imcFlag != true) {
+    if (this.imcFlag != true) {
       this.listenKeyBoardEvent();
     }
-    this.inputMethodController.showTextInput().then(()=> {
+    this.inputMethodController.showTextInput().then(() => {
       Log.d(TextInputMethodHandlerImpl.TAG, "Succeeded in showing softKeyboard");
-    }).catch((err: ESObject) => {
+    }).catch((err: Any) => {
       Log.e(TextInputMethodHandlerImpl.TAG, "Failed to show softKeyboard:" + JSON.stringify(err));
     });
   }
@@ -140,12 +150,12 @@ class TextInputMethodHandlerImpl implements TextInputMethodHandler {
   private async hideTextInput(): Promise<void> {
     this.inputMethodController.hideTextInput().then(() => {
       Log.d(TextInputMethodHandlerImpl.TAG, "Succeeded in hide softKeyboard");
-    }).catch((err: ESObject) => {
+    }).catch((err: Any) => {
       Log.e(TextInputMethodHandlerImpl.TAG, "Failed to hide softKeyboard:" + JSON.stringify(err));
     })
   }
 
-  async attach(showKeyboard: boolean): Promise<void>  {
+  async attach(showKeyboard: boolean): Promise<void> {
     try {
       await this.inputMethodController.attach(showKeyboard, this.textConfig);
     } catch (err) {
@@ -154,17 +164,15 @@ class TextInputMethodHandlerImpl implements TextInputMethodHandler {
   }
 
   setTextInputClient(client: number, configuration: Configuration | null): void {
-    const INPUT_TYPE_NAME = ['NONE', 'TEXT', 'MULTILINE', 'NUMBER', 'PHONE','DATETIME','EMAIL_ADDRESS','URL','VISIBLE_PASSWORD']
-    if(configuration)
-    {
+    const INPUT_TYPE_NAME = ['NONE', 'TEXT', 'MULTILINE', 'NUMBER', 'PHONE', 'DATETIME', 'EMAIL_ADDRESS', 'URL', 'VISIBLE_PASSWORD']
+    if (configuration) {
       this.configuration = configuration;
-      if(configuration.inputType)
-      {
-        this.textConfig.inputAttribute.textInputType =INPUT_TYPE_NAME.indexOf(configuration.inputType.type)
-        this.textConfig.inputAttribute.enterKeyType = configuration.inputAction as ESObject;
+      if (configuration.inputType) {
+        this.textConfig.inputAttribute.textInputType = INPUT_TYPE_NAME.indexOf(configuration.inputType.type)
+        this.textConfig.inputAttribute.enterKeyType = configuration.inputAction as Any;
       }
     }
-    if(this.canShowTextInput()) {
+    if (this.canShowTextInput()) {
       this.inputTarget = new InputTarget(Type.FRAMEWORK_CLIENT, client);
     } else {
       this.inputTarget = new InputTarget(Type.NO_TARGET, client);
@@ -178,7 +186,7 @@ class TextInputMethodHandlerImpl implements TextInputMethodHandler {
   }
 
   canShowTextInput(): boolean {
-    if(this.configuration == null || this.configuration.inputType == null) {
+    if (this.configuration == null || this.configuration.inputType == null) {
       return true;
     }
     return this.configuration.inputType.type != TextInputType.NONE;
@@ -228,7 +236,7 @@ class TextInputMethodHandlerImpl implements TextInputMethodHandler {
 
     try {
       this.inputMethodController.on('sendKeyboardStatus', (state) => {
-        if(state == KeyboardStatus.HIDE) {
+        if (state == KeyboardStatus.HIDE) {
           this.keyboardStatus = KeyboardStatus.HIDE;
           this.plugin.textInputChannel.onConnectionClosed(this.inputTarget.id);
         }
@@ -261,7 +269,7 @@ class TextInputMethodHandlerImpl implements TextInputMethodHandler {
   }
 
   public clearTextInputClient(): void {
-    if(this.inputTarget.type == Type.VIRTUAL_DISPLAY_PLATFORM_VIEW) {
+    if (this.inputTarget.type == Type.VIRTUAL_DISPLAY_PLATFORM_VIEW) {
       return;
     }
     this.mEditable.removeEditingStateListener(this.plugin);
@@ -295,5 +303,4 @@ export class InputTarget {
     this.type = type;
     this.id = id;
   }
-
 }
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/mouse/MouseCursorPlugin.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/mouse/MouseCursorPlugin.ets
index 36c8d93cf7878d54d7c35e1932f0239394740797..90fc4b83874d49a66f1bb4f732a6df272ad87c80 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/mouse/MouseCursorPlugin.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/mouse/MouseCursorPlugin.ets
@@ -17,6 +17,7 @@ import MouseCursorChannel, { MouseCursorMethodHandler } from '../../embedding/en
 import pointer from '@ohos.multimodalInput.pointer';
 import HashMap from '@ohos.util.HashMap';
 import Log from '../../util/Log';
+import Any from '../common/Any';
 
 const TAG: string = "MouseCursorPlugin";
 export default class MouseCursorPlugin implements MouseCursorMethodHandler{
@@ -40,7 +41,7 @@ export default class MouseCursorPlugin implements MouseCursorMethodHandler{
     }
     let pointStyle: pointer.PointerStyle = this.resolveSystemCursor(kind);
     try {
-      pointer.setPointerStyle(this.windowId, pointStyle, (err: ESObject) => {
+      pointer.setPointerStyle(this.windowId, pointStyle, (err: Any) => {
         Log.i(TAG, "set point style success kind : " + kind);
       })
     } catch (e) {
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformViewFactory.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformViewFactory.ets
index 373a7ea5a5906c812c330762fd3825d4ce420201..81ce2ba940d0decbebe39f9db33be4c5f2ec499d 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformViewFactory.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformViewFactory.ets
@@ -16,12 +16,13 @@
 import MessageCodec from '../common/MessageCodec';
 import PlatformView from './PlatformView'
 import common from '@ohos.app.ability.common';
+import Any from '../common/Any';
 
 export default abstract class PlatformViewFactory {
-  private createArgsCodec: MessageCodec<ESObject>;
+  private createArgsCodec: MessageCodec<Any>;
 
   /** @param createArgsCodec the codec used to decode the args parameter of {@link #create}. */
-  constructor(createArgsCodec: MessageCodec<ESObject>) {
+  constructor(createArgsCodec: MessageCodec<Any>) {
     this.createArgsCodec = createArgsCodec;
   }
 
@@ -35,10 +36,10 @@ export default abstract class PlatformViewFactory {
    *     createArgsCodec argument passed to the constructor. This is null if createArgsCodec was
    *     null, or no arguments were sent from the Flutter app.
    */
-  public abstract create(context: common.Context, viewId: number, args: ESObject): PlatformView;
+  public abstract create(context: common.Context, viewId: number, args: Any): PlatformView;
 
   /** Returns the codec to be used for decoding the args parameter of {@link #create}. */
-  getCreateArgsCodec(): MessageCodec<ESObject> {
+  getCreateArgsCodec(): MessageCodec<Any> {
     return this.createArgsCodec;
   }
 }
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformViewWrapper.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformViewWrapper.ets
index dcd57072c319129d0edba82cd9acbe91cf002b1a..209971fbe679de4272627763bb6adb5c07094360 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformViewWrapper.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformViewWrapper.ets
@@ -19,6 +19,7 @@ import { createDVModelFromJson } from '../../view/DynamicView/dynamicViewJson';
 import { RootDvModeManager } from './RootDvModelManager';
 import matrix4 from '@ohos.matrix4'
 import Log from '../../util/Log';
+import Any from '../common/Any';
 
 const TAG: string = "PlatformViewWrapper";
 export class PlatformViewWrapper {
@@ -44,13 +45,13 @@ export class PlatformViewWrapper {
     return this.model;
   }
 
-  setParams: (params: DVModelParameters, key: string, element: ESObject ) => void = (params: DVModelParameters, key: string, element: ESObject): void => {
-    let params2 = params as Record<string, ESObject>;
+  setParams: (params: DVModelParameters, key: string, element: Any ) => void = (params: DVModelParameters, key: string, element: Any): void => {
+    let params2 = params as Record<string, Any>;
     params2[key] =element;
   }
 
-  getParams: (params: DVModelParameters, element: string) => string | ESObject = (params: DVModelParameters, element: string): string | ESObject => {
-    let params2 = params as Record<string, ESObject>;
+  getParams: (params: DVModelParameters, element: string) => string | Any = (params: DVModelParameters, element: string): string | Any => {
+    let params2 = params as Record<string, Any>;
     return params2[element];
   }
 
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformViewsController.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformViewsController.ets
index e802dc709207e3de1f4a400f32b84a747e86f81b..82c87cd521a6a5a4dc661e8b8df8238430437d5e 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformViewsController.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/plugin/platform/PlatformViewsController.ets
@@ -41,6 +41,7 @@ import Log from '../../util/Log'
 import OhosTouchProcessor from '../../embedding/ohos/OhosTouchProcessor'
 import PlatformViewFactory from './PlatformViewFactory'
 import { ByteBuffer } from '../../util/ByteBuffer';
+import Any from '../common/Any';
 
 const TAG = "PlatformViewsController"
 
@@ -130,8 +131,8 @@ export default class PlatformViewsController implements PlatformViewsAccessibili
     }
   }
 
-  setParams: (params: DVModelParameters, key: string, element: ESObject ) => void = (params: DVModelParameters, key: string, element: ESObject): void => {
-    let params2 = params as Record<string, ESObject>;
+  setParams: (params: DVModelParameters, key: string, element: Any ) => void = (params: DVModelParameters, key: string, element: Any): void => {
+    let params2 = params as Record<string, Any>;
     params2[key] =element;
   }
 
@@ -285,7 +286,7 @@ export default class PlatformViewsController implements PlatformViewsAccessibili
       throw new Error("Trying to create a platform view of unregistered type: " + request.viewType)
     }
 
-    let createParams: ESObject = null;
+    let createParams: Any = null;
     if (request.params != null) {
       let byteParas : ByteBuffer = request.params as ByteBuffer;
       createParams = viewFactory.getCreateArgsCodec().decodeMessage(byteParas.buffer);
@@ -407,6 +408,10 @@ export default class PlatformViewsController implements PlatformViewsAccessibili
     }
   }
 
+  public getFlutterView(): FlutterView | null {
+    return this.flutterView;
+  }
+
   public attachTextInputPlugin(textInputPlugin: TextInputPlugin): void {
     this.textInputPlugin = textInputPlugin;
   }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/util/Log.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/util/Log.ets
index 437b52f18049b9ba77e47350033482a06368c5c4..503515c6471c48e1a73210465adaa1486e4f8085 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/util/Log.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/util/Log.ets
@@ -47,7 +47,7 @@ export default class Log {
    * @param args Indicates the log parameters.
    * @since 7
    */
-  static d(tag: string, format: string, ...args: ESObject[]) {
+  static d(tag: string, format: string, ...args: Object[]) {
     if (Log.isLoggable(HiLog.LogLevel.DEBUG)) {
       HiLog.debug(DOMAIN, TAG, tag + SYMBOL + format, args);
     }
@@ -61,7 +61,7 @@ export default class Log {
    * @param args Indicates the log parameters.
    * @since 7
    */
-  static i(tag: string, format: string, ...args: ESObject[]) {
+  static i(tag: string, format: string, ...args: Object[]) {
     if (Log.isLoggable(HiLog.LogLevel.INFO)) {
       HiLog.info(DOMAIN, TAG, tag + SYMBOL + format, args);
     }
@@ -75,7 +75,7 @@ export default class Log {
    * @param args Indicates the log parameters.
    * @since 7
    */
-  static w(tag: string, format: string, ...args: ESObject[]) {
+  static w(tag: string, format: string, ...args: Object[]) {
     if (Log.isLoggable(HiLog.LogLevel.WARN)) {
       HiLog.warn(DOMAIN, TAG, tag + SYMBOL + format, args);
     }
@@ -89,8 +89,14 @@ export default class Log {
    * @param args Indicates the log parameters.
    * @since 7
    */
-  static e(tag: string, format: string, ...args: ESObject[]) {
+  static e(tag: string, format: string, ...args: Object[]) {
     if (Log.isLoggable(HiLog.LogLevel.ERROR)) {
+      args.forEach((item: Object, index: number) => {
+        if (item instanceof Error) {
+          args[index] = item.message + item.stack;
+        }
+        format+="%{public}s";
+      })
       HiLog.error(DOMAIN, TAG, tag + SYMBOL + format, args);
     }
   }
@@ -103,7 +109,7 @@ export default class Log {
    * @param args Indicates the log parameters.
    * @since 7
    */
-  static f(tag: string, format: string, ...args: ESObject[]) {
+  static f(tag: string, format: string, ...args: Object[]) {
     if (Log.isLoggable(HiLog.LogLevel.FATAL)) {
       HiLog.fatal(DOMAIN, TAG, tag + SYMBOL + format, args);
     }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/util/PathUtils.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/util/PathUtils.ets
index 691ea0f360b40adb266bde566c2f66292a2aa0ff..f47bcb68b0755dba14200d8a44db899528119191 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/util/PathUtils.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/util/PathUtils.ets
@@ -30,7 +30,7 @@ export default class PathUtils {
     return context.cacheDir;
   }
 
-  static getDataDirectory(context: common.Context): string {
+  static getDataDirectory(context: common.Context): string | null {
     const name = "flutter";
     const flutterDir = context.filesDir + "/" + name;
     if (!fs.accessSync(flutterDir)) {
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/util/StringUtils.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/util/StringUtils.ets
index ad7f50bb0b569fcf8040cc2a964fae26b63a9faf..a9344782075002c1968da4b8b23c982b9553b944 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/util/StringUtils.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/util/StringUtils.ets
@@ -28,11 +28,17 @@ export default class StringUtils {
   }
 
   static arrayBufferToString(buffer: ArrayBuffer): string {
+    if (buffer.byteLength <= 0) {
+      return "";
+    }
     let textDecoder = util.TextDecoder.create('utf-8', { ignoreBOM : true })
     return textDecoder.decode(new Uint8Array(buffer));
   }
 
   static uint8ArrayToString(buffer: Uint8Array): string {
+    if (buffer.length <= 0) {
+      return "";
+    }
     let textDecoder = util.TextDecoder.create('utf-8', { ignoreBOM : true })
     return textDecoder.decodeWithStream(buffer);
   }
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/util/ToolUtils.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/util/ToolUtils.ets
index c3879f4a40ea307f7491a4808ad3b816cc98b13e..1d13a5c93cb22c37739bcf4f39cac620920ee6ca 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/util/ToolUtils.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/util/ToolUtils.ets
@@ -12,13 +12,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+import Any from '../plugin/common/Any';
 
 export default class ToolUtils {
   static isObj(object: Object): boolean {
     return object && typeof (object) == 'object';
   }
 
-  static implementsInterface(obj: ESObject, method: string): boolean {
+  static implementsInterface(obj: Any, method: string): boolean {
     return Reflect.has(obj, method) && typeof obj[method] === 'function'
   }
 }
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/DynamicView/dynamicView.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/DynamicView/dynamicView.ets
index 1c5f696e9fc0fbb279c4e3b854fe14def41c96e5..4dd2cf3edd8e7f00d2f7e1f04442cdfe2795568d 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/DynamicView/dynamicView.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/DynamicView/dynamicView.ets
@@ -13,6 +13,7 @@
  * limitations under the License.
  */
 import matrix4 from '@ohos.matrix4';
+import Any from '../../plugin/common/Any';
 import Log from '../../util/Log';
 
 /**
@@ -69,9 +70,9 @@ export class DVModel {
   params: DVModelParameters;
   events: DVModelEvents;
   children: DVModelChildren;
-  builder: ESObject;
+  builder: Any;
 
-  constructor(compType: string, params: DVModelParameters, events: DVModelEvents, children: DVModelChildren, builder?: ESObject) {
+  constructor(compType: string, params: DVModelParameters, events: DVModelEvents, children: DVModelChildren, builder?: Any) {
     this.id_ = nextId++;
     this.compType = compType;
     this.params = params ?? new DVModelParameters;
@@ -132,13 +133,13 @@ export struct DynamicView {
   @BuilderParam customBuilder?: ($$: BuilderParams) => void;
 
 
-  getParams: (params: DVModelParameters, element: string) => string | ESObject = (params: DVModelParameters, element: string): string | ESObject => {
-    let params2 = params as Record<string, ESObject>;
+  getParams: (params: DVModelParameters, element: string) => string | Any = (params: DVModelParameters, element: string): string | Any => {
+    let params2 = params as Record<string, Any>;
     return params2[element];
   }
 
-  getEvents: (events: DVModelEvents, element: string) => ESObject = (events: DVModelEvents, element: string): ESObject => {
-    let events2 = events as Record<string, ESObject>;
+  getEvents: (events: DVModelEvents, element: string) => Any = (events: DVModelEvents, element: string): Any => {
+    let events2 = events as Record<string, Any>;
     return events2[element];
   }
   /*
@@ -183,7 +184,7 @@ export struct DynamicView {
 
   @Builder buildChildren() {
     ForEach(this.children,
-      (child: ESObject) => {
+      (child: Any) => {
         DynamicView({
           model: child as DVModel,
           params: child.params,
@@ -192,7 +193,7 @@ export struct DynamicView {
           customBuilder: child.builder
         })
       },
-      (child: ESObject) => `${child.id_}`
+      (child: Any) => `${child.id_}`
     )
   }
 
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/DynamicView/dynamicViewJson.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/DynamicView/dynamicViewJson.ets
index 40b05299e8d204b9242b99a5cb1dfb7d1068b2b3..1b332830cee9ffa620dd246ad92d4374c65039d0 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/DynamicView/dynamicViewJson.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/DynamicView/dynamicViewJson.ets
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import Any from '../../plugin/common/Any';
 
 import { DVModel, DVModelParameters, DVModelEvents, DVModelChildren } from "./dynamicView";
 
@@ -31,8 +32,8 @@ export function createDVModelFromJson(json: Object): DVModel {
     return result;
   }
 
-  let setParams: (result: DVModelParameters | DVModelEvents, key: ESObject, element: Object ) => void = (result: DVModelParameters,  key: ESObject, element: ESObject): void => {
-    let newResult = result as Record<string, ESObject>;
+  let setParams: (result: DVModelParameters | DVModelEvents, key: Any, element: Object ) => void = (result: DVModelParameters, key: Any, element: Any): void => {
+    let newResult = result as Record<string, Any>;
     newResult[key] = element[key];
   }
 
@@ -57,7 +58,7 @@ export function createDVModelFromJson(json: Object): DVModel {
     return new DVModel("", "", "", createChildrenFrom([]));
   }
 
-  let jsonObject = json as Record<string, string | ESObject>;
+  let jsonObject = json as Record<string, string | Any>;
   return new DVModel(
     jsonObject["compType"],
     createAttributesFrom(jsonObject["attributes"]),
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterNativeView.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterNativeView.ets
deleted file mode 100644
index 9138ad728502e49e675e69e1fd533d80ad7016bc..0000000000000000000000000000000000000000
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterNativeView.ets
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
-* 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 common from '@ohos.app.ability.common';
-import DartExecutor from '../embedding/engine/dart/DartExecutor';
-import { EngineLifecycleListener } from '../embedding/engine/FlutterEngine';
-import FlutterNapi from '../embedding/engine/FlutterNapi';
-import Log from '../util/Log';
-import FlutterPluginRegistry from '../app/FlutterPluginRegistry';
-import FlutterRunArguments from './FlutterRunArguments';
-import { FlutterView } from './FlutterView';
-
-const TAG: string = "FlutterNativeView";
-
-export default class FlutterNativeView {
-  private mContext: common.Context;
-  private mPluginRegistry: FlutterPluginRegistry;
-  private mFlutterNapi: FlutterNapi;
-  private dartExecutor: DartExecutor;
-  private mFlutterView: FlutterView;
-  private applicationIsRunning: boolean;
-
-  constructor(context: common.Context, isBackgroundView?: boolean) {
-    if (isBackgroundView) {
-      Log.i(TAG, "isBackgroundView is no longer supported and will be ignored");
-    }
-    this.mContext = context;
-    this.mPluginRegistry = new FlutterPluginRegistry();
-    this.mFlutterNapi = new FlutterNapi();
-    //this.mFlutterNapi.addIsDisplayingFlutterUiListener(this.flutterUiDisplayListener);
-    this.dartExecutor = new DartExecutor(this.mFlutterNapi, this.mContext.resourceManager);
-    this.mFlutterNapi.addEngineLifecycleListener(new EngineLifecycleListenerImpl(this.mFlutterView, this.mPluginRegistry));
-    this.attach(this.mFlutterNapi, this.dartExecutor);
-    this.assertAttached(this.mFlutterNapi);
-  }
-
-  attach(flutterNapi: FlutterNapi, dartExecutor: DartExecutor): void {
-    flutterNapi.attachToNative();
-    dartExecutor.onAttachedToNAPI();
-  }
-
-  assertAttached(flutterNapi: FlutterNapi): void {
-    if (!this.isAttached(flutterNapi)) {
-      throw new Error('Platform View is not attached');
-    }
-  }
-
-  isAttached(flutterNapi: FlutterNapi): boolean {
-    return flutterNapi.isAttached();
-  }
-
-  detachFromFlutterView(): void {
-    this.mPluginRegistry.detach();
-    this.mFlutterView = null;
-  }
-
-  destroy(): void {
-    this.mPluginRegistry.destroy();
-    this.dartExecutor.onDetachedFromNAPI();
-    this.mFlutterView = null;
-    //this.mFlutterNapi.removeIsDisplayingFlutterUiListener(this.flutterUiDisplayListener);
-    this.applicationIsRunning = false;
-  }
-
-  getDartExecutor(): DartExecutor {
-    return this.dartExecutor;
-  }
-
-  getPluginRegistry(): FlutterPluginRegistry {
-    return this.mPluginRegistry;
-  }
-
-  attachViewAndAbility(flutterView: FlutterView, context: common.Context): void {
-    this.mFlutterView = flutterView;
-    this.mPluginRegistry.attach(flutterView, context);
-  }
-
-  runFromBundle(args: FlutterRunArguments): void {
-    if (args.entrypoint == null) {
-      throw new Error("an entrypoint must be specific");
-    }
-    this.assertAttached(this.mFlutterNapi);
-    if (this.applicationIsRunning) {
-      throw new Error("this flutter engine instance is already running an application");
-    }
-    this.mFlutterNapi.runBundleAndSnapshotFromLibrary(args.bundlePath, args.entrypoint, args.libraryPath, this.mContext.resourceManager, null);
-    this.applicationIsRunning = true;
-  }
-
-  isApplicationRunning(): boolean {
-    return this.applicationIsRunning;
-  }
-
-  // getObservatoryUri(): string {
-  //   return this.mFlutterNapi.getObservatoryUri();
-  // }
-}
-
-class EngineLifecycleListenerImpl implements EngineLifecycleListener {
-  private flutterView: FlutterView;
-  private pluginRegistry: FlutterPluginRegistry;
-
-  onPreEngineRestart(): void {
-    if (this.flutterView != null) {
-      //this.flutterView.resetAccessibilityTree();
-    }
-
-    if (this.pluginRegistry == null) {
-      return;
-    }
-
-    this.pluginRegistry.onPreEngineRestart();
-  }
-
-  onEngineWillDestroy(): void {
-
-  }
-
-  constructor(flutterView: FlutterView, pluginRegistry: FlutterPluginRegistry) {
-    this.flutterView = flutterView;
-    this.pluginRegistry = pluginRegistry;
-  }
-}
-
-
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterRunArguments.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterRunArguments.ets
index d17ec28d1fdc6237ee486362751ee25e58590887..c81e33f381f06662a8b881df3452d76038837361 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterRunArguments.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterRunArguments.ets
@@ -17,4 +17,10 @@ export default class FlutterRunArguments {
   public bundlePath: string;
   public entrypoint: string;
   public libraryPath: string;
+
+  constructor(bundlePath: string, entrypoint: string, libraryPath: string) {
+    this.bundlePath = bundlePath;
+    this.entrypoint = entrypoint;
+    this.libraryPath = libraryPath;
+  }
 }
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterView.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterView.ets
index 0e19662f6c8008e5feb29c225a7df7fcd630207a..e19ba2393ce14449f04e9717453e00a9fff7d499 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterView.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/FlutterView.ets
@@ -20,6 +20,8 @@ import FlutterManager from '../embedding/ohos/FlutterManager';
 import window from '@ohos.window';
 import KeyboardManager from '../embedding/ohos/KeyboardManager';
 import MouseCursorPlugin from '../plugin/mouse/MouseCursorPlugin';
+import Any from '../plugin/common/Any';
+import Settings from '../embedding/ohos/Settings';
 
 const TAG = "FlutterView";
 
@@ -52,6 +54,8 @@ export class FlutterView {
   private keyboardManager: KeyboardManager | null = null;
   private mainWindow: window.Window
   private mouseCursorPlugin?: MouseCursorPlugin;
+  private uiContext?: UIContext | undefined;
+  private settings?: Settings;
 
   constructor(viewId: string, context: Context) {
     this.id = viewId
@@ -70,7 +74,7 @@ export class FlutterView {
     Log.i(TAG, "windowSizeChangeCallback");
     this.onAreaChange(null);
   }
-  private avoidAreaChangeCallback = (data: ESObject) => {
+  private avoidAreaChangeCallback = (data: Any) => {
     Log.i(TAG, "avoidAreaChangeCallback");
     this.onAreaChange(null);
   }
@@ -120,6 +124,8 @@ export class FlutterView {
     this.updateViewportMetrics()
     let windowId = this.mainWindow?.getWindowProperties()?.id
     this.mouseCursorPlugin = new MouseCursorPlugin(windowId, this.flutterEngine?.getMouseCursorChannel()!);
+    this.settings = new Settings(this.flutterEngine.getSettingsChannel()!);
+    this.sendSettings();
   }
 
   detachFromFlutterEngine(): void {
@@ -136,6 +142,22 @@ export class FlutterView {
     this.keyboardManager = null;
   }
 
+  onWindowCreated() {
+    Log.d(TAG, "received onwindowCreated.");
+    let _UIContext = this.mainWindow?.getUIContext();
+    this.uiContext = _UIContext;
+    this.sendSettings();
+    Log.d(TAG, "uiContext init and sendSettings finished.");
+  }
+
+  sendSettings(): void {
+    if (this.uiContext != undefined && this.isAttachedToFlutterEngine()) {
+      this.settings?.sendSettings(this.uiContext.getMediaQuery());
+    } else {
+      Log.e(TAG, "UIContext is null, cannot send Settings!");
+    }
+  }
+
   onSurfaceCreated() {
     this.isSurfaceAvailableForRendering = true;
     if (this.isAttachedToFlutterEngine()) {
@@ -177,7 +199,7 @@ export class FlutterView {
     this.updateViewportMetrics()
   }
 
-  private isAttachedToFlutterEngine(): boolean {
+  public isAttachedToFlutterEngine(): boolean {
     return this.flutterEngine != null
   }
 
diff --git a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/TextureRegistry.ets b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/TextureRegistry.ets
index a37ab971b769320021695970ff20e2cac62d880b..fa79eb238c0781f3f23b690e00d08101a0969830 100644
--- a/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/TextureRegistry.ets
+++ b/shell/platform/ohos/flutter_embedding/flutter/src/main/ets/view/TextureRegistry.ets
@@ -12,25 +12,33 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+import image from '@ohos.multimedia.image';
 
 export interface TextureRegistry {
 
   createSurfaceTexture(): SurfaceTextureEntry;
-  registerSurfaceTexture(): SurfaceTextureEntry;
-
+  getTextureId(): number;
+  registerTexture(textureId: number): SurfaceTextureEntry;
+  registerSurfaceTexture(receiver: image.ImageReceiver): SurfaceTextureEntry;
+  registerPixelMap(pixelMap: PixelMap): number;
+  unregisterTexture(textureId: number): void;
   onTrimMemory(level: number) : void;
 }
 
-interface SurfaceTextureEntry {
-  id(): number;
+export interface SurfaceTextureEntry {
+  getTextureId(): number;
+
+  getSurfaceId(): number;
+
+  getImageReceiver(): image.ImageReceiver;
 
   release(): void;
 }
 
-interface OnFrameConsumedListener {
+export interface OnFrameConsumedListener {
   onFrameConsumed(): void;
 }
 
-interface OnTrimMemoryListener {
+export interface OnTrimMemoryListener {
   onTrimMemory(level: number) : void;
 }
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5 b/shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5
index 3496547c0bf7facd5ffce8a2ee7ff8ea64fd5ef8..5c4892a18d34742a191e72c3729f168444966edc 100755
--- a/shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5
+++ b/shell/platform/ohos/flutter_embedding/hvigor/hvigor-config.json5
@@ -12,9 +12,10 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-{ 
-  "hvigorVersion": "4.0.2", 
-  "dependencies": { 
-    "@ohos/hvigor-ohos-plugin": "4.0.2", 
-  } 
+
+{
+  "hvigorVersion": "4.0.2",
+  "dependencies": {
+    "@ohos/hvigor-ohos-plugin": "4.0.2",
+  }
 }
diff --git a/shell/platform/ohos/flutter_embedding/hvigorfile.ts b/shell/platform/ohos/flutter_embedding/hvigorfile.ts
index 5a172b770e3b15f67c12152d00f38f2084d3915b..8f2d2aafe6d6a3a71a9944ebd0c91fbc308ac9d1 100755
--- a/shell/platform/ohos/flutter_embedding/hvigorfile.ts
+++ b/shell/platform/ohos/flutter_embedding/hvigorfile.ts
@@ -13,5 +13,9 @@
 * limitations under the License.
 */
 
-// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
-export { appTasks } from '@ohos/hvigor-ohos-plugin';
\ No newline at end of file
+import { appTasks } from '@ohos/hvigor-ohos-plugin';
+
+export default {
+    system: appTasks,  /* Built-in plugin of Hvigor. It cannot be modified. */
+    plugins:[]         /* Custom plugin to extend the functionality of Hvigor. */
+}
\ No newline at end of file
diff --git a/shell/platform/ohos/flutter_embedding/local.properties b/shell/platform/ohos/flutter_embedding/local.properties
deleted file mode 100755
index 42b3cf913edcd8d66de22dd116909893a09e7550..0000000000000000000000000000000000000000
--- a/shell/platform/ohos/flutter_embedding/local.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
-# 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.
-
-# This file is automatically generated by DevEco Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file should *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# For customization when using a Version Control System, please read the header note.
-sdk.dir=
-nodejs.dir=
-
diff --git a/shell/platform/ohos/library_loader.cpp b/shell/platform/ohos/library_loader.cpp
index 6e38f769bc54fc7115650c6372072d1fe36f67da..415bf46a65e371659b21f32fab0a1553b11a090e 100644
--- a/shell/platform/ohos/library_loader.cpp
+++ b/shell/platform/ohos/library_loader.cpp
@@ -107,8 +107,25 @@ static napi_value Init(napi_env env, napi_value exports) {
       DECLARE_NAPI_FUNCTION(
           "nativeXComponentDetachFlutterEngine",
           flutter::PlatformViewOHOSNapi::nativeXComponentDetachFlutterEngine),
+      DECLARE_NAPI_FUNCTION(
+          "nativeInitNativeImage",
+          flutter::PlatformViewOHOSNapi::nativeInitNativeImage),
+      DECLARE_NAPI_FUNCTION(
+          "nativeRegisterTexture",
+          flutter::PlatformViewOHOSNapi::nativeRegisterTexture),
+      DECLARE_NAPI_FUNCTION(
+          "nativeUnregisterTexture",
+          flutter::PlatformViewOHOSNapi::nativeUnregisterTexture),
+      DECLARE_NAPI_FUNCTION(
+          "nativeMarkTextureFrameAvailable",
+          flutter::PlatformViewOHOSNapi::nativeMarkTextureFrameAvailable),
+      DECLARE_NAPI_FUNCTION(
+          "nativeRegisterPixelMap",
+          flutter::PlatformViewOHOSNapi::nativeRegisterPixelMap),
 
   };
+
+  FML_DLOG(INFO) << "Init NAPI size=" << sizeof(desc) / sizeof(desc[0]);
   napi_define_properties(env, exports, sizeof(desc) / sizeof(desc[0]), desc);
   bool ret = flutter::XComponentAdapter::GetInstance()->Export(env, exports);
   if (!ret) {
diff --git a/shell/platform/ohos/napi/platform_view_ohos_napi.cpp b/shell/platform/ohos/napi/platform_view_ohos_napi.cpp
index 3572bee972dbbea2ffeb24e13ac504add33ac409..69bd07dcee6daedd00838cdb704fe739a43f0496 100644
--- a/shell/platform/ohos/napi/platform_view_ohos_napi.cpp
+++ b/shell/platform/ohos/napi/platform_view_ohos_napi.cpp
@@ -16,15 +16,19 @@
 #include "platform_view_ohos_napi.h"
 #include <dlfcn.h>
 #include <js_native_api.h>
+#include <multimedia/image_framework/image_mdk.h>
+#include <multimedia/image_framework/image_pixel_map_mdk.h>
+#include <native_image/native_image.h>
 #include <rawfile/raw_file.h>
 #include <rawfile/raw_file_manager.h>
 #include <string>
-#include "../types.h"
+
 #include "flutter/fml/make_copyable.h"
 #include "flutter/fml/platform/ohos/napi_util.h"
 #include "flutter/shell/platform/ohos/ohos_main.h"
 #include "flutter/shell/platform/ohos/ohos_shell_holder.h"
 #include "flutter/shell/platform/ohos/surface/ohos_native_window.h"
+#include "flutter/shell/platform/ohos/types.h"
 #include "unicode/uchar.h"
 #include "flutter/shell/platform/ohos/ohos_xcomponent_adapter.h"
 
@@ -303,7 +307,7 @@ void PlatformViewOHOSNapi::FlutterViewHandlePlatformMessage(
       FML_DLOG(ERROR) << "napi_create_string_utf8 err " << status;
       return;
     }
-
+    FML_DLOG(INFO) << "FlutterViewHandlePlatformMessage mapData= " << mapData;
     if (mapData) {
       delete mapData;
     }
@@ -1419,6 +1423,90 @@ napi_value PlatformViewOHOSNapi::nativeGetSystemLanguages(
   return nullptr;
 }
 
+napi_value PlatformViewOHOSNapi::nativeInitNativeImage(
+    napi_env env,
+    napi_callback_info info)
+{
+  FML_DLOG(INFO)<<"PlatformViewOHOSNapi::nativeInitNativeImage";
+  size_t argc = 3;
+  napi_value args[3] = {nullptr};
+  int64_t shell_holder;
+  int64_t textureId;
+  NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, nullptr, nullptr));
+  NAPI_CALL(env, napi_get_value_int64(env, args[0], &shell_holder));
+  NAPI_CALL(env, napi_get_value_int64(env, args[1], &textureId));
+  ImageNative *imageNative = OH_Image_InitImageNative(env, args[2]);
+  // std::unique_ptr<ImageNative> uImage;
+  OHOS_SHELL_HOLDER->GetPlatformView()->RegisterExternalTextureByImage(textureId, imageNative);
+  return nullptr;
+}
+
+napi_value PlatformViewOHOSNapi::nativeRegisterTexture(
+    napi_env env,
+    napi_callback_info info)
+{
+  FML_DLOG(INFO)<<"PlatformViewOHOSNapi::nativeRegisterTexture";
+  size_t argc = 2;
+  napi_value args[2] = {nullptr};
+  int64_t shell_holder;
+  int64_t textureId;
+  NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, nullptr, nullptr));
+  NAPI_CALL(env, napi_get_value_int64(env, args[0], &shell_holder));
+  NAPI_CALL(env, napi_get_value_int64(env, args[1], &textureId));
+  int64_t surfaceId = OHOS_SHELL_HOLDER->GetPlatformView()->RegisterExternalTexture(textureId);
+  napi_value res;
+  napi_create_int64(env, surfaceId, &res);
+  return res;
+}
+
+napi_value PlatformViewOHOSNapi::nativeUnregisterTexture(
+  napi_env env,
+  napi_callback_info info)
+{
+  FML_DLOG(INFO)<<"PlatformViewOHOSNapi::nativeUnregisterTexture";
+  size_t argc = 2;
+  napi_value args[2] = {nullptr};
+  int64_t shell_holder;
+  int64_t textureId;
+  NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, nullptr, nullptr));
+  NAPI_CALL(env, napi_get_value_int64(env, args[0], &shell_holder));
+  NAPI_CALL(env, napi_get_value_int64(env, args[1], &textureId));
+  OHOS_SHELL_HOLDER->GetPlatformView()->UnRegisterExternalTexture(textureId);
+  return nullptr;
+}
+
+napi_value PlatformViewOHOSNapi::nativeMarkTextureFrameAvailable(
+  napi_env env,
+  napi_callback_info info)
+{
+  size_t argc = 2;
+  napi_value args[2] = {nullptr};
+  int64_t shell_holder;
+  int64_t textureId;
+  NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, nullptr, nullptr));
+  NAPI_CALL(env, napi_get_value_int64(env, args[0], &shell_holder));
+  NAPI_CALL(env, napi_get_value_int64(env, args[1], &textureId));
+  OHOS_SHELL_HOLDER->GetPlatformView()->MarkTextureFrameAvailable(textureId);
+  return nullptr;
+}
+
+napi_value PlatformViewOHOSNapi::nativeRegisterPixelMap(
+  napi_env env,
+  napi_callback_info info)
+{
+  FML_DLOG(INFO)<<"PlatformViewOHOSNapi::nativeRegisterPixelMap";
+  size_t argc = 3;
+  napi_value args[3] = {nullptr};
+  int64_t shell_holder;
+  int64_t textureId;
+  NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, nullptr, nullptr));
+  NAPI_CALL(env, napi_get_value_int64(env, args[0], &shell_holder));
+  NAPI_CALL(env, napi_get_value_int64(env, args[1], &textureId));
+  NativePixelMap *nativePixelMap = OH_PixelMap_InitNativePixelMap(env, args[2]);
+  OHOS_SHELL_HOLDER->GetPlatformView()->RegisterExternalTextureByPixelMap(textureId, nativePixelMap);
+  return nullptr;
+}
+
 void PlatformViewOHOSNapi::SurfaceCreated(int64_t shell_holder, void* window) {
   auto native_window = fml::MakeRefCounted<OHOSNativeWindow>(
       static_cast<OHNativeWindow*>(window));
diff --git a/shell/platform/ohos/napi/platform_view_ohos_napi.h b/shell/platform/ohos/napi/platform_view_ohos_napi.h
index 1e83a43017249553695f505e1b37df64bacabc9a..f998fbf553c2809abb2c5da737685c68009a8ce0 100644
--- a/shell/platform/ohos/napi/platform_view_ohos_napi.h
+++ b/shell/platform/ohos/napi/platform_view_ohos_napi.h
@@ -16,7 +16,6 @@
 #ifndef PLATFORM_VIEW_OHOS_NAPI_H
 #define PLATFORM_VIEW_OHOS_NAPI_H
 #include <memory>
-#include "../napi_common.h"
 #include "flutter/assets/directory_asset_bundle.h"
 #include "flutter/common/settings.h"
 #include "flutter/fml/file.h"
@@ -27,6 +26,7 @@
 #include "flutter/lib/ui/plugins/callback_cache.h"
 #include "flutter/runtime/dart_service_isolate.h"
 #include "flutter/shell/common/run_configuration.h"
+#include "flutter/shell/platform/ohos/napi_common.h"
 #include "napi/native_api.h"
 // class for all c++ to call js function
 namespace flutter {
@@ -143,11 +143,34 @@ class PlatformViewOHOSNapi {
       napi_env env,
       napi_callback_info info);  // 应用下发系统语言设置
 
+  static napi_value nativeInitNativeImage(
+      napi_env env,
+      napi_callback_info info);
+
+  static napi_value nativeUnregisterTexture(
+      napi_env env,
+      napi_callback_info info);
+
+  static napi_value nativeMarkTextureFrameAvailable(
+      napi_env env,
+      napi_callback_info info);
+
+  static napi_value nativeRegisterPixelMap(
+      napi_env env,
+      napi_callback_info info);
+
+  static napi_value nativeRegisterTexture(
+      napi_env env,
+      napi_callback_info info);
+
   // Surface相关，XComponent调用
   static void SurfaceCreated(int64_t shell_holder, void* window);
-  static void SurfaceChanged(int64_t shell_holder,
-                             int32_t width,
-                             int32_t height);
+
+  static void SurfaceChanged(
+      int64_t shell_holder,
+      int32_t width,
+      int32_t height);
+
   static void SurfaceDestroyed(int64_t shell_holder);
   static int64_t GetShellHolder();
   static napi_value nativeXComponentAttachFlutterEngine(
diff --git a/shell/platform/ohos/ohos_external_texture_gl.cpp b/shell/platform/ohos/ohos_external_texture_gl.cpp
index f2ffccbaa8168fda70c7f6cd5afdfa12b56767cc..9515f268e131aff9c234da86c10fb2b4feff7c81 100755
--- a/shell/platform/ohos/ohos_external_texture_gl.cpp
+++ b/shell/platform/ohos/ohos_external_texture_gl.cpp
@@ -14,8 +14,9 @@
  */
 
 #include "ohos_external_texture_gl.h"
-#include <GLES/glext.h>
 
+#include <GLES2/gl2ext.h>
+#include <sys/mman.h>
 #include <utility>
 
 #include "third_party/skia/include/core/SkAlphaType.h"
@@ -25,32 +26,89 @@
 #include "third_party/skia/include/gpu/GrBackendSurface.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
 
+#define EGL_PLATFORM_OHOS_KHR             0x34E0
+
+const int DMA_SIZE = 256; // DMA内存分配的分块大小
+const int PIXEL_SIZE = 4; // 像素点占用4个字节
+
 namespace flutter {
+using GetPlatformDisplayExt = PFNEGLGETPLATFORMDISPLAYEXTPROC;
+constexpr char CHARACTER_WHITESPACE = ' ';
+constexpr const char *CHARACTER_STRING_WHITESPACE = " ";
+constexpr const char *EGL_EXT_PLATFORM_WAYLAND = "EGL_EXT_platform_wayland";
+constexpr const char *EGL_KHR_PLATFORM_WAYLAND = "EGL_KHR_platform_wayland";
+constexpr const char *EGL_GET_PLATFORM_DISPLAY_EXT = "eglGetPlatformDisplayEXT";
 
-OHOSExternalTextureGL::OHOSExternalTextureGL(int id)
-    : Texture(id), transform(SkMatrix::I()) {}
+OHOSExternalTextureGL::OHOSExternalTextureGL(int64_t id, const std::shared_ptr<OHOSSurface>& ohos_surface)
+  : Texture(id), ohos_surface_(std::move(ohos_surface)), transform(SkMatrix::I())
+{
+    nativeImage_ = nullptr;
+    nativeWindow_ = nullptr;
+    eglContext_ =  EGL_NO_CONTEXT;
+    eglDisplay_ = EGL_NO_DISPLAY;
+    buffer_ = nullptr;
+    pixelMap_ = nullptr;
+    lastImage_ = nullptr;
+}
 
-OHOSExternalTextureGL::~OHOSExternalTextureGL() {
+OHOSExternalTextureGL::~OHOSExternalTextureGL()
+{
   if (state_ == AttachmentState::attached) {
+    glDeleteTextures(1, &texture_name_);
+  }
+}
+
+void OHOSExternalTextureGL::Attach()
+{
+  OHOSSurface* ohos_surface_ptr = ohos_surface_.get();
+  OhosSurfaceGLSkia* ohosSurfaceGLSkia_ = (OhosSurfaceGLSkia*)ohos_surface_ptr;
+  auto result = ohosSurfaceGLSkia_->GLContextMakeCurrent();
+  if (result->GetResult()) {
+    FML_DLOG(INFO)<<"ResourceContextMakeCurrent successed";
+    glGenTextures(1, &texture_name_);
+    FML_DLOG(INFO) << "OHOSExternalTextureGL::Paint, glGenTextures texture_name_=" << texture_name_;
+    if (nativeImage_ == nullptr) {
+      nativeImage_ = OH_NativeImage_Create(texture_name_, GL_TEXTURE_EXTERNAL_OES);
+      if (nativeImage_ == nullptr) {
+        FML_DLOG(ERROR) << "Error with OH_NativeImage_Create";
+        return;
+      }
+      nativeWindow_ = OH_NativeImage_AcquireNativeWindow(nativeImage_);
+      if (nativeWindow_ == nullptr) {
+        FML_DLOG(ERROR) << "Error with OH_NativeImage_AcquireNativeWindow";
+        return;
+      }
+    }
+
+    int32_t ret = OH_NativeImage_AttachContext(nativeImage_, texture_name_);
+    if (ret != 0) {
+      FML_DLOG(FATAL)<<"OHOSExternalTextureGL OH_NativeImage_AttachContext err code:"<< ret;
+    }
+    state_ = AttachmentState::attached;
+  } else {
+    FML_DLOG(FATAL)<<"ResourceContextMakeCurrent failed";
   }
 }
 
 void OHOSExternalTextureGL::Paint(PaintContext& context,
                                   const SkRect& bounds,
                                   bool freeze,
-                                  const SkSamplingOptions& sampling) {
+                                  const SkSamplingOptions& sampling)
+{
   if (state_ == AttachmentState::detached) {
+    FML_DLOG(ERROR) << "OHOSExternalTextureGL::Paint";
     return;
   }
   if (state_ == AttachmentState::uninitialized) {
-    Attach(static_cast<int>(texture_name_));
-    state_ = AttachmentState::attached;
+    Attach();
   }
   if (!freeze && new_frame_ready_) {
     Update();
     new_frame_ready_ = false;
   }
-  GrGLTextureInfo textureInfo = {0, texture_name_, GL_RGBA8_OES};
+
+  GrGLTextureInfo textureInfo = {
+    GL_TEXTURE_EXTERNAL_OES, texture_name_, GL_RGBA8_OES};
   GrBackendTexture backendTexture(1, 1, GrMipMapped::kNo, textureInfo);
   sk_sp<SkImage> image = SkImage::MakeFromTexture(
       context.gr_context, backendTexture, kTopLeft_GrSurfaceOrigin,
@@ -61,8 +119,8 @@ void OHOSExternalTextureGL::Paint(PaintContext& context,
     // The incoming texture is vertically flipped, so we flip it
     // back. OpenGL's coordinate system has Positive Y equivalent to up, while
     // Skia's coordinate system has Negative Y equvalent to up.
-    context.canvas->translate(bounds.x(), bounds.y() + bounds.height());
-    context.canvas->scale(bounds.width(), -bounds.height());
+    context.canvas->translate(bounds.x(), bounds.y());
+    context.canvas->scale(bounds.width(), bounds.height());
 
     if (!transform.isIdentity()) {
       sk_sp<SkShader> shader = image->makeShader(
@@ -80,42 +138,206 @@ void OHOSExternalTextureGL::Paint(PaintContext& context,
   }
 }
 
-void OHOSExternalTextureGL::OnGrContextCreated() {
+void OHOSExternalTextureGL::OnGrContextCreated()
+{
+  FML_DLOG(INFO)<<" OHOSExternalTextureGL::OnGrContextCreated";
   state_ = AttachmentState::uninitialized;
 }
 
-void OHOSExternalTextureGL::OnGrContextDestroyed() {
+void OHOSExternalTextureGL::OnGrContextDestroyed()
+{
+  FML_DLOG(INFO)<<" OHOSExternalTextureGL::OnGrContextDestroyed";
   if (state_ == AttachmentState::attached) {
     Detach();
+    glDeleteTextures(1, &texture_name_);
+    OH_NativeImage_Destroy(&nativeImage_);
   }
   state_ = AttachmentState::detached;
 }
 
-void OHOSExternalTextureGL::MarkNewFrameAvailable() {
+void OHOSExternalTextureGL::MarkNewFrameAvailable()
+{
+  FML_DLOG(INFO)<<" OHOSExternalTextureGL::MarkNewFrameAvailable";
   new_frame_ready_ = true;
 }
 
-void OHOSExternalTextureGL::OnTextureUnregistered() {
-  // do nothing
-}
-
-void OHOSExternalTextureGL::Attach(int textureName) {
+void OHOSExternalTextureGL::OnTextureUnregistered()
+{
+  FML_DLOG(INFO)<<" OHOSExternalTextureGL::OnTextureUnregistered";
   // do nothing
 }
 
-void OHOSExternalTextureGL::Update() {
+void OHOSExternalTextureGL::Update()
+{
+  ProducePixelMapToNativeImage();
+  int32_t ret = OH_NativeImage_UpdateSurfaceImage(nativeImage_);
+  if (ret != 0) {
+    FML_DLOG(FATAL)<<"OHOSExternalTextureGL OH_NativeImage_UpdateSurfaceImage err code:"<< ret;
+  }
   UpdateTransform();
 }
 
-void OHOSExternalTextureGL::Detach() {
-  // do nothing
+void OHOSExternalTextureGL::Detach()
+{
+  OH_NativeImage_DetachContext(nativeImage_);
+  OH_NativeWindow_DestroyNativeWindow(nativeWindow_);
 }
 
-void OHOSExternalTextureGL::UpdateTransform() {
+void OHOSExternalTextureGL::UpdateTransform()
+{
+  float m[16] = { 0.0f };
+  int32_t ret = OH_NativeImage_GetTransformMatrix(nativeImage_, m);
+  if (ret != 0) {
+    FML_DLOG(FATAL)<<"OHOSExternalTextureGL OH_NativeImage_GetTransformMatrix err code:"<< ret;
+  }
+  // transform ohos 4x4 matrix to skia 3x3 matrix
+  SkScalar matrix3[] = {
+    m[0], m[4], m[12],  //
+    m[1], m[5], m[13],  //
+    m[3], m[7], m[15],  //
+  };
+  transform.set9(matrix3);
   SkMatrix inverted;
   if (!transform.invert(&inverted)) {
-    FML_LOG(FATAL) << "Invalid SurfaceTexture transformation matrix";
+    FML_LOG(FATAL) << "OHOSExternalTextureGL Invalid SurfaceTexture transformation matrix";
   }
   transform = inverted;
 }
+
+void OHOSExternalTextureGL::DispatchImage(ImageNative* image)
+{
+  lastImage_ = image;
+}
+
+void OHOSExternalTextureGL::HandlePixelMapBuffer()
+{
+  BufferHandle *handle = OH_NativeWindow_GetBufferHandleFromNative(buffer_);
+  // get virAddr of bufferHandl by mmap sys interface
+  void *mappedAddr = mmap(handle->virAddr, handle->size, PROT_READ | PROT_WRITE, MAP_SHARED, handle->fd, 0);
+  if (mappedAddr == MAP_FAILED) {
+    FML_DLOG(FATAL)<<"OHOSExternalTextureGL mmap failed";
+    return;
+  }
+
+  void *pixelAddr = nullptr;
+  int64_t ret = OH_PixelMap_AccessPixels(pixelMap_, &pixelAddr);
+  if (ret != IMAGE_RESULT_SUCCESS) {
+    FML_DLOG(FATAL)<<"OHOSExternalTextureGL OH_PixelMap_AccessPixels err:"<< ret;
+    return;
+  }
+
+  uint32_t *value = static_cast<uint32_t *>(pixelAddr);
+  uint32_t *pixel = static_cast<uint32_t *>(mappedAddr);
+  uint32_t rowDataSize = DMA_SIZE; // DMA内存会自动补齐，分配内存时是 256 的整数倍
+  while (rowDataSize < pixelMapInfo.rowSize) {
+    rowDataSize += DMA_SIZE;
+  }
+
+  FML_DLOG(INFO) << "OHOSExternalTextureGL pixelMapInfo w:" << pixelMapInfo.width
+    << " h:" << pixelMapInfo.height;
+  FML_DLOG(INFO) << "OHOSExternalTextureGL pixelMapInfo rowSize:" << pixelMapInfo.rowSize
+    << " format:" << pixelMapInfo.pixelFormat;
+  FML_DLOG(INFO) << "OHOSExternalTextureGL pixelMapInfo rowDataSize:" << rowDataSize;
+
+  // 复制图片纹理数据到内存中，需要处理DMA内存补齐相关的逻辑
+  for (uint32_t i = 0; i < pixelMapInfo.height; i++) {
+    memcpy(pixel, value, rowDataSize);
+    pixel += rowDataSize / PIXEL_SIZE;
+    value += pixelMapInfo.width;
+  }
+
+  OH_PixelMap_UnAccessPixels(pixelMap_);
+  // munmap after use
+  ret = munmap(mappedAddr, handle->size);
+  if (ret == -1) {
+    FML_DLOG(FATAL)<<"OHOSExternalTextureGL munmap failed";
+    return;
+  }
+}
+
+void OHOSExternalTextureGL::ProducePixelMapToNativeImage()
+{
+  if (pixelMap_ == nullptr) {
+    FML_DLOG(ERROR) << "OHOSExternalTextureGL pixelMap in null";
+    return;
+  }
+  if (state_ == AttachmentState::detached) {
+    FML_DLOG(ERROR) << "OHOSExternalTextureGL AttachmentState err";
+    return;
+  }
+  int32_t ret = -1;
+  ret = OH_PixelMap_GetImageInfo(pixelMap_, &pixelMapInfo);
+  if (ret != 0) {
+    FML_DLOG(ERROR) << "OHOSExternalTextureGL OH_PixelMap_GetImageInfo err:" << ret;
+  }
+  
+  int code = SET_BUFFER_GEOMETRY;
+  ret = OH_NativeWindow_NativeWindowHandleOpt(nativeWindow_, code, pixelMapInfo.width, pixelMapInfo.height);
+  if (ret != 0) {
+    FML_DLOG(ERROR) << "OHOSExternalTextureGL OH_NativeWindow_NativeWindowHandleOpt err:" << ret;
+  }
+
+  if (buffer_ != nullptr) {
+    OH_NativeWindow_NativeWindowAbortBuffer(nativeWindow_, buffer_);
+    buffer_ = nullptr;
+  }
+  ret = OH_NativeWindow_NativeWindowRequestBuffer(nativeWindow_, &buffer_, &fenceFd);
+  if (ret != 0) {
+    FML_DLOG(ERROR) << "OHOSExternalTextureGL OH_NativeWindow_NativeWindowRequestBuffer err:" << ret;
+  }
+  HandlePixelMapBuffer();
+  Region region{nullptr, 0};
+  ret = OH_NativeWindow_NativeWindowFlushBuffer(nativeWindow_, buffer_, fenceFd, region);
+  if (ret != 0) {
+    FML_DLOG(FATAL)<<"OHOSExternalTextureGL OH_NativeWindow_NativeWindowFlushBuffer err:"<< ret;
+  }
+}
+
+EGLDisplay OHOSExternalTextureGL::GetPlatformEglDisplay(EGLenum platform, void *native_display,
+    const EGLint *attrib_list)
+{
+  GetPlatformDisplayExt eglGetPlatformDisplayExt = NULL;
+
+  if (!eglGetPlatformDisplayExt) {
+    const char* extensions = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
+    if (extensions &&
+        (CheckEglExtension(extensions, EGL_EXT_PLATFORM_WAYLAND) ||
+         CheckEglExtension(extensions, EGL_KHR_PLATFORM_WAYLAND))) {
+      eglGetPlatformDisplayExt = (GetPlatformDisplayExt)eglGetProcAddress(EGL_GET_PLATFORM_DISPLAY_EXT);
+    }
+  }
+
+  if (eglGetPlatformDisplayExt) {
+    return eglGetPlatformDisplayExt(platform, native_display, attrib_list);
+  }
+
+  return eglGetDisplay((EGLNativeDisplayType)native_display);
+}
+
+bool OHOSExternalTextureGL::CheckEglExtension(const char *extensions, const char *extension)
+{
+  size_t extlen = strlen(extension);
+  const char *end = extensions + strlen(extensions);
+  while (extensions < end) {
+    size_t n = 0;
+    if (*extensions == CHARACTER_WHITESPACE) {
+        extensions++;
+        continue;
+      }
+      n = strcspn(extensions, CHARACTER_STRING_WHITESPACE);
+      if (n == extlen && strncmp(extension, extensions, n) == 0) {
+        return true;
+    }
+    extensions += n;
+  }
+  return false;
+}
+
+void OHOSExternalTextureGL::DispatchPixelMap(NativePixelMap* pixelMap)
+{
+  if (pixelMap != nullptr) {
+    pixelMap_ = pixelMap;
+  }
+}
+
 }  // namespace flutter
\ No newline at end of file
diff --git a/shell/platform/ohos/ohos_external_texture_gl.h b/shell/platform/ohos/ohos_external_texture_gl.h
index aa08880048c15b286713289593a7fb8073d7cb29..88949d3dbd747fbd2d09f6be0af7feb36fb85a81 100755
--- a/shell/platform/ohos/ohos_external_texture_gl.h
+++ b/shell/platform/ohos/ohos_external_texture_gl.h
@@ -15,20 +15,33 @@
 
 #ifndef OHOS_EXTERNAL_TEXTURE_GL_H
 #define OHOS_EXTERNAL_TEXTURE_GL_H
-#include <GLES/gl.h>
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <GLES3/gl3.h>
+
+#include <multimedia/image_framework/image_mdk.h>
+#include <multimedia/image_framework/image_pixel_map_mdk.h>
+#include <native_buffer/native_buffer.h>
+#include <native_window/external_window.h>
+#include <native_image/native_image.h>
 
 #include "flutter/common/graphics/texture.h"
-#include "napi/platform_view_ohos_napi.h"
+#include "flutter/shell/platform/ohos/napi/platform_view_ohos_napi.h"
+#include "flutter/shell/platform/ohos/ohos_surface_gl_skia.h"
+#include "flutter/shell/platform/ohos/surface/ohos_surface.h"
 
 // maybe now unused
 namespace flutter {
 
 class OHOSExternalTextureGL : public flutter::Texture {
  public:
-  explicit OHOSExternalTextureGL(int id);
+  explicit OHOSExternalTextureGL(int64_t id, const std::shared_ptr<OHOSSurface>& ohos_surface);
 
   ~OHOSExternalTextureGL() override;
 
+  OH_NativeImage *nativeImage_;
+
   void Paint(PaintContext& context,
              const SkRect& bounds,
              bool freeze,
@@ -42,8 +55,12 @@ class OHOSExternalTextureGL : public flutter::Texture {
 
   void OnTextureUnregistered() override;
 
+  void DispatchImage(ImageNative* image);
+
+  void DispatchPixelMap(NativePixelMap* pixelMap);
+
  private:
-  void Attach(int textureName);
+  void Attach();
 
   void Update();
 
@@ -51,6 +68,14 @@ class OHOSExternalTextureGL : public flutter::Texture {
 
   void UpdateTransform();
 
+  EGLDisplay GetPlatformEglDisplay(EGLenum platform, void *native_display, const EGLint *attrib_list);
+
+  bool CheckEglExtension(const char *extensions, const char *extension);
+
+  void HandlePixelMapBuffer();
+
+  void ProducePixelMapToNativeImage();
+
   enum class AttachmentState { uninitialized, attached, detached };
 
   AttachmentState state_ = AttachmentState::uninitialized;
@@ -59,8 +84,25 @@ class OHOSExternalTextureGL : public flutter::Texture {
 
   GLuint texture_name_ = 0;
 
+  std::shared_ptr<OHOSSurface> ohos_surface_;
+
   SkMatrix transform;
 
+  OHNativeWindow *nativeWindow_;
+
+  OHNativeWindowBuffer *buffer_;
+
+  NativePixelMap* pixelMap_;
+
+  ImageNative* lastImage_;
+
+  OhosPixelMapInfos pixelMapInfo;
+
+  int fenceFd = -1;
+
+  EGLContext eglContext_;
+  EGLDisplay eglDisplay_;
+
   FML_DISALLOW_COPY_AND_ASSIGN(OHOSExternalTextureGL);
 };
 }  // namespace flutter
diff --git a/shell/platform/ohos/ohos_unified_surface.cpp b/shell/platform/ohos/ohos_unified_surface.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..73c3a0c954d6b7f9ee95af2336d8e7b4f37284bb
--- /dev/null
+++ b/shell/platform/ohos/ohos_unified_surface.cpp
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
+ * 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.
+ */
+
+#include "flutter/shell/platform/ohos/ohos_unified_surface.h"
+namespace flutter {
+
+OHOSUnifiedSurface::OHOSUnifiedSurface() {}
+
+
+}  // namespace flutter
\ No newline at end of file
diff --git a/shell/platform/ohos/ohos_unified_surface.h b/shell/platform/ohos/ohos_unified_surface.h
new file mode 100644
index 0000000000000000000000000000000000000000..591ba0dddfc5c9e80c6c6d811626a0d82e19fcc8
--- /dev/null
+++ b/shell/platform/ohos/ohos_unified_surface.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd.
+ * 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.
+ */
+
+#ifndef OHOS_UNIFIED_SURFACE_H
+#define OHOS_UNIFIED_SURFACE_H
+
+#include <memory>
+#include "flutter/flow/surface.h"
+#include "flutter/shell/platform/ohos/context/ohos_context.h"
+#include "flutter/shell/platform/ohos/surface/ohos_native_window.h"
+#include "flutter/shell/platform/ohos/surface/ohos_surface.h"
+#include "flutter/shell/platform/ohos/ohos_surface_gl_skia.h"
+#include "third_party/skia/include/core/SkSize.h"
+
+namespace flutter {
+
+class OHOSUnifiedSurface : public GPUSurfaceGLDelegate,
+                           public OHOSSurface {
+ public:
+   ~OHOSUnifiedSurface() {}
+  bool IsValid() {}
+  void TeardownOnScreenContext() {}
+
+  bool OnScreenSurfaceResize(const SkISize& size) {}
+
+  bool ResourceContextMakeCurrent() {}
+
+  bool ResourceContextClearCurrent() {}
+
+  bool SetNativeWindow(fml::RefPtr<OHOSNativeWindow> window) {}
+
+  std::unique_ptr<Surface> CreateSnapshotSurface()
+
+  std::unique_ptr<Surface> CreateGPUSurface(
+      GrDirectContext* gr_context = nullptr) {}
+
+  std::shared_ptr<impeller::Context> GetImpellerContext() {}
+
+  std::unique_ptr<GLContextResult> GLContextMakeCurrent() {}
+
+  bool GLContextClearCurrent() {}
+
+  void GLContextSetDamageRegion(const std::optional<SkIRect>& region) {}
+
+  bool GLContextPresent(const GLPresentInfo& present_info) {}
+
+  GLFBOInfo GLContextFBO(GLFrameInfo frame_info) {}
+
+  bool GLContextFBOResetAfterPresent() {}
+
+  SurfaceFrame::FramebufferInfo GLContextFramebufferInfo() {}
+
+  SkMatrix GLContextSurfaceTransformation() {}
+
+  sk_sp<const GrGLInterface> GetGLInterface() {}
+
+  static sk_sp<const GrGLInterface> GetDefaultPlatformGLInterface() {}
+
+  using GLProcResolver =
+      std::function<void* (const char*)>;
+ 
+  GLProcResolver GetGLProcResolver() {}
+
+  bool AllowsDrawingWhenGpuDisabled() {}
+};
+}  // namespace flutter
+
+#endif
\ No newline at end of file
diff --git a/shell/platform/ohos/ohos_xcomponent_adapter.cpp b/shell/platform/ohos/ohos_xcomponent_adapter.cpp
index f592b7e0dfcaf661d8c3e14d4100f2191a1e3dff..9c7fee2473fb2469228138661c94e9f22b88885b 100644
--- a/shell/platform/ohos/ohos_xcomponent_adapter.cpp
+++ b/shell/platform/ohos/ohos_xcomponent_adapter.cpp
@@ -147,10 +147,7 @@ static int32_t SetNativeWindowOpt(OHNativeWindow* nativeWindow,
                                   int height) {
   // Set the read and write scenarios of the native window buffer.
   int code = SET_USAGE;
-  int32_t usage =
-      BUFFER_USAGE_CPU_READ | BUFFER_USAGE_CPU_WRITE | BUFFER_USAGE_MEM_DMA;
-  int32_t ret =
-      OH_NativeWindow_NativeWindowHandleOpt(nativeWindow, code, usage);
+  int32_t ret = OH_NativeWindow_NativeWindowHandleOpt(nativeWindow, code, BUFFER_USAGE_MEM_DMA);
   if (ret) {
     LOGE(
         "Set NativeWindow Usage Failed :window:%{public}p ,w:%{public}d x "
@@ -268,10 +265,9 @@ void XComponentBase::DetachFlutterEngine() {
   if (window_ != nullptr) {
     PlatformViewOHOSNapi::SurfaceDestroyed(std::stoll(shellholderId_));
   } else {
-    LOGE("OnSurfaceCreated XComponentBase is not attached");
+    LOGE("DetachFlutterEngine XComponentBase is not attached");
   }
   shellholderId_ = "";
-  window_ = nullptr;
   isEngineAttached_ = false;
 }
 
diff --git a/shell/platform/ohos/platform_view_ohos.cpp b/shell/platform/ohos/platform_view_ohos.cpp
index b0a382254af8e4c02dc3e237918bbda4db549f1e..bf65b2252ee32a708afe16d495c2a0f3c989d361 100644
--- a/shell/platform/ohos/platform_view_ohos.cpp
+++ b/shell/platform/ohos/platform_view_ohos.cpp
@@ -25,6 +25,9 @@
 #include "napi_common.h"
 #include "ohos_context_gl_impeller.h"
 #include "ohos_surface_gl_impeller.h"
+#include "ohos_external_texture_gl.h"
+
+#include <GLES2/gl2ext.h>
 
 namespace flutter {
 
@@ -167,7 +170,8 @@ void PlatformViewOHOS::NotifyChanged(const SkISize& size) {
 }
 
 // |PlatformView|
-void PlatformViewOHOS::NotifyDestroyed() {
+void PlatformViewOHOS::NotifyDestroyed()
+{
   LOGI("PlatformViewOHOS NotifyDestroyed enter");
   PlatformView::NotifyDestroyed();
   if (ohos_surface_) {
@@ -387,4 +391,101 @@ void PlatformViewOHOS::FireFirstFrameCallback() {
   napi_facade_->FlutterViewOnFirstFrame();
 }
 
+void PlatformViewOHOS::RegisterExternalTextureByImage(
+    int64_t texture_id,
+    ImageNative* image)
+{
+  if (ohos_context_->RenderingApi() == OHOSRenderingAPI::kOpenGLES) {
+    auto iter = external_texture_gl_.find(texture_id);
+    if (iter != external_texture_gl_.end()) {
+      iter->second->DispatchImage(image);
+    } else {
+      std::shared_ptr<OHOSExternalTextureGL> ohos_external_gl =
+        std::make_shared<OHOSExternalTextureGL>(texture_id, ohos_surface_);
+      external_texture_gl_[texture_id] = ohos_external_gl;
+      RegisterTexture(ohos_external_gl);
+      ohos_external_gl->DispatchImage(image);
+    }
+  }
+}
+
+uint64_t PlatformViewOHOS::RegisterExternalTexture(int64_t texture_id)
+{
+  uint64_t surface_id = 0;
+  int ret = -1;
+  if (ohos_context_->RenderingApi() == OHOSRenderingAPI::kOpenGLES) {
+    std::shared_ptr<OHOSExternalTextureGL> ohos_external_gl =
+      std::make_shared<OHOSExternalTextureGL>(texture_id, ohos_surface_);
+    ohos_external_gl->nativeImage_ = OH_NativeImage_Create(texture_id, GL_TEXTURE_EXTERNAL_OES);
+    if (ohos_external_gl->nativeImage_ == nullptr) {
+      FML_DLOG(ERROR) << "Error with OH_NativeImage_Create";
+      return surface_id;
+    }
+    void* contextData = new OhosImageFrameData(this, texture_id);
+    OH_OnFrameAvailableListener listener;
+    listener.context = contextData;
+    listener.onFrameAvailable = &PlatformViewOHOS::OnNativeImageFrameAvailable;
+    ret = OH_NativeImage_SetOnFrameAvailableListener(ohos_external_gl->nativeImage_, listener);
+    if (ret != 0) {
+      FML_DLOG(ERROR) << "Error with OH_NativeImage_SetOnFrameAvailableListener";
+      return surface_id;
+    }
+    ret = OH_NativeImage_GetSurfaceId(ohos_external_gl->nativeImage_, &surface_id);
+    if (ret != 0) {
+      FML_DLOG(ERROR) << "Error with OH_NativeImage_GetSurfaceId";
+      return surface_id;
+    }
+    RegisterTexture(ohos_external_gl);
+  }
+  return surface_id;
+}
+
+void PlatformViewOHOS::OnNativeImageFrameAvailable(void *data)
+{
+  auto frameData = reinterpret_cast<OhosImageFrameData *>(data);
+  if (frameData == nullptr || frameData->context_ == nullptr) {
+    FML_DLOG(ERROR) << "OnNativeImageFrameAvailable, frameData or context_ is null.";
+    return;
+  }
+  std::shared_ptr<OHOSSurface> ohos_surface = frameData->context_->ohos_surface_;
+  const TaskRunners task_runners = frameData->context_->task_runners_;
+  if (ohos_surface) {
+    fml::TaskRunner::RunNowOrPostTask(
+        task_runners.GetPlatformTaskRunner(),
+        [frameData]() {
+          frameData->context_->MarkTextureFrameAvailable(frameData->texture_id_);
+        });
+  }
+}
+
+void PlatformViewOHOS::UnRegisterExternalTexture(int64_t texture_id)
+{
+  external_texture_gl_.erase(texture_id);
+  UnregisterTexture(texture_id);
+}
+
+void PlatformViewOHOS::RegisterExternalTextureByPixelMap(int64_t texture_id, NativePixelMap* pixelMap)
+{
+  if (ohos_context_->RenderingApi() == OHOSRenderingAPI::kOpenGLES) {
+    auto iter = external_texture_gl_.find(texture_id);
+    if (iter != external_texture_gl_.end()) {
+      iter->second->DispatchPixelMap(pixelMap);
+    } else {
+      std::shared_ptr<OHOSExternalTextureGL> ohos_external_gl =
+          std::make_shared<OHOSExternalTextureGL>(texture_id, ohos_surface_);
+      external_texture_gl_[texture_id] = ohos_external_gl;
+      RegisterTexture(ohos_external_gl);
+      ohos_external_gl->DispatchPixelMap(pixelMap);
+    }
+    MarkTextureFrameAvailable(texture_id);
+  }
+}
+
+OhosImageFrameData::OhosImageFrameData(
+    PlatformViewOHOS* context,
+    int64_t texture_id)
+    : context_(context), texture_id_(texture_id) {}
+
+OhosImageFrameData::~OhosImageFrameData() = default;
+
 }  // namespace flutter
diff --git a/shell/platform/ohos/platform_view_ohos.h b/shell/platform/ohos/platform_view_ohos.h
index a1b863ed345f0ee206825a79323a4c2fa67cfa61..a9793dd73a0cbc3d582a351ebd0700c75994cb87 100644
--- a/shell/platform/ohos/platform_view_ohos.h
+++ b/shell/platform/ohos/platform_view_ohos.h
@@ -21,11 +21,15 @@
 #include <unordered_map>
 #include <vector>
 
+#include <multimedia/image_framework/image_mdk.h>
+#include <multimedia/image_framework/image_pixel_map_mdk.h>
+
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/lib/ui/window/platform_message.h"
 #include "flutter/shell/common/platform_view.h"
 #include "flutter/shell/platform/ohos/context/ohos_context.h"
 #include "flutter/shell/platform/ohos/napi/platform_view_ohos_napi.h"
+#include "flutter/shell/platform/ohos/ohos_external_texture_gl.h"
 #include "flutter/shell/platform/ohos/platform_message_handler_ohos.h"
 #include "flutter/shell/platform/ohos/surface/ohos_native_window.h"
 #include "flutter/shell/platform/ohos/surface/ohos_snapshot_surface_producer.h"
@@ -84,6 +88,15 @@ class PlatformViewOHOS final : public PlatformView {
                                int action,
                                void* actionData,
                                int actionDataLenth);
+  void RegisterExternalTextureByImage(
+      int64_t texture_id,
+      ImageNative* image);
+
+  uint64_t RegisterExternalTexture(int64_t texture_id);
+
+  void RegisterExternalTextureByPixelMap(int64_t texture_id, NativePixelMap* pixelMap);
+
+  void UnRegisterExternalTexture(int64_t texture_id);
 
   // |PlatformView|
   void LoadDartDeferredLibrary(
@@ -117,6 +130,7 @@ class PlatformViewOHOS final : public PlatformView {
   std::shared_ptr<PlatformMessageHandlerOHOS> platform_message_handler_;
 
   std::shared_ptr<OhosSurfaceFactoryImpl> surface_factory_;
+  std::map<int64_t, std::shared_ptr<OHOSExternalTextureGL>> external_texture_gl_;
 
   // |PlatformView|
   void UpdateSemantics(
@@ -164,6 +178,21 @@ class PlatformViewOHOS final : public PlatformView {
   void FireFirstFrameCallback();
 
   FML_DISALLOW_COPY_AND_ASSIGN(PlatformViewOHOS);
+
+  static void OnNativeImageFrameAvailable(void *data);
+};
+
+class OhosImageFrameData {
+ public:
+  OhosImageFrameData(PlatformViewOHOS* context,
+                     int64_t texture_id);
+
+  ~OhosImageFrameData();
+
+  PlatformViewOHOS* context_;
+
+  int64_t texture_id_;
 };
+
 }  // namespace flutter
 #endif
diff --git a/tools/gn b/tools/gn
index a5efe0f75d58748cd6047a78e22dc9735d7e7eb5..58d35d1d9d08f1157d089c15a3f4f11672475589 100755
--- a/tools/gn
+++ b/tools/gn
@@ -280,9 +280,6 @@ def to_gn_args(args):
   if args.enable_unittests:
     gn_args['enable_unittests'] = args.enable_unittests
 
-  gn_args['enable_unittests'] =  False
-  print("enable_unittests:%s" % gn_args['enable_unittests'] );
-
   # Skia GN args.
   gn_args['skia_enable_flutter_defines'
          ] = True  # Enable Flutter API guards in Skia.
@@ -303,6 +300,10 @@ def to_gn_args(args):
   gn_args['is_official_build'] = True  # Disable Skia test utilities.
   gn_args['android_full_debug'
          ] = args.target_os == 'android' and args.unoptimized
+  
+  if  args.target_os == 'ohos':
+      gn_args['ohos_api_int'] = args.ohos_api_int
+
   if args.clang is None:
     gn_args['is_clang'] = True
   else:
@@ -761,6 +762,9 @@ def parse_args(args):
   parser.add_argument(
       '--ohos-cpu', type=str, choices=['x64', 'x86', 'arm64', 'arm']
   )
+  parser.add_argument(
+      '--ohos-api-int', type=int, choices=[10, 11], default=11
+  )
   parser.add_argument(
       '--fuchsia-cpu', type=str, choices=['x64', 'arm64'], default='x64'
   )
@@ -1047,10 +1051,10 @@ def main(argv):
   print('XX target_os:%s' % args.target_os)
 
   if  args.target_os == 'ohos':
-     if args.ohos_cpu is not None:
-       args.linux_cpu = args.ohos_cpu
-     elif args.linux_cpu is not None :
-       args.ohos_cpu = args.linux_cpu
+      if args.ohos_cpu is not None:
+        args.linux_cpu = args.ohos_cpu
+      elif args.linux_cpu is not None :
+        args.ohos_cpu = args.linux_cpu
 
   if not args.web:
     if args.ide != '':