diff --git a/LICENSE_KHZG b/LICENSE_KHZG new file mode 100644 index 0000000000000000000000000000000000000000..452a23994b23a7a5f0eb9be33af7058009eed20f --- /dev/null +++ b/LICENSE_KHZG @@ -0,0 +1,21 @@ +Copyright 2023 Hunan OpenValley Digital Industry Development Co., Ltd. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted (subject to the limitations in the disclaimer below) provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided with the distribution. + + * Neither the name of Hunan OpenValley Digital Industry Development Co., Ltd. nor the names of its contributors may be + used to endorse or promote products derived from this software without specific prior written permission. + +NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT +HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/OAT.xml b/OAT.xml index ff270e602aace6687e34dcfac7cfc73c5da612c1..aba6944fef17696609bd969f3f2d42acaac7cb7b 100644 --- a/OAT.xml +++ b/OAT.xml @@ -52,6 +52,14 @@ + + + + + + + + - - + + + + + + + + + + @@ -82,6 +112,7 @@ + @@ -104,6 +135,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + install ``` - 方式二：进入项目目录，直接运行安装到鸿蒙手机中 + 方式二：进入项目目录，直接运行安装到OpenHarmony手机中 ```sh flutter run --debug -d ``` @@ -123,6 +123,7 @@ Flutter SDK 仓库 ``` ## 版本说明 + - [3.7.12-ohos-1.0.4 Release](/release-notes/Flutter%203.7.12-ohos%201.0.4%20ReleaseNote.md) - [3.7.12-ohos-1.0.3 Release](/release-notes/Flutter%203.7.12-ohos%201.0.3%20ReleaseNote.md) - [3.7.12-ohos-1.0.2 Release](/release-notes/Flutter%203.7.12-ohos%201.0.2%20ReleaseNote.md) - [3.7.12-ohos-1.0.1 Release](/release-notes/Flutter%203.7.12-ohos%201.0.1%20ReleaseNote.md) @@ -137,7 +138,7 @@ Flutter SDK 仓库 | create | 创建module模板 | flutter create -t module \ | | create | 创建plugin模板 | flutter create -t plugin --platforms ohos,android,ios \ | | create | 创建plugin_ffi模板 | flutter create -t plugin_ffi --platforms ohos,android,ios \ | -| devices | 已连接设备查找 | flutter devices | +| devices | 查找已连接设备 | flutter devices | | install | 应用安装 | flutter install -t \ \ | | assemble | 资源打包 | flutter assemble | | build | 测试应用构建 | flutter build hap --debug [--target-platform ohos-arm64] | @@ -149,28 +150,26 @@ Flutter SDK 仓库 | clean | 清除项目依赖 | flutter clean | | cache | 清除全局缓存数据 | flutter pub cache clean | -附：[Flutter高频使用的三方库（部分鸿蒙化）列表](https://gitee.com/openharmony-sig/flutter_packages#openharmony%E5%B9%B3%E5%8F%B0%E5%B7%B2%E5%85%BC%E5%AE%B9%E5%BA%93) - +附：[Flutter高频使用的三方库（部分OpenHarmony化）列表](https://gitee.com/openharmony-sig/flutter_packages#openharmony%E5%B9%B3%E5%8F%B0%E5%B7%B2%E5%85%BC%E5%AE%B9%E5%BA%93) ## 常见问题 1. 模拟器调试只支持Mac(arm64)，还不支持Mac(x86) 和 Windows。 -2. 切换FLUTTER_STORAGE_BASE_URL后需删除\/bin/cache 目录，并在项目中执行flutter clean后再运行 +2. 切换FLUTTER_STORAGE_BASE_URL后需删除\/bin/cache 目录，并在项目中执行flutter clean后再运行。 3. 构建Hap任务时报错：Error: The hvigor depends on the npmrc file. Configure the npmrc file first. - 请在用户目录`~`下创建文件`.npmrc`，该配置也可参考[DevEco Studio官方文档](https://developer.harmonyos.com/cn/docs/documentation/doc-guides-V3/environment_config-0000001052902427-V3)，编辑内容如下： + 请在用户目录`~`下创建文件`.npmrc`，该配置也可参考[DevEco Studio官方文档](https://developer.huawei.com/consumer/cn/doc/harmonyos-guides-V5/ide-environment-config-V5#section197296441787)，编辑内容如下： ``` registry=https://repo.huaweicloud.com/repository/npm/ @ohos:registry=https://repo.harmonyos.com/npm/ ``` -4. 查日志时，存在日志丢失现象。 - 解决方案：关闭全局日志，只打开自己领域的日志 - +4. 查日志时，存在日志丢失现象。 + 解决方案：关闭全局日志，只打开自己领域的日志。 ``` 步骤一：关闭所有领域的日志打印（部分特殊日志无法关闭） hdc shell hilog -b X @@ -181,20 +180,21 @@ Flutter SDK 仓库 打印A00000/XComFlutterOHOS_Native的日志，需要设置hdc shell hilog -b D -D A00000 注：上面的设置在机器重启后会失效，如果要继续使用，需要重新设置。 ``` -5. 若Api11 Beta1版本的机器上无法启动debug签名的应用，可以通过将签名换成正式签名，或在手机端打开开发者模式解决（步骤：设置->通用->开发者模式） -6. 如果报`Invalid CEN header (invalid zip64 extra data field size)`异常，请更换Jdk版本，参见[JDK-8313765](https://bugs.openjdk.org/browse/JDK-8313765) +5. 若Beta1版本的机器上无法启动debug签名的应用，可以通过将签名换成正式签名，或在手机端打开开发者模式解决（步骤：设置->通用->开发者模式）。 + +6. 如果报`Invalid CEN header (invalid zip64 extra data field size)`异常，请更换Jdk版本。参见[JDK-8313765](https://bugs.openjdk.org/browse/JDK-8313765) -7. 运行debug版本的flutter应用用到鸿蒙设备后报错（release和profile版本正常） +7. 运行debug版本的flutter应用用到OpenHarmony设备后报错（release和profile版本正常）。 1. 报错信息: `Error while initializing the Dart VM: Wrong full snapshot version, expected '8af474944053df1f0a3be6e6165fa7cf' found 'adb4292f3ec25074ca70abcd2d5c7251'` - 2. 解决方案: 依次执行以下操作 + 2. 解决方案: 依次执行以下操作。 1. 设置环境变量 `export FLUTTER_STORAGE_BASE_URL=https://flutter-ohos.obs.cn-south-1.myhuaweicloud.com` 2. 删除 /bin/cache 目录下的缓存 3. 执行 `flutter clean`，清除项目编译缓存 4. 运行 `flutter run -d $DEVICE --debug` - 3. 补充信息: 运行android或ios出现类似错误，也可以尝试还原环境变量 FLUTTER_STORAGE_BASE_URL ，清除缓存后重新运行。 + 3. 补充信息: 若运行android或ios也出现类似错误，可以尝试还原环境变量`FLUTTER_STORAGE_BASE_URL`，清除缓存后重新运行。 -8. Beta2版本的ROM更新后，不再支持申请有执行权限的匿名内存，导致debug运行闪退。 +8. ROM更新后，不再支持申请有执行权限的匿名内存，导致debug运行闪退。 1. 解决方案：更新 flutter_flutter 到 a44b8a6d (2024-07-25) 之后的版本。 2. 关键日志： @@ -206,14 +206,14 @@ Flutter SDK 仓库 9. 构建Hap命令直接执行`flutter build hap`即可，不再需要`--local-engine`参数，直接从云端获取编译产物。 -10. 配置环境完成后执行 flutter 命令 出现闪退。 - 1. 解决方案：windows环境中添加git环境变量配置。 +10. 配置环境完成后执行 flutter 命令 出现闪退。 + 解决方案：windows环境中添加git环境变量配置。 ``` export PATH=/cmd:$PATH ``` -11. 执行`flutter pub cache clean` 正常 执行`flutter clean` 报错，按照报错信息执行 update 命令也没有效果。 - 1. 解决方案：通过注释掉 build.json5 文件中的配置规避： "modules":[{ // 删除报错对应的整个对象 }] +11. 执行`flutter pub cache clean` 正常，执行`flutter clean` 报错，按照报错信息执行 update 命令也没有效果。 + 1. 解决方案：通过注释掉 build.json5 文件中的配置规避： "modules":[{ // 删除报错对应的整个对象 }]。 2. 报错信息: ``` #Parse ohos module. json5 error: Exception: Can not found module.json5 at @@ -224,9 +224,7 @@ Flutter SDK 仓库 ``` 12. 执行`flutter build hap` 时遇到路径校验报错。 - 1. 解决方案： - ·打开 deveco 安装路径 D:\DevEco Studio\tools\hvigor\hvigor-ohos-plugin\res\schemas 下的 ohos-project-build-profile-schema.json文件。 - ·在该文件中找到包含："pattern": "^(\\./|\\.\\./)[\\s\\S]+$"的行,并删除此行。 + 1. 解决方案：打开 deveco 安装路径 D:\DevEco Studio\tools\hvigor\hvigor-ohos-plugin\res\schemas 下的 ohos-project-build-profile-schema.json文件。在该文件中找到包含："pattern": "^(\\./|\\.\\./)[\\s\\S]+$"的行，并删除此行。 2. 报错信息: ``` #hvigor ERROR: Schema validate failed. @@ -239,15 +237,14 @@ Flutter SDK 仓库 ``` 13. 执行`flutter build hap` 报错。 - 1. 解决方案：打开 deveco 安装路径 D:\DevEco Studio\tools\hvigor\hvigor-ohos-plugin\src\model\module 下的 core-module-model-impl.js, - 修改 findBelongProjectPath 方法（需要管理员权限，可另存为后替换） - ``` - findBelongProjectPath(e) { - if (e === path_1.default.dirname(e)) { - return this.parentProject.getProjectDir() - } - } - ``` + 1. 解决方案：打开 deveco 安装路径 D:\DevEco Studio\tools\hvigor\hvigor-ohos-plugin\src\model\module 下的 core-module-model-impl.js，修改 findBelongProjectPath 方法（需要管理员权限，可另存为后替换）。 + ``` + findBelongProjectPath(e) { + if (e === path_1.default.dirname(e)) { + return this.parentProject.getProjectDir() + } + } + ``` 2. 报错信息: ``` # hvigor ERROR: Cannot find belonging project path for module at D:\. @@ -259,8 +256,8 @@ Flutter SDK 仓库 ``` 14. 在.ohos的项目执行`flutter clean` 报错，然后再执行`flutter pub get`也报错。 - 1. 解决方案：删除.ohos文件夹，重新flutter pub get 即可 - 2.报错信息： + 1. 解决方案：删除.ohos文件夹，重新flutter pub get 即可。 + 2. 报错信息： ``` Oops; flutter has exited unexpectedly: "PathNotFoundException: Cannot open file, path = 'D:\code\.ohos\build-profile.json5' (OS Error: 系统找不到指定的文件。，error = 2)". A crash report has been written to D:\code\flutter_01.log. diff --git a/app_build/.gitignore b/app_build/.gitignore index a43bd6fdf33d4a44861805c5c23884b8f6a07cb5..4e5ab5126b32fdd43b4c015cf9dc24ec9aaa20c0 100644 --- a/app_build/.gitignore +++ b/app_build/.gitignore @@ -1,15 +1,3 @@ -# 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. debug_out release_out diff --git a/app_build/__init__.py b/app_build/__init__.py index 8a0d2b732fd4262728df4467a0c9aac5504dcda8..5513928de6a1f0e843b7302b2f7edb84bfcc4b8f 100644 --- a/app_build/__init__.py +++ b/app_build/__init__.py @@ -1,12 +1,3 @@ -# 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. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. diff --git a/app_build/build_dill.py b/app_build/build_dill.py index a26e6cfaea05cf77540a7dfcfd8a7c774b1b5479..24af312de320ed28e6eed5180eecc79f42e7dde4 100644 --- a/app_build/build_dill.py +++ b/app_build/build_dill.py @@ -1,15 +1,6 @@ -# 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. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import excute_util diff --git a/app_build/config.py b/app_build/config.py index 322241ac8b977f39f4725579c8057b414c02a2d7..2c4a3661366a6b9900086277770783cf252a7480 100644 --- a/app_build/config.py +++ b/app_build/config.py @@ -1,15 +1,6 @@ -# 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. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import sys diff --git a/app_build/debug.py b/app_build/debug.py index 350ae37213fb6df12b65084c02762d092514909d..66db44c7cd37a4939095ea8dd3bb9ef018021f9a 100644 --- a/app_build/debug.py +++ b/app_build/debug.py @@ -1,15 +1,6 @@ -# 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. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import file_util diff --git a/app_build/env_util.py b/app_build/env_util.py index 8fbc139d88828ee3a9f7c2f2e53a709da7b5015a..0a62ad92d1b0e1e420aa1d739643c09627cdaa88 100644 --- a/app_build/env_util.py +++ b/app_build/env_util.py @@ -1,15 +1,6 @@ -# 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. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import os diff --git a/app_build/excute_util.py b/app_build/excute_util.py index 6dbd2898334f64fb1a7276261ed10ee8f0d64160..f2221de74b7cf5f25ba9f59aa681cce58d9073db 100644 --- a/app_build/excute_util.py +++ b/app_build/excute_util.py @@ -1,15 +1,6 @@ -# 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. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. import subprocess from datetime import datetime diff --git a/app_build/file_util.py b/app_build/file_util.py index 0189665f0657a9a43d5f70d1b3c04c3cb41e19a4..d51a82478b5500f2f3c00a7df2c0363e5ec0521b 100644 --- a/app_build/file_util.py +++ b/app_build/file_util.py @@ -1,15 +1,6 @@ -# 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. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import shutil diff --git a/app_build/release.py b/app_build/release.py index 62427c3eee1d6315993686e2e84a8c4bb84b56a2..6241064c3cfec327940661304c7c70fee626186f 100644 --- a/app_build/release.py +++ b/app_build/release.py @@ -1,15 +1,6 @@ -# 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. +# Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE_KHZG file. #!/usr/bin/python import config diff --git a/bin/internal/engine.ohos.version b/bin/internal/engine.ohos.version index f08b3e435ed18e71dcf587ecac314be24dd103fb..5cbc1885ab6bb8c9364d1103ae047972d37e7792 100644 --- a/bin/internal/engine.ohos.version +++ b/bin/internal/engine.ohos.version @@ -1 +1 @@ -e10bd6ac40602bd7b2410561b71c035a5cf7c931 +a9e521ff880033ab7bfecc6903da552483a506e1 \ No newline at end of file diff --git a/bin/internal/shared.bat b/bin/internal/shared.bat index 26fea942199a60517e4f448257e946d794cf5bb9..8f1e38b0e126e1dc5a32976644ede7b2dcc060ca 100644 --- a/bin/internal/shared.bat +++ b/bin/internal/shared.bat @@ -21,7 +21,7 @@ SET stamp_path=%cache_dir%\flutter_tools.stamp SET script_path=%flutter_tools_dir%\bin\flutter_tools.dart SET dart_sdk_path=%cache_dir%\dart-sdk SET engine_stamp=%cache_dir%\engine-dart-sdk.stamp -SET engine_version_path=%FLUTTER_ROOT%\bin\internal\engine.version +SET engine_version_path=%FLUTTER_ROOT%\bin\internal\engine.ohos.version SET pub_cache_path=%FLUTTER_ROOT%\.pub-cache SET dart=%dart_sdk_path%\bin\dart.exe diff --git a/bin/internal/update_dart_sdk.ps1 b/bin/internal/update_dart_sdk.ps1 index f4e2e77a55886435e4fe753a93913ab589f9ba06..ebca4a4b02e93f85b03ef3dfe49ce2e24c377c9c 100644 --- a/bin/internal/update_dart_sdk.ps1 +++ b/bin/internal/update_dart_sdk.ps1 @@ -19,7 +19,9 @@ $flutterRoot = (Get-Item $progName).parent.parent.FullName $cachePath = "$flutterRoot\bin\cache" $dartSdkPath = "$cachePath\dart-sdk" $engineStamp = "$cachePath\engine-dart-sdk.stamp" -$engineVersion = (Get-Content "$flutterRoot\bin\internal\engine.version") +$engineVersionFile = "engine.ohos.version" + +$engineVersion = (Get-Content "$flutterRoot\bin\internal\$engineVersionFile") $oldDartSdkPrefix = "dart-sdk.old" @@ -38,13 +40,30 @@ if ((Test-Path $engineStamp) -and ($engineVersion -eq (Get-Content $engineStamp) return } -$dartSdkBaseUrl = $Env:FLUTTER_STORAGE_BASE_URL +$dartSdkBaseUrl = $Env:FLUTTER_OHOS_STORAGE_BASE_URL if (-not $dartSdkBaseUrl) { - $dartSdkBaseUrl = "https://storage.googleapis.com" + $dartSdkBaseUrl = "https://flutter-ohos.obs.cn-south-1.myhuaweicloud.com" +} +if($Env:FLUTTER_OHOS_STORAGE_BASE_URL) { + $dartSdkBaseUrl = $Env:FLUTTER_OHOS_STORAGE_BASE_URL +} +# It's important to use the native Dart SDK as the default target architecture +# for Flutter Windows builds depend on the Dart executable's architecture. +$dartZipNameX64 = "dart-sdk-windows-x64.zip" +$dartZipNameArm64 = "dart-sdk-windows-arm64.zip" +$dartZipName = $dartZipNameX64 +if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") { + $dartSdkArm64Url = "$dartSdkBaseUrl/flutter_infra_release/flutter/$engineVersion/$dartZipNameArm64" + Try { + Invoke-WebRequest -Uri $dartSdkArm64Url -UseBasicParsing -Method Head | Out-Null + $dartZipName = $dartZipNameArm64 + } + Catch { + Write-Host "The current channel's Dart SDK does not support Windows Arm64, falling back to Windows x64..." + } } -$dartZipName = "dart-sdk-windows-x64.zip" $dartSdkUrl = "$dartSdkBaseUrl/flutter_infra_release/flutter/$engineVersion/$dartZipName" - +Write-Host "dart-sdk-url: $dartSdkUrl" if (Test-Path $dartSdkPath) { # Move old SDK to a new location instead of deleting it in case it is still in use (e.g. by IntelliJ). $oldDartSdkSuffix = 1 diff --git a/bin/internal/update_dart_sdk.sh b/bin/internal/update_dart_sdk.sh index 49e4698a824ec24d0fc85963b32ef468ebd635b0..2224a8f9e139ed8171c3439f72debb8fc6a224c5 100755 --- a/bin/internal/update_dart_sdk.sh +++ b/bin/internal/update_dart_sdk.sh @@ -16,10 +16,13 @@ set -e FLUTTER_ROOT="$(dirname "$(dirname "$(dirname "${BASH_SOURCE[0]}")")")" +ENGINE_VERSION_FILE="engine.ohos.version" +FLUTTER_OHOS_STORAGE_BASE_URL=${FLUTTER_OHOS_STORAGE_BASE_URL:-https://flutter-ohos.obs.cn-south-1.myhuaweicloud.com} + DART_SDK_PATH="$FLUTTER_ROOT/bin/cache/dart-sdk" DART_SDK_PATH_OLD="$DART_SDK_PATH.old" ENGINE_STAMP="$FLUTTER_ROOT/bin/cache/engine-dart-sdk.stamp" -ENGINE_VERSION=`cat "$FLUTTER_ROOT/bin/internal/engine.version"` +ENGINE_VERSION=$(cat "$FLUTTER_ROOT/bin/internal/$ENGINE_VERSION_FILE") OS="$(uname -s)" if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; then @@ -121,9 +124,10 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t FIND=find fi - DART_SDK_BASE_URL="${FLUTTER_STORAGE_BASE_URL:-https://storage.googleapis.com}" + DART_SDK_BASE_URL="${FLUTTER_OHOS_STORAGE_BASE_URL:-https://storage.googleapis.com}" DART_SDK_URL="$DART_SDK_BASE_URL/flutter_infra_release/flutter/$ENGINE_VERSION/$DART_ZIP_NAME" + echo 'dart-sdk-url:' $DART_SDK_URL # if the sdk path exists, copy it to a temporary location if [ -d "$DART_SDK_PATH" ]; then rm -rf "$DART_SDK_PATH_OLD" diff --git a/dev/benchmarks/complex_layout/ohos/build-profile.json5 b/dev/benchmarks/complex_layout/ohos/build-profile.json5 index 7ceb22efeed38e0b25be0cfd650fe207601f3f98..8938b90e0f88570574f7f041cb62ba7a05a99cbe 100644 --- a/dev/benchmarks/complex_layout/ohos/build-profile.json5 +++ b/dev/benchmarks/complex_layout/ohos/build-profile.json5 @@ -1,18 +1,3 @@ -/* -* 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. -*/ - { "app": { "signingConfigs": [], diff --git a/dev/benchmarks/complex_layout/ohos/entry/build-profile.json5 b/dev/benchmarks/complex_layout/ohos/entry/build-profile.json5 index 633d360fbc91a3186a23b66ab71b27e5618944cb..6de31ee2243926392c90c572c00a052f7c3fa9e9 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/build-profile.json5 +++ b/dev/benchmarks/complex_layout/ohos/entry/build-profile.json5 @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "apiType": 'stageMode', diff --git a/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts b/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts index 894fc15c6b793f085e6c8506e43d719af658e8ff..bcd2cf7dc3f09ff7395b6c4a28ebf853b202b47f 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts +++ b/dev/benchmarks/complex_layout/ohos/entry/hvigorfile.ts @@ -1,17 +1,4 @@ -/* -* 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. -*/ + // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. export { hapTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/oh-package.json5 b/dev/benchmarks/complex_layout/ohos/entry/oh-package.json5 index dabaee13151003854589516fcfb20ccd29c44b6b..80aa77e3db589d937f763c963eed4b07aaa6bc0f 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/oh-package.json5 +++ b/dev/benchmarks/complex_layout/ohos/entry/oh-package.json5 @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "name": "entry", diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets index 8bc48be8773196f34cccb15cf517f87f5c6b94d2..f85a65508a6140721404097998b77be622c93d5d 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -1,17 +1,3 @@ -/* -* 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 { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets index 1125f9fdd95f4310a182c1c9e3680f37f73686c9..f888d06192a925ff7898e3c71bf606566cf48dbe 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/main/ets/pages/Index.ets @@ -1,17 +1,4 @@ -/* -* 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 { FlutterPage } from '@ohos/flutter_ohos' diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/main/module.json5 b/dev/benchmarks/complex_layout/ohos/entry/src/main/module.json5 index 7bbf78b18f39991b1404061c7437538c7d532bb7..5bd7950ba5343abd89b475921bca8bbbacd3629c 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/main/module.json5 +++ b/dev/benchmarks/complex_layout/ohos/entry/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "module": { "name": "entry", diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/Ability.test.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/Ability.test.ets index 25d4c71ff3cd584f5d64f6f8c0ac864928c234c4..8abf7f2f44c0e56110df8c09b2524a4ca37bc993 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,18 +1,3 @@ -/* -* 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 hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/List.test.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/List.test.ets index f4140030e65d20df6af30a6bf51e464dea8f8aa6..d766fe249dfc3ada636f27e64d9b64451ce32c93 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/List.test.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/test/List.test.ets @@ -1,18 +1,3 @@ -/* -* 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 abilityTest from './Ability.test' export default function testsuite() { diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets index 4ca645e6013cfce8e7dbb728313cb8840c4da660..42fcf69c986ba971f56b56f4b568aacf06ef298e 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,17 +1,3 @@ -/* -* 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 UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index cef0447cd2f137ef82d223ead2e156808878ab90..6466fb9197899170b34d93bae6e253a1a40c2fb6 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,17 +1,3 @@ -/* -* 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 hilog from '@ohos.hilog'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 1def08f2e9dcbfa3454a07b7a3b82b173bb90d02..47fc89b4f05bf2efc6e863b8c2569705a4c56fd9 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,17 +1,3 @@ -/* -* 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 hilog from '@ohos.hilog'; import TestRunner from '@ohos.application.testRunner'; diff --git a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/module.json5 b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/module.json5 index fab77ce2e0c61e3ad010bab5b27ccbd15f9a8c96..e29411f46a136a52a32edee668aa58201ff6d607 100644 --- a/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/module.json5 +++ b/dev/benchmarks/complex_layout/ohos/entry/src/ohosTest/module.json5 @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "module": { diff --git a/dev/benchmarks/complex_layout/ohos/hvigor/hvigor-config.json5 b/dev/benchmarks/complex_layout/ohos/hvigor/hvigor-config.json5 index 541ba35711b75986f9295410ee38fdb8f2572878..e7b855ac20e294c76e70350654c16da224ff03b2 100644 --- a/dev/benchmarks/complex_layout/ohos/hvigor/hvigor-config.json5 +++ b/dev/benchmarks/complex_layout/ohos/hvigor/hvigor-config.json5 @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "modelVersion": "5.0.0", diff --git a/dev/benchmarks/complex_layout/ohos/hvigorfile.ts b/dev/benchmarks/complex_layout/ohos/hvigorfile.ts index 8f2d2aafe6d6a3a71a9944ebd0c91fbc308ac9d1..76cbff657f0ae6b274ddbbd0a938ce86226606d2 100644 --- a/dev/benchmarks/complex_layout/ohos/hvigorfile.ts +++ b/dev/benchmarks/complex_layout/ohos/hvigorfile.ts @@ -1,17 +1,4 @@ -/* -* 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 { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/dev/benchmarks/complex_layout/ohos/oh-package.json5 b/dev/benchmarks/complex_layout/ohos/oh-package.json5 index 0547594c0d9fe2de363a80af708744809205c3d1..d0d5dd2e6f43b17cc04ad8924c74e32dbce4763a 100644 --- a/dev/benchmarks/complex_layout/ohos/oh-package.json5 +++ b/dev/benchmarks/complex_layout/ohos/oh-package.json5 @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "modelVersion": "5.0.0", diff --git a/dev/benchmarks/macrobenchmarks/ohos/build-profile.json5 b/dev/benchmarks/macrobenchmarks/ohos/build-profile.json5 index 5fcb3dc466ec0efe97a15ac93a397ddcc0ec6c56..e7ef02284e3ac5e0e0b641abd16dc79436d3e596 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/build-profile.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/build-profile.json5 @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "app": { diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/build-profile.json5 b/dev/benchmarks/macrobenchmarks/ohos/entry/build-profile.json5 index 633d360fbc91a3186a23b66ab71b27e5618944cb..11a8dca6f9a51bac8daa912bab79b35c7be848a2 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/build-profile.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/build-profile.json5 @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "apiType": 'stageMode', diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts b/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts index 894fc15c6b793f085e6c8506e43d719af658e8ff..bcd2cf7dc3f09ff7395b6c4a28ebf853b202b47f 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/hvigorfile.ts @@ -1,17 +1,4 @@ -/* -* 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. -*/ + // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. export { hapTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/oh-package.json5 b/dev/benchmarks/macrobenchmarks/ohos/entry/oh-package.json5 index dabaee13151003854589516fcfb20ccd29c44b6b..ecce1057f9598ebd83b18f6772f24e3c6324291c 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/oh-package.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/oh-package.json5 @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "name": "entry", diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets index 8bc48be8773196f34cccb15cf517f87f5c6b94d2..efc4c75dafc527c923eb3e9f3ae105ad1dd6aadc 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -1,17 +1,4 @@ -/* -* 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 { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets index 1125f9fdd95f4310a182c1c9e3680f37f73686c9..f888d06192a925ff7898e3c71bf606566cf48dbe 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/ets/pages/Index.ets @@ -1,17 +1,4 @@ -/* -* 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 { FlutterPage } from '@ohos/flutter_ohos' diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/module.json5 b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/module.json5 index 7bbf78b18f39991b1404061c7437538c7d532bb7..5bd7950ba5343abd89b475921bca8bbbacd3629c 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/module.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "module": { "name": "entry", diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/Ability.test.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/Ability.test.ets index 25d4c71ff3cd584f5d64f6f8c0ac864928c234c4..fefeb6ea18753265ef72446ee9309e0a15835e66 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,17 +1,3 @@ -/* -* 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 hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/List.test.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/List.test.ets index f4140030e65d20df6af30a6bf51e464dea8f8aa6..348ab4ea9ee3e33ad3709db8258ddca670c65563 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/List.test.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/test/List.test.ets @@ -1,17 +1,3 @@ -/* -* 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 abilityTest from './Ability.test' diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets index 4ca645e6013cfce8e7dbb728313cb8840c4da660..42fcf69c986ba971f56b56f4b568aacf06ef298e 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,17 +1,3 @@ -/* -* 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 UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index cef0447cd2f137ef82d223ead2e156808878ab90..545843d3949e383b7bdd6ebbf5681d28c3e6ef71 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,17 +1,4 @@ -/* -* 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 hilog from '@ohos.hilog'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 1def08f2e9dcbfa3454a07b7a3b82b173bb90d02..47fc89b4f05bf2efc6e863b8c2569705a4c56fd9 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,17 +1,3 @@ -/* -* 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 hilog from '@ohos.hilog'; import TestRunner from '@ohos.application.testRunner'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/module.json5 b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/module.json5 index fab77ce2e0c61e3ad010bab5b27ccbd15f9a8c96..e29411f46a136a52a32edee668aa58201ff6d607 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/module.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/entry/src/ohosTest/module.json5 @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "module": { diff --git a/dev/benchmarks/macrobenchmarks/ohos/hvigor/hvigor-config.json5 b/dev/benchmarks/macrobenchmarks/ohos/hvigor/hvigor-config.json5 index 541ba35711b75986f9295410ee38fdb8f2572878..0e35b0d60fe1513bad527182753ef509ea321783 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/hvigor/hvigor-config.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/hvigor/hvigor-config.json5 @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "modelVersion": "5.0.0", diff --git a/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts b/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts index 8f2d2aafe6d6a3a71a9944ebd0c91fbc308ac9d1..76cbff657f0ae6b274ddbbd0a938ce86226606d2 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts +++ b/dev/benchmarks/macrobenchmarks/ohos/hvigorfile.ts @@ -1,17 +1,4 @@ -/* -* 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 { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/dev/benchmarks/macrobenchmarks/ohos/oh-package.json5 b/dev/benchmarks/macrobenchmarks/ohos/oh-package.json5 index c640999ec2753fcc36c68f3ac72342b35278a71d..c341a8f271c4043cde0fc151ed6d6a66dd267e91 100644 --- a/dev/benchmarks/macrobenchmarks/ohos/oh-package.json5 +++ b/dev/benchmarks/macrobenchmarks/ohos/oh-package.json5 @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "modelVersion": "5.0.0", diff --git a/packages/flutter/lib/src/scheduler/binding.dart b/packages/flutter/lib/src/scheduler/binding.dart index 8820c7cf04121dfa94735ade14ca78d47f0ce35e..919da31e7802aceaac81cbef16b62723d0a89ea0 100644 --- a/packages/flutter/lib/src/scheduler/binding.dart +++ b/packages/flutter/lib/src/scheduler/binding.dart @@ -9,6 +9,7 @@ import 'dart:ui' show AppLifecycleState, DartPerformanceMode, FramePhase, FrameT import 'package:collection/collection.dart' show HeapPriorityQueue, PriorityQueue; import 'package:flutter/foundation.dart'; +import 'package:flutter/services.dart'; import 'debug.dart'; import 'priority.dart'; @@ -1310,6 +1311,12 @@ mixin SchedulerBinding on BindingBase { return true; }()); } + + void setDVsyncSwitch(bool isEnable) { + if (defaultTargetPlatform == TargetPlatform.ohos) { + SystemChannels.nativeVsync.send({"isEnable": isEnable}); + } + } } /// The default [SchedulingStrategy] for [SchedulerBinding.schedulingStrategy]. diff --git a/packages/flutter/lib/src/services/raw_keyboard_ohos.dart b/packages/flutter/lib/src/services/raw_keyboard_ohos.dart index b54201d0a626235b6285b1b578c0bbb50932dd18..9c6ff843a365ccb5a55b8ff32ab8e019c9f18ab0 100644 --- a/packages/flutter/lib/src/services/raw_keyboard_ohos.dart +++ b/packages/flutter/lib/src/services/raw_keyboard_ohos.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2024 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. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import 'keyboard_maps.g.dart'; diff --git a/packages/flutter/lib/src/services/system_channels.dart b/packages/flutter/lib/src/services/system_channels.dart index c69c7e5e77d026093d5b27d5ae9efcd05b6a7195..13531d3fb1a4298dbe7f5badd37fdd216015b42f 100644 --- a/packages/flutter/lib/src/services/system_channels.dart +++ b/packages/flutter/lib/src/services/system_channels.dart @@ -465,4 +465,9 @@ class SystemChannels { /// /// * [DefaultPlatformMenuDelegate], which uses this channel. static const MethodChannel menu = OptionalMethodChannel('flutter/menu'); + + static const BasicMessageChannel nativeVsync = BasicMessageChannel( + 'flutter/nativevsync', + StandardMessageCodec(), + ); } diff --git a/packages/flutter/lib/src/widgets/scroll_position.dart b/packages/flutter/lib/src/widgets/scroll_position.dart index db363517c3725f43296b0b9f76c3efe738020c20..ca5f56e47691a404b3dd888803b6198c0273b9f3 100644 --- a/packages/flutter/lib/src/widgets/scroll_position.dart +++ b/packages/flutter/lib/src/widgets/scroll_position.dart @@ -9,6 +9,7 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/physics.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/scheduler.dart'; +import 'package:flutter/services.dart'; import 'basic.dart'; import 'framework.dart'; @@ -904,6 +905,21 @@ abstract class ScrollPosition extends ViewportOffset with ScrollMetrics { /// Called by [beginActivity] to report when an activity has started. void didStartScroll() { + switch (defaultTargetPlatform) { + case TargetPlatform.android: + case TargetPlatform.fuchsia: + case TargetPlatform.linux: + case TargetPlatform.windows: + case TargetPlatform.iOS: + case TargetPlatform.macOS: + break; + case TargetPlatform.ohos: + SystemChannels.platform.invokeMethod( + 'Scroll.Activity', + 'start', + ); + break; + } activity!.dispatchScrollStartNotification(copyWith(), context.notificationContext); } @@ -916,11 +932,27 @@ abstract class ScrollPosition extends ViewportOffset with ScrollMetrics { /// /// This also saves the scroll offset using [saveScrollOffset]. void didEndScroll() { + SchedulerBinding.instance.setDVsyncSwitch(false); activity!.dispatchScrollEndNotification(copyWith(), context.notificationContext!); saveOffset(); if (keepScrollOffset) { saveScrollOffset(); } + switch (defaultTargetPlatform) { + case TargetPlatform.android: + case TargetPlatform.fuchsia: + case TargetPlatform.linux: + case TargetPlatform.windows: + case TargetPlatform.iOS: + case TargetPlatform.macOS: + break; + case TargetPlatform.ohos: + SystemChannels.platform.invokeMethod( + 'Scroll.Activity', + 'end', + ); + break; + } } /// Called by [setPixels] to report overscroll when an attempt is made to diff --git a/packages/flutter/lib/src/widgets/scrollable.dart b/packages/flutter/lib/src/widgets/scrollable.dart index 158228c23a7e22304b690e6cdba16e5efcebcade..1415fc363ea1907bf7fcd690fabc99a2b496f039 100644 --- a/packages/flutter/lib/src/widgets/scrollable.dart +++ b/packages/flutter/lib/src/widgets/scrollable.dart @@ -709,6 +709,7 @@ class ScrollableState extends State with TickerProviderStateMixin, R // triggers a new activity to begin. assert(_drag == null); _drag = position.drag(details, _disposeDrag); + SchedulerBinding.instance.setDVsyncSwitch(false); assert(_drag != null); assert(_hold == null); } @@ -723,6 +724,7 @@ class ScrollableState extends State with TickerProviderStateMixin, R // _drag might be null if the drag activity ended and called _disposeDrag. assert(_hold == null || _drag == null); _drag?.end(details); + SchedulerBinding.instance.setDVsyncSwitch(true); assert(_drag == null); } diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart index c99e24cd5f8378f88064585295ce2f0994fe712b..78e827ae3f7a6494a22be6dd86e5e2ecfefeb237 100644 --- a/packages/flutter_tools/lib/src/artifacts.dart +++ b/packages/flutter_tools/lib/src/artifacts.dart @@ -646,6 +646,9 @@ class CachedArtifacts implements Artifacts { assert(platform != null); switch (artifact) { case Artifact.genSnapshot: + if (platform == TargetPlatform.ohos_arm64) { + return _getAndroidArtifactPath(artifact, TargetPlatform.ohos_arm64, mode!); + } // For script snapshots any gen_snapshot binary will do. Returning gen_snapshot for // android_arm in profile mode because it is available on all supported host platforms. return _getAndroidArtifactPath(artifact, TargetPlatform.android_arm, BuildMode.profile); diff --git a/packages/flutter_tools/lib/src/build_system/targets/ohos.dart b/packages/flutter_tools/lib/src/build_system/targets/ohos.dart index ae8a9bd47d9b9ffd909a2e3434df06155ab86dce..8667a262e2009c475f9f6db6407de3ad1616dbb0 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/ohos.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/ohos.dart @@ -1,16 +1,8 @@ /* -* 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 +* Copyright 2014 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. * -* 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 'package:file/file.dart'; diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart index 0102b3ea083b926d688036977f31a8b7f7031c5f..7f5e804a34f2d4fa541ff19a668ad94fc0a2d6c7 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart @@ -22,6 +22,7 @@ import 'base/user_messages.dart'; import 'build_info.dart'; import 'convert.dart'; import 'features.dart'; +import 'globals.dart'; const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo) const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo) @@ -893,6 +894,7 @@ abstract class EngineCachedArtifact extends CachedArtifact { List getPackageDirs(); String get storageBaseUrl => cache.storageBaseUrl; + String get ohosStorageBaseUrl => cache.ohosStorageBaseUrl; @override bool isUpToDateInner(FileSystem fileSystem) { @@ -927,21 +929,30 @@ abstract class EngineCachedArtifact extends CachedArtifact { OperatingSystemUtils operatingSystemUtils, ) async { final String url = '$storageBaseUrl/flutter_infra_release/flutter/$version/'; - + final String ohosEngineVersion = cache.getVersionFor('engine.ohos')!; + // New platform Ohos is supported, so flutter needs to download + // sky_engine.zip, flutter_patched_sdk.zip and flutter_patched_sdk_product.zip from ohos URL + final String ohosUrl = '$ohosStorageBaseUrl/flutter_infra_release/flutter/$ohosEngineVersion/'; final Directory pkgDir = cache.getCacheDir('pkg'); for (final String pkgName in getPackageDirs()) { - await artifactUpdater.downloadZipArchive('Downloading package $pkgName...', Uri.parse('$url$pkgName.zip'), pkgDir); + if (pkgName == 'sky_engine') { + await artifactUpdater.downloadZipArchive('Downloading package $pkgName...', Uri.parse('$ohosUrl$pkgName.zip'), pkgDir); + } else { + await artifactUpdater.downloadZipArchive('Downloading package $pkgName...', Uri.parse('$url$pkgName.zip'), pkgDir); + } } for (final List toolsDir in getBinaryDirs()) { final String cacheDir = toolsDir[0]; final String urlPath = toolsDir[1]; final Directory dir = fileSystem.directory(fileSystem.path.join(location.path, cacheDir)); - // Avoid printing things like 'Downloading linux-x64 tools...' multiple times. final String friendlyName = urlPath.replaceAll('/artifacts.zip', '').replaceAll('.zip', ''); - await artifactUpdater.downloadZipArchive('Downloading $friendlyName tools...', Uri.parse(url + urlPath), dir); - + if (urlPath.startsWith('flutter_patched_sdk')) { + await artifactUpdater.downloadZipArchive('Downloading $friendlyName tools...', Uri.parse(ohosUrl + urlPath), dir); + } else { + await artifactUpdater.downloadZipArchive('Downloading $friendlyName tools...', Uri.parse(url + urlPath), dir); + } _makeFilesExecutable(dir, operatingSystemUtils); final File frameworkZip = fileSystem.file(fileSystem.path.join(dir.path, 'FlutterMacOS.framework.zip')); diff --git a/packages/flutter_tools/lib/src/commands/build_app.dart b/packages/flutter_tools/lib/src/commands/build_app.dart index b5923bfbd9d998f49383c80fd4f2107e558aeb52..6b2df6dea54546b8c894ffed630a3379fb3a5ef4 100644 --- a/packages/flutter_tools/lib/src/commands/build_app.dart +++ b/packages/flutter_tools/lib/src/commands/build_app.dart @@ -1,16 +1,7 @@ /* -* Copyright (c) 2024 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. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import '../build_info.dart'; diff --git a/packages/flutter_tools/lib/src/commands/build_hap.dart b/packages/flutter_tools/lib/src/commands/build_hap.dart index 4adc519d22b0cbd371841d21c5aa3f2733685af8..20c3aa30742ccde6cbc0874927bfba229aca63dc 100644 --- a/packages/flutter_tools/lib/src/commands/build_hap.dart +++ b/packages/flutter_tools/lib/src/commands/build_hap.dart @@ -1,16 +1,7 @@ /* -* 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. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import '../build_info.dart'; diff --git a/packages/flutter_tools/lib/src/commands/build_har.dart b/packages/flutter_tools/lib/src/commands/build_har.dart index 0edbc0fc80ca32e95bbd963eee5101241417d1cd..5e9a90dbba8c4213bdae4c7456f831c3f21f450d 100644 --- a/packages/flutter_tools/lib/src/commands/build_har.dart +++ b/packages/flutter_tools/lib/src/commands/build_har.dart @@ -1,16 +1,7 @@ /* -* 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. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import '../build_info.dart'; diff --git a/packages/flutter_tools/lib/src/commands/build_hsp.dart b/packages/flutter_tools/lib/src/commands/build_hsp.dart index 9b8137409e3ebe3a875ed5d5340fe6a7787b0e5d..f68f1aeb751ab92bfe918f7012874dc7d2ac2c09 100644 --- a/packages/flutter_tools/lib/src/commands/build_hsp.dart +++ b/packages/flutter_tools/lib/src/commands/build_hsp.dart @@ -1,16 +1,7 @@ /* -* 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. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import '../build_info.dart'; diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart index 7822ffbe9b4daf3879bb32b1702d455f5cfc0ec5..e71d8059010b07806f2c32ca156926d7915f4aad 100644 --- a/packages/flutter_tools/lib/src/flutter_cache.dart +++ b/packages/flutter_tools/lib/src/flutter_cache.dart @@ -1021,25 +1021,31 @@ const List> _androidBinaryDirs = >[ const List> _osxBinaryDirsForOhos = >[ ['ohos-arm64-profile/darwin-x64', 'ohos-arm64-profile/darwin-x64.zip'], ['ohos-arm64-release/darwin-x64', 'ohos-arm64-release/darwin-x64.zip'], + ['ohos-x64-profile/darwin-x64', 'ohos-x64-profile/darwin-x64.zip'], + ['ohos-x64-release/darwin-x64', 'ohos-x64-release/darwin-x64.zip'], ]; const List> _linuxBinaryDirsForOhos = >[ ['ohos-arm64-profile/linux-x64', 'ohos-arm64-profile/linux-x64.zip'], ['ohos-arm64-release/linux-x64', 'ohos-arm64-release/linux-x64.zip'], + ['ohos-x64-profile/linux-x64', 'ohos-x64-profile/linux-x64.zip'], + ['ohos-x64-release/linux-x64', 'ohos-x64-release/linux-x64.zip'], ]; const List> _windowsBinaryDirsForOhos = >[ ['ohos-arm64-profile/windows-x64', 'ohos-arm64-profile/windows-x64.zip'], ['ohos-arm64-release/windows-x64', 'ohos-arm64-release/windows-x64.zip'], + ['ohos-x64-profile/windows-x64', 'ohos-x64-profile/windows-x64.zip'], + ['ohos-x64-release/windows-x64', 'ohos-x64-release/windows-x64.zip'], ]; const List> _ohosBinaryDirs = >[ ['ohos-arm64', 'ohos-arm64/artifacts.zip'], ['ohos-arm64-profile', 'ohos-arm64-profile/artifacts.zip'], ['ohos-arm64-release', 'ohos-arm64-release/artifacts.zip'], - // ['ohos-x64', 'ohos-x64/artifacts.zip'], - // ['ohos-x64-profile', 'ohos-x64-profile/artifacts.zip'], - // ['ohos-x64-release', 'ohos-x64-release/artifacts.zip'], + ['ohos-x64', 'ohos-x64/artifacts.zip'], + ['ohos-x64-profile', 'ohos-x64-profile/artifacts.zip'], + ['ohos-x64-release', 'ohos-x64-release/artifacts.zip'], ]; const List> _dartSdks = > [ diff --git a/packages/flutter_tools/lib/src/ohos/application_package.dart b/packages/flutter_tools/lib/src/ohos/application_package.dart index c2e2ab987a198d7d6f454d499387f90044f6c41e..6cb1cd48e5536ce6bf282b3c74d781da9438162e 100644 --- a/packages/flutter_tools/lib/src/ohos/application_package.dart +++ b/packages/flutter_tools/lib/src/ohos/application_package.dart @@ -1,16 +1,8 @@ /* -* 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 +* Copyright 2014 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. * -* 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 'package:json5/json5.dart'; diff --git a/packages/flutter_tools/lib/src/ohos/build_env.dart b/packages/flutter_tools/lib/src/ohos/build_env.dart index e38dc143cd884a8ca1f6047eca54ec2cc782c850..b5b07e5af02c35dc532c2c46d92ac09d8cca3ed2 100644 --- a/packages/flutter_tools/lib/src/ohos/build_env.dart +++ b/packages/flutter_tools/lib/src/ohos/build_env.dart @@ -1,16 +1,7 @@ /* -* 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. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ diff --git a/packages/flutter_tools/lib/src/ohos/hdc_server.dart b/packages/flutter_tools/lib/src/ohos/hdc_server.dart index 5748f09e086b0982d3f755701f93ab5f1e8cb997..55699075123056175e522a254bc375f1f1fddbc4 100644 --- a/packages/flutter_tools/lib/src/ohos/hdc_server.dart +++ b/packages/flutter_tools/lib/src/ohos/hdc_server.dart @@ -1,16 +1,7 @@ /* -* 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. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import 'dart:io'; diff --git a/packages/flutter_tools/lib/src/ohos/hvigor.dart b/packages/flutter_tools/lib/src/ohos/hvigor.dart index bd03033053e012aae22c1a453be639fc332e6d2d..e184ea49a97d16be0be54fa89a69bd59ed8a5c4b 100644 --- a/packages/flutter_tools/lib/src/ohos/hvigor.dart +++ b/packages/flutter_tools/lib/src/ohos/hvigor.dart @@ -1,16 +1,7 @@ /* -* 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. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import 'dart:convert'; @@ -390,9 +381,16 @@ void cleanAndCopyFlutterAsset( ensureParentExists(desAppSoPath); appSoFile.copySync(desAppSoPath); } else { - final File appSo = globals.fs.file(desAppSoPath); - if (appSo.existsSync()) { - appSo.deleteSync(); + // delete libapp.so + final String dir = globals.fs.path.join(ohosProject.flutterModuleDirectory.path, 'libs'); + if (globals.fs.directory(dir).existsSync()) { + final List files = globals.fs.directory(dir) + .listSync(recursive: true); + for (final FileSystemEntity item in files) { + if (item.basename == APP_SO && item.existsSync()) { + item.deleteSync(); + } + } } } logger?.printTrace('copy flutter assets to project end'); diff --git a/packages/flutter_tools/lib/src/ohos/hvigor_utils.dart b/packages/flutter_tools/lib/src/ohos/hvigor_utils.dart index ea3fa101aff10e4c421bfe19093d6487981d2206..af2a670ff0a0233c1c55605d6427d0c98817fb4f 100644 --- a/packages/flutter_tools/lib/src/ohos/hvigor_utils.dart +++ b/packages/flutter_tools/lib/src/ohos/hvigor_utils.dart @@ -1,16 +1,7 @@ /* -* 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. +* Copyright (c) 2023 Hunan OpenValley Digital Industry Development Co., Ltd. All rights reserved. +* Use of this source code is governed by a BSD-style license that can be +* found in the LICENSE_KHZG file. */ import 'dart:convert'; diff --git a/packages/flutter_tools/lib/src/ohos/ohos_builder.dart b/packages/flutter_tools/lib/src/ohos/ohos_builder.dart index 0e36e5036de3f871ebff12f5dff56cdecf317258..21f8d6adb742184e043a48c10cad6be553a9501d 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_builder.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_builder.dart @@ -1,16 +1,8 @@ /* -* 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 +* Copyright 2014 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. * -* 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 '../base/context.dart'; diff --git a/packages/flutter_tools/lib/src/ohos/ohos_device.dart b/packages/flutter_tools/lib/src/ohos/ohos_device.dart index 14c90a39d2fd523284a79d4dae34f360dfa653b4..f450b4fd987cc717defee41726290ad94ea0502d 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_device.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_device.dart @@ -1,16 +1,8 @@ /* -* 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 +* Copyright 2014 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. * -* 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 'dart:async'; diff --git a/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart b/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart index a410af1f48b01635ac4baf54eefba4585835bf67..a700dc448e0482e2a9afc45ba331d60c1b7878d3 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_device_discovery.dart @@ -1,16 +1,8 @@ /* -* 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 +* Copyright 2014 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. * -* 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 'package:process/process.dart'; diff --git a/packages/flutter_tools/lib/src/ohos/ohos_doctor.dart b/packages/flutter_tools/lib/src/ohos/ohos_doctor.dart index 05e9dabed7442339478d8b54c6a714cad26991d2..74d0d123662a2c1cc8f4af6353362fa2ae771d50 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_doctor.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_doctor.dart @@ -1,16 +1,8 @@ /* -* 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 +* Copyright 2014 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. * -* 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 'package:process/process.dart'; diff --git a/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart b/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart index 574df4264618bf99f0995a7162e06d68ab749362..c0a4dd22246d4dc2985e3f7d4356b502b5a46507 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_plugins_manager.dart @@ -1,16 +1,7 @@ /* -* 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. +* Copyright 2014 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. */ import 'dart:convert'; diff --git a/packages/flutter_tools/lib/src/ohos/ohos_sdk.dart b/packages/flutter_tools/lib/src/ohos/ohos_sdk.dart index 0b737851bb81f750fcb07e9c09bc8e1cc44c4998..1ca050d7a9e7ff7b8495b212ff353ca7af0dd924 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_sdk.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_sdk.dart @@ -1,16 +1,7 @@ /* -* 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. +* Copyright 2014 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. */ import 'dart:collection'; diff --git a/packages/flutter_tools/lib/src/ohos/ohos_workflow.dart b/packages/flutter_tools/lib/src/ohos/ohos_workflow.dart index f372aff99363109052afd3a9e5a2408fa7edce5e..fd67140142d0b073ab70faccce7eb760a72191a8 100644 --- a/packages/flutter_tools/lib/src/ohos/ohos_workflow.dart +++ b/packages/flutter_tools/lib/src/ohos/ohos_workflow.dart @@ -1,16 +1,7 @@ /* -* 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. +* Copyright 2014 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. */ import '../base/context.dart'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/build-profile.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/build-profile.json5.tmpl index 0d8b167e6cea7b597c49097ab38d3e9ff785a24f..c521807822d7c0b726c25d422b7eb7de242d6205 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/build-profile.json5.tmpl @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "app": { diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/build-profile.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/build-profile.json5.tmpl index 633d360fbc91a3186a23b66ab71b27e5618944cb..6de31ee2243926392c90c572c00a052f7c3fa9e9 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/build-profile.json5.tmpl @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "apiType": 'stageMode', diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl index 894fc15c6b793f085e6c8506e43d719af658e8ff..98b5db417e47b1b76658839db49cd137479b44ea 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/hvigorfile.ts.tmpl @@ -1,17 +1,3 @@ -/* -* 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. -*/ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. export { hapTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/oh-package.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/oh-package.json5.tmpl index dabaee13151003854589516fcfb20ccd29c44b6b..80aa77e3db589d937f763c963eed4b07aaa6bc0f 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/oh-package.json5.tmpl @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "name": "entry", diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/entryability/EntryAbility.ets.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/entryability/EntryAbility.ets.tmpl index 8bc48be8773196f34cccb15cf517f87f5c6b94d2..f85a65508a6140721404097998b77be622c93d5d 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/entryability/EntryAbility.ets.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/entryability/EntryAbility.ets.tmpl @@ -1,17 +1,3 @@ -/* -* 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 { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/pages/Index.ets.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/pages/Index.ets.tmpl index 1125f9fdd95f4310a182c1c9e3680f37f73686c9..7bb6543fe7ad7539f0167c4fbf56113e101662a1 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/pages/Index.ets.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/ets/pages/Index.ets.tmpl @@ -1,17 +1,3 @@ -/* -* 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 { FlutterPage } from '@ohos/flutter_ohos' diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/module.json5 b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/module.json5 index 7bbf78b18f39991b1404061c7437538c7d532bb7..5bd7950ba5343abd89b475921bca8bbbacd3629c 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/module.json5 +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "module": { "name": "entry", diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/Ability.test.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/Ability.test.ets index 25d4c71ff3cd584f5d64f6f8c0ac864928c234c4..8abf7f2f44c0e56110df8c09b2524a4ca37bc993 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,18 +1,3 @@ -/* -* 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 hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/List.test.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/List.test.ets index f4140030e65d20df6af30a6bf51e464dea8f8aa6..d766fe249dfc3ada636f27e64d9b64451ce32c93 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/List.test.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/test/List.test.ets @@ -1,18 +1,3 @@ -/* -* 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 abilityTest from './Ability.test' export default function testsuite() { diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/TestAbility.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/TestAbility.ets index 4ca645e6013cfce8e7dbb728313cb8840c4da660..e3f6e911d3fffba1e1795c60ed1ee4db15b386fd 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,18 +1,3 @@ -/* -* 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 UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; import hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets index cef0447cd2f137ef82d223ead2e156808878ab90..545843d3949e383b7bdd6ebbf5681d28c3e6ef71 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,17 +1,4 @@ -/* -* 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 hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 1def08f2e9dcbfa3454a07b7a3b82b173bb90d02..47fc89b4f05bf2efc6e863b8c2569705a4c56fd9 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,17 +1,3 @@ -/* -* 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 hilog from '@ohos.hilog'; import TestRunner from '@ohos.application.testRunner'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/module.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/module.json5.tmpl index fab77ce2e0c61e3ad010bab5b27ccbd15f9a8c96..3b02a75a22d44e7ed129f102197a3050a8f922be 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/module.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/entry/src/ohosTest/module.json5.tmpl @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "module": { diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigor/hvigor-config.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigor/hvigor-config.json5.tmpl index 541ba35711b75986f9295410ee38fdb8f2572878..e7b855ac20e294c76e70350654c16da224ff03b2 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigor/hvigor-config.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigor/hvigor-config.json5.tmpl @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigorfile.ts.tmpl index 8f2d2aafe6d6a3a71a9944ebd0c91fbc308ac9d1..acfff37c8a67f074a0fd4692ae3852b44a829a3a 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/hvigorfile.ts.tmpl @@ -1,17 +1,3 @@ -/* -* 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 { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/app_shared/ohos.tmpl/oh-package.json5.tmpl b/packages/flutter_tools/templates/app_shared/ohos.tmpl/oh-package.json5.tmpl index a5bc0bec4babd48d91e77411be76c9fc7195f41a..75829e6fe457acb8e324e0fa6cc96de23dcb8b31 100644 --- a/packages/flutter_tools/templates/app_shared/ohos.tmpl/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/app_shared/ohos.tmpl/oh-package.json5.tmpl @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/build-profile.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/build-profile.json5.tmpl index 75b957106e55baca642e3f4aefbe3a35afa41f48..33e535e5c3b20ff332fca73aca04f16b5178dd66 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/build-profile.json5.tmpl @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "app": { diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/build-profile.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/build-profile.json5.tmpl index 633d360fbc91a3186a23b66ab71b27e5618944cb..6de31ee2243926392c90c572c00a052f7c3fa9e9 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/build-profile.json5.tmpl @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "apiType": 'stageMode', diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/hvigorfile.ts.tmpl index 894fc15c6b793f085e6c8506e43d719af658e8ff..98b5db417e47b1b76658839db49cd137479b44ea 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/hvigorfile.ts.tmpl @@ -1,17 +1,3 @@ -/* -* 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. -*/ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. export { hapTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/oh-package.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/oh-package.json5.tmpl index 6f7b62b27e4d07e590d1229f054e4ab705fd161d..a5bfaf0e621f73ab256519739aa2e05a5ed7d8f1 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/oh-package.json5.tmpl @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "name": "entry", diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl index 0f7f6669df901026455377b1ccc93c281efc96df..08dc3c6dcb7ce21cc9302b5906d767df137884f9 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/entryability/EntryAbility.ets.tmpl @@ -1,17 +1,3 @@ -/* -* 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 { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; import { GeneratedPluginRegistrant } from '@ohos/flutter_module'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/pages/Index.ets.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/pages/Index.ets.tmpl index 1125f9fdd95f4310a182c1c9e3680f37f73686c9..7bb6543fe7ad7539f0167c4fbf56113e101662a1 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/pages/Index.ets.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/ets/pages/Index.ets.tmpl @@ -1,17 +1,3 @@ -/* -* 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 { FlutterPage } from '@ohos/flutter_ohos' diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/module.json5 b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/module.json5 index 156fac615ed5810ee786b9ebc6b5f9b1d608ffde..809307d2e108ad63ff3538ab60a7ad25047e8209 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/module.json5 +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "module": { "name": "entry", diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/Ability.test.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/Ability.test.ets index 25d4c71ff3cd584f5d64f6f8c0ac864928c234c4..fefeb6ea18753265ef72446ee9309e0a15835e66 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/Ability.test.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/Ability.test.ets @@ -1,17 +1,3 @@ -/* -* 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 hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/List.test.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/List.test.ets index f4140030e65d20df6af30a6bf51e464dea8f8aa6..348ab4ea9ee3e33ad3709db8258ddca670c65563 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/List.test.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/test/List.test.ets @@ -1,17 +1,3 @@ -/* -* 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 abilityTest from './Ability.test' diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/TestAbility.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/TestAbility.ets index 4ca645e6013cfce8e7dbb728313cb8840c4da660..42fcf69c986ba971f56b56f4b568aacf06ef298e 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/TestAbility.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/TestAbility.ets @@ -1,17 +1,3 @@ -/* -* 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 UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets index cef0447cd2f137ef82d223ead2e156808878ab90..545843d3949e383b7bdd6ebbf5681d28c3e6ef71 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testability/pages/Index.ets @@ -1,17 +1,4 @@ -/* -* 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 hilog from '@ohos.hilog'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 1def08f2e9dcbfa3454a07b7a3b82b173bb90d02..47fc89b4f05bf2efc6e863b8c2569705a4c56fd9 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,17 +1,3 @@ -/* -* 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 hilog from '@ohos.hilog'; import TestRunner from '@ohos.application.testRunner'; diff --git a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/module.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/module.json5.tmpl index fab77ce2e0c61e3ad010bab5b27ccbd15f9a8c96..3b02a75a22d44e7ed129f102197a3050a8f922be 100644 --- a/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/module.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_app_common/entry.tmpl/src/ohosTest/module.json5.tmpl @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "module": { diff --git a/packages/flutter_tools/templates/module/ohos/host_config/build-profile.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_config/build-profile.json5.tmpl index 0de1d44b66f27ad31954d1b8245122d3d5d35c4a..a099777969fdb7bc4a044f81f739facc2517515b 100644 --- a/packages/flutter_tools/templates/module/ohos/host_config/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_config/build-profile.json5.tmpl @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "app": { diff --git a/packages/flutter_tools/templates/module/ohos/host_config/oh-package.json5.tmpl b/packages/flutter_tools/templates/module/ohos/host_config/oh-package.json5.tmpl index 38968fc7e4daf80c37a2adf005519941daca9d28..0db77d9a261cb733b808760b9c9ea27ae69846ff 100644 --- a/packages/flutter_tools/templates/module/ohos/host_config/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/host_config/oh-package.json5.tmpl @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigor/hvigor-config.json5.tmpl b/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigor/hvigor-config.json5.tmpl index 541ba35711b75986f9295410ee38fdb8f2572878..e7b855ac20e294c76e70350654c16da224ff03b2 100644 --- a/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigor/hvigor-config.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigor/hvigor-config.json5.tmpl @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "modelVersion": "5.0.0", diff --git a/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigorfile.ts.tmpl index 8f2d2aafe6d6a3a71a9944ebd0c91fbc308ac9d1..acfff37c8a67f074a0fd4692ae3852b44a829a3a 100644 --- a/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/module/ohos/hvigor_plugin/hvigorfile.ts.tmpl @@ -1,17 +1,3 @@ -/* -* 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 { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/build-profile.json5.tmpl b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/build-profile.json5.tmpl index 633d360fbc91a3186a23b66ab71b27e5618944cb..11a8dca6f9a51bac8daa912bab79b35c7be848a2 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/build-profile.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/build-profile.json5.tmpl @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "apiType": 'stageMode', diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/hvigorfile.ts.tmpl b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/hvigorfile.ts.tmpl index d3aba127d60569f70f3bc6eacc9db994eb9af8f6..760996e98b9e4f2829e495953eb58b85435e1751 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/hvigorfile.ts.tmpl +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/hvigorfile.ts.tmpl @@ -1,17 +1,4 @@ -/* -* 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 { harTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets index ee4e374b29d8926ebd55a84416581021fa9a19a1..0d5f99ca4198c366dc23fa0f0d5081c6be2f7ea8 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/index.ets @@ -1,16 +1,2 @@ -/* -* 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. -*/ export { GeneratedPluginRegistrant } from './src/main/ets/plugins/GeneratedPluginRegistrant' \ No newline at end of file diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/oh-package.json5.tmpl b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/oh-package.json5.tmpl index 1fa6a4dfea9bdf543faaced48884a2f6cfbbeb73..f16bb33f6fce8eefaac40c59502303184342c24e 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/oh-package.json5.tmpl +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/oh-package.json5.tmpl @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "name": "@ohos/flutter_module", diff --git a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/src/main/module.json5 b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/src/main/module.json5 index 81d88ba3a347d29f54850aecdd46f69a116feea4..61b1982a964aef25f7625ec6dbf2aeaeb56d57b4 100644 --- a/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/src/main/module.json5 +++ b/packages/flutter_tools/templates/module/ohos/module_library/flutter_module.tmpl/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "module": { "name": "flutter_module", diff --git a/packages/flutter_tools/templates/plugin/ohos.tmpl/index.ets.tmpl b/packages/flutter_tools/templates/plugin/ohos.tmpl/index.ets.tmpl index a4d4c30b4721e70a54165d5b43bf21d08c4bf111..264faf5fd1510edf8e25c8536f6519f6b97245f6 100644 --- a/packages/flutter_tools/templates/plugin/ohos.tmpl/index.ets.tmpl +++ b/packages/flutter_tools/templates/plugin/ohos.tmpl/index.ets.tmpl @@ -1,17 +1,4 @@ -/* -* 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 {{pluginClass}} from './src/main/ets/components/plugin/{{pluginClass}}'; export default {{pluginClass}}; diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_app_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_app_test.dart index 9428c2e25d252269cd334b6023713be451e04705..0ee01a5d99f0ecab59961dd8f1fe5aa02485cf86 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/build_app_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/build_app_test.dart @@ -1,17 +1,6 @@ -/* - * Copyright (C) 2024 Huawei Device 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. - */ +// Copyright 2014 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. import 'package:args/command_runner.dart'; import 'package:flutter_tools/src/base/file_system.dart'; diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_hap_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_hap_test.dart index aa20b8a512a078508c722ae797a8271dd7083bd2..42739bbbfac652feea427ad4381fba49670cae50 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/build_hap_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/build_hap_test.dart @@ -1,16 +1,7 @@ /* - * Copyright (C) 2024 Huawei Device 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. + * Copyright 2014 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. */ import 'package:args/args.dart'; diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_har_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_har_test.dart index 02fb23c83c04812a97596b04c17dab6c965db812..f2847a70fdf3a77914ea1c6c0d992e58a574a0e9 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/build_har_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/build_har_test.dart @@ -1,16 +1,7 @@ /* - * Copyright (C) 2024 Huawei Device 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. + * Copyright 2014 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. */ import 'package:args/command_runner.dart'; @@ -170,7 +161,7 @@ void main() { projectPath, arguments: [ '--target-platform', - 'ohos-x86', + 'ohos-x64', '--tree-shake-icons', '--flavor', 'free', diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_hsp_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_hsp_test.dart index cbb9e4b0c21c87782351e316297f7d33e20468e3..776bd2e3ba53201d180689d6744558d6dbdbc2db 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/build_hsp_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/build_hsp_test.dart @@ -1,16 +1,7 @@ /* - * Copyright (C) 2024 Huawei Device 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. + * Copyright 2014 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. */ import 'package:args/command_runner.dart'; @@ -169,7 +160,7 @@ void main() { projectPath, arguments: [ '--target-platform', - 'ohos-x86', + 'ohos-x64', '--tree-shake-icons', '--flavor', 'free', diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/ohos_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/ohos_test.dart index 356890262cdc44460d53cd1ff6fa17059627e983..2a700d7b4ee980074b62d90b793e059761b555bf 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/ohos_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/targets/ohos_test.dart @@ -1,17 +1,6 @@ -/* - * Copyright (C) 2024 Huawei Device 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. - */ +// Copyright 2014 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. import 'package:file/memory.dart'; import 'package:file_testing/file_testing.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/hdc_server_test.dart b/packages/flutter_tools/test/general.shard/ohos/hdc_server_test.dart index 042aef10306d3479957e8f0f0aaf84f2ee8ed9b8..f887685b5b02929bb6c90f0be462ab11a2c96310 100644 --- a/packages/flutter_tools/test/general.shard/ohos/hdc_server_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/hdc_server_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device 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 'package:flutter_tools/src/ohos/hdc_server.dart'; import 'package:flutter_tools/src/ohos/ohos_sdk.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/hvigor_test.dart b/packages/flutter_tools/test/general.shard/ohos/hvigor_test.dart index 3ac7d9501d797e59bad424106dff833bf1bf047c..1bd54d39a2169bed426e2227ee1d4be6a8f6acc5 100644 --- a/packages/flutter_tools/test/general.shard/ohos/hvigor_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/hvigor_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device 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 'dart:async'; import 'dart:convert'; diff --git a/packages/flutter_tools/test/general.shard/ohos/hvigor_utils_test.dart b/packages/flutter_tools/test/general.shard/ohos/hvigor_utils_test.dart index deb9499ef49e1655e395af129293e59ab00bfba6..4967e33d39c2b7d88b22be8c5f665f2f08aab332 100644 --- a/packages/flutter_tools/test/general.shard/ohos/hvigor_utils_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/hvigor_utils_test.dart @@ -1,17 +1,4 @@ -/* - * Copyright (C) 2024 Huawei Device 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 'package:file/file.dart'; import 'package:flutter_tools/src/convert.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart index ce010cb8b2c62e8a9ec071749daf6fbf665cf04e..0e87ded6314ab735ae54efd40827a572afe047af 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_application_package_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device 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 'package:file/memory.dart'; import 'package:flutter_tools/src/base/file_system.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart index bbf9f4ca13498011f15a30f7077b5caba710d219..7b8a13d01af6d654068d2993166377000454f008 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_device_discovery_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device 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 'package:file/memory.dart'; import 'package:flutter_tools/src/base/logger.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart index c0c915b78fab9d9981eca14fada3adfebdc37c34..4aa23b9442ff505720a2d799d8b3f6bb40c5f300 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_device_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device 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 'package:flutter_tools/src/application_package.dart'; import 'package:flutter_tools/src/ohos/ohos_device.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_doctor_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_doctor_test.dart index 357363336c9bba6d13564209815fc69fd84a947d..03564e677db7310cd9d49c822f8585e2f0cf4c9e 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_doctor_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_doctor_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device 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 'package:file/memory.dart'; import 'package:flutter_tools/src/base/config.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_plugins_manager_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_plugins_manager_test.dart index de4ceb5064546989d14cfc3c0f0e98ee275ef2ba..6fe1c5ba6a8db95d9aaf81a8714a0ec8788d8262 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_plugins_manager_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_plugins_manager_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device 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 'package:file/memory.dart'; import 'package:flutter_tools/src/base/file_system.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart index 1485d76f9de5926d9cf01afe8639d118da8dc1e9..e65cb789bf20286881e594bfc80ad9e54a55475f 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_sdk_test.dart @@ -1,17 +1,4 @@ -/* - * Copyright (C) 2024 Huawei Device 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 'package:file/memory.dart'; import 'package:flutter_tools/src/base/config.dart'; diff --git a/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart b/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart index e0cff7ef0a2eade398fdd96c9ae418f0be90d8cf..b697638774ab3c89e337742343175995230df221 100644 --- a/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart +++ b/packages/flutter_tools/test/general.shard/ohos/ohos_workflow_test.dart @@ -1,17 +1,3 @@ -/* - * Copyright (C) 2024 Huawei Device 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 'package:flutter_tools/src/ohos/ohos_sdk.dart'; import 'package:flutter_tools/src/ohos/ohos_workflow.dart'; diff --git a/packages/flutter_tools/test/src/ohos_common.dart b/packages/flutter_tools/test/src/ohos_common.dart index a71e20f66e6a1a5a40f8f0f98c12134ffde0d2e5..900a3b728c772afa686a6e473ed872e8aeb7eeda 100644 --- a/packages/flutter_tools/test/src/ohos_common.dart +++ b/packages/flutter_tools/test/src/ohos_common.dart @@ -1,16 +1,8 @@ /* - * Copyright (C) 2024 Huawei Device 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 + * Copyright 2014 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. * - * 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 'package:flutter_tools/src/base/file_system.dart'; diff --git a/packages/integration_test/example/ohos/entry/build-profile.json5 b/packages/integration_test/example/ohos/entry/build-profile.json5 index 633d360fbc91a3186a23b66ab71b27e5618944cb..11a8dca6f9a51bac8daa912bab79b35c7be848a2 100644 --- a/packages/integration_test/example/ohos/entry/build-profile.json5 +++ b/packages/integration_test/example/ohos/entry/build-profile.json5 @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "apiType": 'stageMode', diff --git a/packages/integration_test/example/ohos/entry/hvigorfile.ts b/packages/integration_test/example/ohos/entry/hvigorfile.ts index 894fc15c6b793f085e6c8506e43d719af658e8ff..bcd2cf7dc3f09ff7395b6c4a28ebf853b202b47f 100644 --- a/packages/integration_test/example/ohos/entry/hvigorfile.ts +++ b/packages/integration_test/example/ohos/entry/hvigorfile.ts @@ -1,17 +1,4 @@ -/* -* 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. -*/ + // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. export { hapTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets index 8bc48be8773196f34cccb15cf517f87f5c6b94d2..f85a65508a6140721404097998b77be622c93d5d 100644 --- a/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/packages/integration_test/example/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -1,17 +1,3 @@ -/* -* 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 { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant'; diff --git a/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets b/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets index ac2b5dc723e6ee2c10f32504ffcabe9e4835d7b2..3005e8388b66b910290eeb8b544dffa3535e79d6 100644 --- a/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets +++ b/packages/integration_test/example/ohos/entry/src/main/ets/pages/Index.ets @@ -1,17 +1,4 @@ -/* -* 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 { FlutterPage } from '@ohos/flutter_ohos'; diff --git a/packages/integration_test/example/ohos/entry/src/main/module.json5 b/packages/integration_test/example/ohos/entry/src/main/module.json5 index 7bbf78b18f39991b1404061c7437538c7d532bb7..5bd7950ba5343abd89b475921bca8bbbacd3629c 100644 --- a/packages/integration_test/example/ohos/entry/src/main/module.json5 +++ b/packages/integration_test/example/ohos/entry/src/main/module.json5 @@ -1,17 +1,4 @@ -/* -* 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. -*/ + { "module": { "name": "entry", diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets index 25d4c71ff3cd584f5d64f6f8c0ac864928c234c4..fefeb6ea18753265ef72446ee9309e0a15835e66 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/Ability.test.ets @@ -1,17 +1,3 @@ -/* -* 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 hilog from '@ohos.hilog'; import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/List.test.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/List.test.ets index f4140030e65d20df6af30a6bf51e464dea8f8aa6..073c11f4d58dda4f9e2a3b68078a069d48c4fa56 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/List.test.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/test/List.test.ets @@ -1,17 +1,4 @@ -/* -* 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 abilityTest from './Ability.test' diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets index 4ca645e6013cfce8e7dbb728313cb8840c4da660..242b0c6c216a651d680b06cadde60dc569b879e0 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -1,17 +1,4 @@ -/* -* 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 UIAbility from '@ohos.app.ability.UIAbility'; import AbilityDelegatorRegistry from '@ohos.app.ability.abilityDelegatorRegistry'; diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets index cef0447cd2f137ef82d223ead2e156808878ab90..6466fb9197899170b34d93bae6e253a1a40c2fb6 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testability/pages/Index.ets @@ -1,17 +1,3 @@ -/* -* 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 hilog from '@ohos.hilog'; diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts index 1def08f2e9dcbfa3454a07b7a3b82b173bb90d02..47fc89b4f05bf2efc6e863b8c2569705a4c56fd9 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ts @@ -1,17 +1,3 @@ -/* -* 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 hilog from '@ohos.hilog'; import TestRunner from '@ohos.application.testRunner'; diff --git a/packages/integration_test/example/ohos/entry/src/ohosTest/module.json5 b/packages/integration_test/example/ohos/entry/src/ohosTest/module.json5 index fab77ce2e0c61e3ad010bab5b27ccbd15f9a8c96..3b02a75a22d44e7ed129f102197a3050a8f922be 100644 --- a/packages/integration_test/example/ohos/entry/src/ohosTest/module.json5 +++ b/packages/integration_test/example/ohos/entry/src/ohosTest/module.json5 @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "module": { diff --git a/packages/integration_test/example/ohos/hvigor/hvigor-config.json5 b/packages/integration_test/example/ohos/hvigor/hvigor-config.json5 index 541ba35711b75986f9295410ee38fdb8f2572878..e7b855ac20e294c76e70350654c16da224ff03b2 100644 --- a/packages/integration_test/example/ohos/hvigor/hvigor-config.json5 +++ b/packages/integration_test/example/ohos/hvigor/hvigor-config.json5 @@ -1,17 +1,3 @@ -/* -* 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. -*/ { "modelVersion": "5.0.0", diff --git a/packages/integration_test/example/ohos/hvigorfile.ts b/packages/integration_test/example/ohos/hvigorfile.ts index 8f2d2aafe6d6a3a71a9944ebd0c91fbc308ac9d1..76cbff657f0ae6b274ddbbd0a938ce86226606d2 100644 --- a/packages/integration_test/example/ohos/hvigorfile.ts +++ b/packages/integration_test/example/ohos/hvigorfile.ts @@ -1,17 +1,4 @@ -/* -* 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 { appTasks } from '@ohos/hvigor-ohos-plugin'; diff --git a/packages/integration_test/ohos/Index.ets b/packages/integration_test/ohos/Index.ets index 9cb1e4ae7cd0c0eb408862951c44f269c4fe473e..d34b3cf281b2dceb766cde42821664b435cd6dc1 100644 --- a/packages/integration_test/ohos/Index.ets +++ b/packages/integration_test/ohos/Index.ets @@ -1,17 +1,3 @@ -/** - * Copyright (c) 2023 Huawei Device 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 IntegrationTestPlugin from './src/main/ets/components/integration_test/IntegrationTestPlugin'; export default IntegrationTestPlugin; diff --git a/packages/integration_test/ohos/src/main/ets/components/integration_test/FlutterDeviceScreenshot.ets b/packages/integration_test/ohos/src/main/ets/components/integration_test/FlutterDeviceScreenshot.ets index ea9629b0594a5bf3b871a2936e5cdd8b52f22a63..386cfb69f103b26869df7417f0c3100d1f1644bc 100644 --- a/packages/integration_test/ohos/src/main/ets/components/integration_test/FlutterDeviceScreenshot.ets +++ b/packages/integration_test/ohos/src/main/ets/components/integration_test/FlutterDeviceScreenshot.ets @@ -1,16 +1,8 @@ /** - * Copyright (c) 2023 Huawei Device 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 + * Copyright 2014 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. * - * 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 { MethodChannel, diff --git a/packages/integration_test/ohos/src/main/ets/components/integration_test/IntegrationTestPlugin.ets b/packages/integration_test/ohos/src/main/ets/components/integration_test/IntegrationTestPlugin.ets index 1b9bf02b136506211702aa1786d10de7a6a40d32..442b09054f3b9a2dd98aacd29c970ff0b3590a1b 100644 --- a/packages/integration_test/ohos/src/main/ets/components/integration_test/IntegrationTestPlugin.ets +++ b/packages/integration_test/ohos/src/main/ets/components/integration_test/IntegrationTestPlugin.ets @@ -1,16 +1,8 @@ /** - * Copyright (c) 2023 Huawei Device 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 + * Copyright 2014 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. * - * 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 { diff --git a/packages/integration_test/ohos/src/test/List.test.ets b/packages/integration_test/ohos/src/test/List.test.ets index 4b699aacccf223c420964da1f99d8f6a35a637ed..af9973d97810340619e02e90ce1bfb8c20c8ef36 100644 --- a/packages/integration_test/ohos/src/test/List.test.ets +++ b/packages/integration_test/ohos/src/test/List.test.ets @@ -1,17 +1,4 @@ -/** - * Copyright (c) 2023 Huawei Device 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 localUnitTest from './LocalUnit.test'; export default function testsuite() { diff --git a/release-notes/Flutter 3.7.12-ohos 1.0.4 ReleaseNote.en.md b/release-notes/Flutter 3.7.12-ohos 1.0.4 ReleaseNote.en.md new file mode 100644 index 0000000000000000000000000000000000000000..2ee14ac4523ab69bbef026bc3086ddb0be4593b3 --- /dev/null +++ b/release-notes/Flutter 3.7.12-ohos 1.0.4 ReleaseNote.en.md @@ -0,0 +1,22 @@ +## Version Overview +This version is Flutter OpenHarmony platform version 1.0.4, based on Flutter version 3.7.12. This version supports and improves the capabilities of the OpenHarmony platform and supports drag features. + +## Release Scope +HarmonyOS NEXT, API13 + +## New Features +- Support drag features + +## Version Release Time +February 7, 2025 + +## Version Support +- ROM: 205.0.1.115 +- IDE: DevEco Studio 5.0.5.330 +- Flutter SDK: 3.7.12-ohos-1.0.4 + +## Enablement Documents +- [Document Link](https://gitee.com/openharmony-sig/flutter_samples/tree/master/ohos/docs) + +## Fixed Issues +- External texture related issues \ No newline at end of file diff --git a/release-notes/Flutter 3.7.12-ohos 1.0.4 ReleaseNote.md b/release-notes/Flutter 3.7.12-ohos 1.0.4 ReleaseNote.md new file mode 100644 index 0000000000000000000000000000000000000000..d9dd7fd4ed1398663179f0401a41f9c07173c047 --- /dev/null +++ b/release-notes/Flutter 3.7.12-ohos 1.0.4 ReleaseNote.md @@ -0,0 +1,22 @@ +## 版本概述 +本版本为Flutter OpenHarmony平台1.0.4版本，基于Flutter 3.7.12版本适配。本版本支持和完善OpenHarmony平台侧能力，支持拖拽特性。 + +## 发布范围 +HarmonyOS NEXT, API13 + +## 新增特性 +- 支持拖拽特性 + +## 版本发布时间 +2025年2月7日 + +## 版本配套 +- ROM: 205.0.1.115 +- IDE: DevEco Studio 5.0.5.330 +- Flutter SDK: 3.7.12-ohos-1.0.4 + +## 赋能文档 +- [文档链接](https://gitee.com/openharmony-sig/flutter_samples/tree/master/ohos/docs) + +## 修复问题 +- 外接纹理相关问题 \ No newline at end of file