diff --git a/ohos/dio_test/ohos/har/har_product/flutter_embedding.har.debug.10 b/ohos/dio_test/ohos/har/har_product/flutter_embedding.har.debug.10 deleted file mode 100644 index d8e07ca297de2100ce605f8af1126daf6eeb5d8f..0000000000000000000000000000000000000000 Binary files a/ohos/dio_test/ohos/har/har_product/flutter_embedding.har.debug.10 and /dev/null differ diff --git a/ohos/dio_test/ohos/har/har_product/flutter_embedding.har.debug.9 b/ohos/dio_test/ohos/har/har_product/flutter_embedding.har.debug.9 deleted file mode 100644 index f0df4ca0064821178bf4254b16e8d23d873827da..0000000000000000000000000000000000000000 Binary files a/ohos/dio_test/ohos/har/har_product/flutter_embedding.har.debug.9 and /dev/null differ diff --git a/ohos/dio_test/ohos/har/har_product/flutter_embedding.har.release.10 b/ohos/dio_test/ohos/har/har_product/flutter_embedding.har.release.10 deleted file mode 100644 index da9b320a09600f678975b827160441e46144bf08..0000000000000000000000000000000000000000 Binary files a/ohos/dio_test/ohos/har/har_product/flutter_embedding.har.release.10 and /dev/null differ diff --git a/ohos/dio_test/ohos/har/har_product/flutter_embedding.har.release.9 b/ohos/dio_test/ohos/har/har_product/flutter_embedding.har.release.9 deleted file mode 100644 index ba52754a80826e5614438b3faf931ed2f487eaab..0000000000000000000000000000000000000000 Binary files a/ohos/dio_test/ohos/har/har_product/flutter_embedding.har.release.9 and /dev/null differ diff --git a/ohos/dio_test/ohos/har/har_product/libflutter.so.debug.10 b/ohos/dio_test/ohos/har/har_product/libflutter.so.debug.10 deleted file mode 100644 index 8ff0d04141a776e448478791df1e2a1c3aa7c5c4..0000000000000000000000000000000000000000 Binary files a/ohos/dio_test/ohos/har/har_product/libflutter.so.debug.10 and /dev/null differ diff --git a/ohos/dio_test/ohos/har/har_product/libflutter.so.release.10 b/ohos/dio_test/ohos/har/har_product/libflutter.so.release.10 deleted file mode 100644 index 7cdf26180489e807496f02cd4736425b4ad42845..0000000000000000000000000000000000000000 Binary files a/ohos/dio_test/ohos/har/har_product/libflutter.so.release.10 and /dev/null differ diff --git a/ohos/dio_test/ohos/har/path_provider.har b/ohos/dio_test/ohos/har/path_provider.har deleted file mode 100644 index 82bfafe4da811e6d272dad10ad3ecb0e3b8e119a..0000000000000000000000000000000000000000 Binary files a/ohos/dio_test/ohos/har/path_provider.har and /dev/null differ diff --git a/ohos/event_bus_test/ohos/AppScope/app.json5 b/ohos/event_bus_test/ohos/AppScope/app.json5 index 86aac47fe51915a2e4de5cd3471c866b14842e7f..f8ad1769d01bb8f5ff5be0f6c11d0c3bdfaa3743 100644 --- a/ohos/event_bus_test/ohos/AppScope/app.json5 +++ b/ohos/event_bus_test/ohos/AppScope/app.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": { "bundleName": "com.example.event_bus_test", @@ -22,4 +7,4 @@ "icon": "$media:app_icon", "label": "$string:app_name" } -} +} \ No newline at end of file diff --git a/ohos/event_bus_test/ohos/build-profile.json5 b/ohos/event_bus_test/ohos/build-profile.json5 index 1d12140d202702d7c73d64f1b291fe5c45a660ce..6d9d459831bd1dc0ea9f1fc19119bca36cc257be 100644 --- a/ohos/event_bus_test/ohos/build-profile.json5 +++ b/ohos/event_bus_test/ohos/build-profile.json5 @@ -1,27 +1,25 @@ { - "app": { - "signingConfigs": [], - "products": [ + app: { + signingConfigs: [], + products: [ { - "name": "default", - "signingConfig": "default", - "compatibleSdkVersion": "5.0.0(12)", - "runtimeOS": "HarmonyOS" - } - ] + name: "default", + signingConfig: "default", + compatibleSdkVersion: "5.0.0(12)", + runtimeOS: "HarmonyOS", + }, + ], }, - "modules": [ + modules: [ { - "name": "entry", - "srcPath": "./entry", - "targets": [ + name: "entry", + srcPath: "./entry", + targets: [ { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] - } - ] -} \ No newline at end of file + name: "default", + applyToProducts: ["default"], + }, + ], + }, + ], +} diff --git a/ohos/event_bus_test/ohos/entry/oh-package.json5 b/ohos/event_bus_test/ohos/entry/oh-package.json5 index e386ec59469af89fe7beebd90877245581b21e76..803b25293388deda7b9a05a21b5aeadeb716b4d5 100644 --- a/ohos/event_bus_test/ohos/entry/oh-package.json5 +++ b/ohos/event_bus_test/ohos/entry/oh-package.json5 @@ -1,27 +1,9 @@ -/* -* 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. -*/ - { - "license": "", - "devDependencies": {}, - "author": "", "name": "entry", + "version": "1.0.0", "description": "Please describe the basic information.", "main": "", - "version": "1.0.0", - "dependencies": { - "@ohos/flutter_ohos": "file:../har/flutter_embedding.har" - } -} + "author": "", + "license": "", + "dependencies": {} +} \ No newline at end of file diff --git a/ohos/event_bus_test/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/ohos/event_bus_test/ohos/entry/src/main/ets/entryability/EntryAbility.ets index 321a4eeaacd7b8079a876e25c4dafd498e4d9fb9..8bc48be8773196f34cccb15cf517f87f5c6b94d2 100644 --- a/ohos/event_bus_test/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/ohos/event_bus_test/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -13,10 +13,12 @@ * limitations under the License. */ -import { FlutterAbility } from '@ohos/flutter_ohos' +import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; +import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant'; export default class EntryAbility extends FlutterAbility { - onFlutterEngineReady(): void { - super.onFlutterEngineReady() + configureFlutterEngine(flutterEngine: FlutterEngine) { + super.configureFlutterEngine(flutterEngine) + GeneratedPluginRegistrant.registerWith(flutterEngine) } } diff --git a/ohos/event_bus_test/ohos/entry/src/main/ets/pages/Index.ets b/ohos/event_bus_test/ohos/entry/src/main/ets/pages/Index.ets index b53a20c437e96d195487b281e5e95402ea6cb97d..1125f9fdd95f4310a182c1c9e3680f37f73686c9 100644 --- a/ohos/event_bus_test/ohos/entry/src/main/ets/pages/Index.ets +++ b/ohos/event_bus_test/ohos/entry/src/main/ets/pages/Index.ets @@ -16,16 +16,18 @@ import common from '@ohos.app.ability.common'; import { FlutterPage } from '@ohos/flutter_ohos' +let storage = LocalStorage.getShared() const EVENT_BACK_PRESS = 'EVENT_BACK_PRESS' -@Entry +@Entry(storage) @Component struct Index { private context = getContext(this) as common.UIAbilityContext + @LocalStorageLink('viewId') viewId: string = ""; build() { Column() { - FlutterPage() + FlutterPage({ viewId: this.viewId }) } } diff --git a/ohos/dio_test/ohos/oh-package-lock.json5 b/ohos/event_bus_test/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets similarity index 53% rename from ohos/dio_test/ohos/oh-package-lock.json5 rename to ohos/event_bus_test/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets index 8117ee588b7b4e9899feee78e294b5fbb14fbc3f..2a81b3aa9b09cf17c9d5704a25cb714721108c43 100644 --- a/ohos/dio_test/ohos/oh-package-lock.json5 +++ b/ohos/event_bus_test/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets @@ -13,16 +13,27 @@ * limitations under the License. */ -{ - "lockfileVersion": 1, - "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", - "specifiers": { - "@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6" - }, - "packages": { - "@ohos/hypium@1.0.6": { - "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz", - "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ==" +import { FlutterEngine, Log } from '@ohos/flutter_ohos'; + +/** + * Generated file. Do not edit. + * This file is generated by the Flutter tool based on the + * plugins that support the Ohos platform. + */ + +const TAG = "GeneratedPluginRegistrant"; + +export class GeneratedPluginRegistrant { + + static registerWith(flutterEngine: FlutterEngine) { + try { + } catch (e) { + Log.e( + TAG, + "Tried to register plugins with FlutterEngine (" + + flutterEngine + + ") failed."); + Log.e(TAG, "Received exception while registering", e); } } } \ No newline at end of file diff --git a/ohos/event_bus_test/ohos/oh-package-lock.json5 b/ohos/event_bus_test/ohos/oh-package-lock.json5 index 8117ee588b7b4e9899feee78e294b5fbb14fbc3f..b078f7693c70ed0ae65123aa88ffca135d1dc27d 100644 --- a/ohos/event_bus_test/ohos/oh-package-lock.json5 +++ b/ohos/event_bus_test/ohos/oh-package-lock.json5 @@ -1,28 +1,27 @@ -/* -* 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. -*/ - { - "lockfileVersion": 1, + "meta": { + "stableOrder": true + }, + "lockfileVersion": 3, "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "specifiers": { + "@ohos/flutter_ohos@har/flutter.har": "@ohos/flutter_ohos@har/flutter.har", "@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6" }, "packages": { + "@ohos/flutter_ohos@har/flutter.har": { + "name": "flutter", + "version": "1.0.0", + "resolved": "har/flutter.har", + "registryType": "local" + }, "@ohos/hypium@1.0.6": { + "name": "@ohos/hypium", + "version": "1.0.6", + "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ==", "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz", - "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ==" + "shasum": "3f5fed65372633233264b3447705b0831dfe7ea1", + "registryType": "ohpm" } } } \ No newline at end of file diff --git a/ohos/event_bus_test/ohos/oh-package.json5 b/ohos/event_bus_test/ohos/oh-package.json5 index a8af3823de9add0ff16aa5b1b10f7db123531cea..40d35a4b6e107682d5f75e4a04216ac77f67cbbb 100644 --- a/ohos/event_bus_test/ohos/oh-package.json5 +++ b/ohos/event_bus_test/ohos/oh-package.json5 @@ -1,13 +1,33 @@ +/* +* 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", + "name": "pro", + "version": "1.0.0", + "description": "Please describe the basic information.", + "main": "", + "author": "", "license": "", + "dependencies": { + "@ohos/flutter_ohos": "file:./har/flutter.har" + }, "devDependencies": { "@ohos/hypium": "1.0.6" }, - "author": "", - "name": "apptemplate", - "description": "Please describe the basic information.", - "main": "", - "version": "1.0.0", - "dependencies": {} -} \ No newline at end of file + "overrides": { + "@ohos/flutter_ohos": "file:./har/flutter.har" + } +} diff --git a/ohos/pictures_provider_demo/ohos/AppScope/app.json5 b/ohos/pictures_provider_demo/ohos/AppScope/app.json5 index 1bc87725694afbc88c3d3b93e2e7ea191254b256..a223a47d0f412541130d221825e157c3bed1f83b 100644 --- a/ohos/pictures_provider_demo/ohos/AppScope/app.json5 +++ b/ohos/pictures_provider_demo/ohos/AppScope/app.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": { "bundleName": "com.example.pictures_provider_demo", @@ -22,4 +7,4 @@ "icon": "$media:app_icon", "label": "$string:app_name" } -} +} \ No newline at end of file diff --git a/ohos/pictures_provider_demo/ohos/build-profile.json5 b/ohos/pictures_provider_demo/ohos/build-profile.json5 index 1d12140d202702d7c73d64f1b291fe5c45a660ce..6d9d459831bd1dc0ea9f1fc19119bca36cc257be 100644 --- a/ohos/pictures_provider_demo/ohos/build-profile.json5 +++ b/ohos/pictures_provider_demo/ohos/build-profile.json5 @@ -1,27 +1,25 @@ { - "app": { - "signingConfigs": [], - "products": [ + app: { + signingConfigs: [], + products: [ { - "name": "default", - "signingConfig": "default", - "compatibleSdkVersion": "5.0.0(12)", - "runtimeOS": "HarmonyOS" - } - ] + name: "default", + signingConfig: "default", + compatibleSdkVersion: "5.0.0(12)", + runtimeOS: "HarmonyOS", + }, + ], }, - "modules": [ + modules: [ { - "name": "entry", - "srcPath": "./entry", - "targets": [ + name: "entry", + srcPath: "./entry", + targets: [ { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] - } - ] -} \ No newline at end of file + name: "default", + applyToProducts: ["default"], + }, + ], + }, + ], +} diff --git a/ohos/pictures_provider_demo/ohos/entry/oh-package.json5 b/ohos/pictures_provider_demo/ohos/entry/oh-package.json5 index e81ba15d7c4e1cdc7419a91a9fc76aba48fc75f0..902106d0ffa0ed9d607f043d3af0681b029ca112 100644 --- a/ohos/pictures_provider_demo/ohos/entry/oh-package.json5 +++ b/ohos/pictures_provider_demo/ohos/entry/oh-package.json5 @@ -1,26 +1,11 @@ -/* -* 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', - version: '1.0.0', - description: 'Please describe the basic information.', - main: '', - author: '', - license: '', - dependencies: { - '@ohos/flutter_ohos': 'file:../har/flutter_embedding.har', - }, + "name": "entry", + "version": "1.0.0", + "description": "Please describe the basic information.", + "main": "", + "author": "", + "license": "", + "dependencies": { + "path_provider_ohos": "file:..\\har\\path_provider_ohos.har" + } } \ No newline at end of file diff --git a/ohos/pictures_provider_demo/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/ohos/pictures_provider_demo/ohos/entry/src/main/ets/entryability/EntryAbility.ets index e409e57ec4b40b6d3eb073b38bf909f268f4628e..8bc48be8773196f34cccb15cf517f87f5c6b94d2 100644 --- a/ohos/pictures_provider_demo/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/ohos/pictures_provider_demo/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -13,17 +13,12 @@ * limitations under the License. */ -import { FlutterAbility } from '@ohos/flutter_ohos' -import { FlutterPlugin } from '@ohos/flutter_ohos/src/main/ets/embedding/engine/plugins/FlutterPlugin'; +import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant'; -import List from '@ohos.util.List'; export default class EntryAbility extends FlutterAbility { - onFlutterEngineReady(): void { - super.onFlutterEngineReady() - let plugins = GeneratedPluginRegistrant.getPlugins() as List; - plugins.forEach((plugin) => { - this.addPlugin(plugin); - }) + configureFlutterEngine(flutterEngine: FlutterEngine) { + super.configureFlutterEngine(flutterEngine) + GeneratedPluginRegistrant.registerWith(flutterEngine) } } diff --git a/ohos/pictures_provider_demo/ohos/entry/src/main/ets/pages/Index.ets b/ohos/pictures_provider_demo/ohos/entry/src/main/ets/pages/Index.ets index b53a20c437e96d195487b281e5e95402ea6cb97d..1125f9fdd95f4310a182c1c9e3680f37f73686c9 100644 --- a/ohos/pictures_provider_demo/ohos/entry/src/main/ets/pages/Index.ets +++ b/ohos/pictures_provider_demo/ohos/entry/src/main/ets/pages/Index.ets @@ -16,16 +16,18 @@ import common from '@ohos.app.ability.common'; import { FlutterPage } from '@ohos/flutter_ohos' +let storage = LocalStorage.getShared() const EVENT_BACK_PRESS = 'EVENT_BACK_PRESS' -@Entry +@Entry(storage) @Component struct Index { private context = getContext(this) as common.UIAbilityContext + @LocalStorageLink('viewId') viewId: string = ""; build() { Column() { - FlutterPage() + FlutterPage({ viewId: this.viewId }) } } diff --git a/ohos/pictures_provider_demo/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets b/ohos/pictures_provider_demo/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets index aa6e42db76e872296974afbd96bceaa0e1acfcc2..c8657f80ca8e80bbde4fb0f909fa2eaae8e5cca5 100644 --- a/ohos/pictures_provider_demo/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets +++ b/ohos/pictures_provider_demo/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets @@ -13,19 +13,29 @@ * limitations under the License. */ -import { FlutterPlugin } from '@ohos/flutter_ohos/src/main/ets/embedding/engine/plugins/FlutterPlugin'; -import List from '@ohos.util.List'; -import PathProviderPlugin from '@ohos/path_provider_ohos' +import { FlutterEngine, Log } from '@ohos/flutter_ohos'; +import PathProviderPlugin from 'path_provider_ohos'; /** * Generated file. Do not edit. * This file is generated by the Flutter tool based on the * plugins that support the Ohos platform. */ + +const TAG = "GeneratedPluginRegistrant"; + export class GeneratedPluginRegistrant { - static getPlugins(): List { - let pluginList : List = new List(); - pluginList.add(new PathProviderPlugin()); - return pluginList; + + static registerWith(flutterEngine: FlutterEngine) { + try { + flutterEngine.getPlugins()?.add(new PathProviderPlugin()); + } catch (e) { + Log.e( + TAG, + "Tried to register plugins with FlutterEngine (" + + flutterEngine + + ") failed."); + Log.e(TAG, "Received exception while registering", e); + } } } diff --git a/ohos/pictures_provider_demo/ohos/oh-package.json5 b/ohos/pictures_provider_demo/ohos/oh-package.json5 index 8b0a0be108647f00bf48aa1f04f65471ee8513df..8092c1129cc311e22d4dde758ff47a5427e823bb 100644 --- a/ohos/pictures_provider_demo/ohos/oh-package.json5 +++ b/ohos/pictures_provider_demo/ohos/oh-package.json5 @@ -1,14 +1,20 @@ { "modelVersion": "5.0.0", - "name": "apptemplate", + "name": "pro", "version": "1.0.0", "description": "Please describe the basic information.", "main": "", "author": "", "license": "", "dependencies": { + "@ohos/flutter_ohos": "file:./har/flutter.har" }, "devDependencies": { "@ohos/hypium": "1.0.6" + }, + "overrides": { + "@ohos/flutter_ohos": "file:./har/flutter.har", + "path_provider_ohos": "file:./har/path_provider_ohos.har", + "@ohos/flutter_module": "file:./entry" } } \ No newline at end of file diff --git a/ohos/string_scanner_test/ohos/AppScope/app.json5 b/ohos/string_scanner_test/ohos/AppScope/app.json5 index e2fb1b24d89206f9ce0f5a6a91d8ebc527cd7509..b67aaec90e3e232810d63db215da67e2785fbe7d 100644 --- a/ohos/string_scanner_test/ohos/AppScope/app.json5 +++ b/ohos/string_scanner_test/ohos/AppScope/app.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": { "bundleName": "com.example.string_scanner_test", @@ -22,4 +7,4 @@ "icon": "$media:app_icon", "label": "$string:app_name" } -} +} \ No newline at end of file diff --git a/ohos/string_scanner_test/ohos/build-profile.json5 b/ohos/string_scanner_test/ohos/build-profile.json5 index 1d12140d202702d7c73d64f1b291fe5c45a660ce..6d9d459831bd1dc0ea9f1fc19119bca36cc257be 100644 --- a/ohos/string_scanner_test/ohos/build-profile.json5 +++ b/ohos/string_scanner_test/ohos/build-profile.json5 @@ -1,27 +1,25 @@ { - "app": { - "signingConfigs": [], - "products": [ + app: { + signingConfigs: [], + products: [ { - "name": "default", - "signingConfig": "default", - "compatibleSdkVersion": "5.0.0(12)", - "runtimeOS": "HarmonyOS" - } - ] + name: "default", + signingConfig: "default", + compatibleSdkVersion: "5.0.0(12)", + runtimeOS: "HarmonyOS", + }, + ], }, - "modules": [ + modules: [ { - "name": "entry", - "srcPath": "./entry", - "targets": [ + name: "entry", + srcPath: "./entry", + targets: [ { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] - } - ] -} \ No newline at end of file + name: "default", + applyToProducts: ["default"], + }, + ], + }, + ], +} diff --git a/ohos/string_scanner_test/ohos/dependencies/hvigor-3.0.9-s.tgz b/ohos/string_scanner_test/ohos/dependencies/hvigor-3.0.9-s.tgz deleted file mode 100644 index 65b0d24f94d2aecc1099f8f8220beec695bfb779..0000000000000000000000000000000000000000 Binary files a/ohos/string_scanner_test/ohos/dependencies/hvigor-3.0.9-s.tgz and /dev/null differ diff --git a/ohos/string_scanner_test/ohos/dependencies/hvigor-ohos-arkui-x-plugin-2.1.7-s.tgz b/ohos/string_scanner_test/ohos/dependencies/hvigor-ohos-arkui-x-plugin-2.1.7-s.tgz deleted file mode 100644 index 233a449cbfef6be702d861744254dd89ce633fb7..0000000000000000000000000000000000000000 Binary files a/ohos/string_scanner_test/ohos/dependencies/hvigor-ohos-arkui-x-plugin-2.1.7-s.tgz and /dev/null differ diff --git a/ohos/string_scanner_test/ohos/dependencies/hvigor-ohos-plugin-3.0.9-s.tgz b/ohos/string_scanner_test/ohos/dependencies/hvigor-ohos-plugin-3.0.9-s.tgz deleted file mode 100644 index e2e499e18dfcd05e1e275579d11697640eb80323..0000000000000000000000000000000000000000 Binary files a/ohos/string_scanner_test/ohos/dependencies/hvigor-ohos-plugin-3.0.9-s.tgz and /dev/null differ diff --git a/ohos/string_scanner_test/ohos/dependencies/rollup.tgz b/ohos/string_scanner_test/ohos/dependencies/rollup.tgz deleted file mode 100644 index b224a37a5f69fd22f58c7a28151742eafe7e6317..0000000000000000000000000000000000000000 Binary files a/ohos/string_scanner_test/ohos/dependencies/rollup.tgz and /dev/null differ diff --git a/ohos/string_scanner_test/ohos/entry/oh-package.json5 b/ohos/string_scanner_test/ohos/entry/oh-package.json5 index e386ec59469af89fe7beebd90877245581b21e76..19b9234a98d43a4711a0fc32cef604159228d3cd 100644 --- a/ohos/string_scanner_test/ohos/entry/oh-package.json5 +++ b/ohos/string_scanner_test/ohos/entry/oh-package.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. -*/ - { "license": "", "devDependencies": {}, @@ -21,7 +6,5 @@ "description": "Please describe the basic information.", "main": "", "version": "1.0.0", - "dependencies": { - "@ohos/flutter_ohos": "file:../har/flutter_embedding.har" - } -} + "dependencies": {} +} \ No newline at end of file diff --git a/ohos/string_scanner_test/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/ohos/string_scanner_test/ohos/entry/src/main/ets/entryability/EntryAbility.ets index 321a4eeaacd7b8079a876e25c4dafd498e4d9fb9..8bc48be8773196f34cccb15cf517f87f5c6b94d2 100644 --- a/ohos/string_scanner_test/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/ohos/string_scanner_test/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -13,10 +13,12 @@ * limitations under the License. */ -import { FlutterAbility } from '@ohos/flutter_ohos' +import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; +import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant'; export default class EntryAbility extends FlutterAbility { - onFlutterEngineReady(): void { - super.onFlutterEngineReady() + configureFlutterEngine(flutterEngine: FlutterEngine) { + super.configureFlutterEngine(flutterEngine) + GeneratedPluginRegistrant.registerWith(flutterEngine) } } diff --git a/ohos/string_scanner_test/ohos/entry/src/main/ets/pages/Index.ets b/ohos/string_scanner_test/ohos/entry/src/main/ets/pages/Index.ets index b53a20c437e96d195487b281e5e95402ea6cb97d..1125f9fdd95f4310a182c1c9e3680f37f73686c9 100644 --- a/ohos/string_scanner_test/ohos/entry/src/main/ets/pages/Index.ets +++ b/ohos/string_scanner_test/ohos/entry/src/main/ets/pages/Index.ets @@ -16,16 +16,18 @@ import common from '@ohos.app.ability.common'; import { FlutterPage } from '@ohos/flutter_ohos' +let storage = LocalStorage.getShared() const EVENT_BACK_PRESS = 'EVENT_BACK_PRESS' -@Entry +@Entry(storage) @Component struct Index { private context = getContext(this) as common.UIAbilityContext + @LocalStorageLink('viewId') viewId: string = ""; build() { Column() { - FlutterPage() + FlutterPage({ viewId: this.viewId }) } } diff --git a/ohos/string_scanner_test/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets b/ohos/string_scanner_test/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets new file mode 100644 index 0000000000000000000000000000000000000000..40f130cd4ad66fbe957f382dc9d34c384d33341c --- /dev/null +++ b/ohos/string_scanner_test/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets @@ -0,0 +1,39 @@ +/* +* 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 { FlutterEngine, Log } from '@ohos/flutter_ohos'; + +/** + * Generated file. Do not edit. + * This file is generated by the Flutter tool based on the + * plugins that support the Ohos platform. + */ + +const TAG = "GeneratedPluginRegistrant"; + +export class GeneratedPluginRegistrant { + + static registerWith(flutterEngine: FlutterEngine) { + try { + } catch (e) { + Log.e( + TAG, + "Tried to register plugins with FlutterEngine (" + + flutterEngine + + ") failed."); + Log.e(TAG, "Received exception while registering", e); + } + } +} diff --git a/ohos/string_scanner_test/ohos/har/har_product/flutter_embedding.har.debug.10 b/ohos/string_scanner_test/ohos/har/har_product/flutter_embedding.har.debug.10 deleted file mode 100644 index d8e07ca297de2100ce605f8af1126daf6eeb5d8f..0000000000000000000000000000000000000000 Binary files a/ohos/string_scanner_test/ohos/har/har_product/flutter_embedding.har.debug.10 and /dev/null differ diff --git a/ohos/string_scanner_test/ohos/har/har_product/flutter_embedding.har.debug.9 b/ohos/string_scanner_test/ohos/har/har_product/flutter_embedding.har.debug.9 deleted file mode 100644 index f0df4ca0064821178bf4254b16e8d23d873827da..0000000000000000000000000000000000000000 Binary files a/ohos/string_scanner_test/ohos/har/har_product/flutter_embedding.har.debug.9 and /dev/null differ diff --git a/ohos/string_scanner_test/ohos/har/har_product/flutter_embedding.har.release.10 b/ohos/string_scanner_test/ohos/har/har_product/flutter_embedding.har.release.10 deleted file mode 100644 index da9b320a09600f678975b827160441e46144bf08..0000000000000000000000000000000000000000 Binary files a/ohos/string_scanner_test/ohos/har/har_product/flutter_embedding.har.release.10 and /dev/null differ diff --git a/ohos/string_scanner_test/ohos/har/har_product/flutter_embedding.har.release.9 b/ohos/string_scanner_test/ohos/har/har_product/flutter_embedding.har.release.9 deleted file mode 100644 index ba52754a80826e5614438b3faf931ed2f487eaab..0000000000000000000000000000000000000000 Binary files a/ohos/string_scanner_test/ohos/har/har_product/flutter_embedding.har.release.9 and /dev/null differ diff --git a/ohos/string_scanner_test/ohos/har/har_product/libflutter.so.debug.10 b/ohos/string_scanner_test/ohos/har/har_product/libflutter.so.debug.10 deleted file mode 100644 index 8ff0d04141a776e448478791df1e2a1c3aa7c5c4..0000000000000000000000000000000000000000 Binary files a/ohos/string_scanner_test/ohos/har/har_product/libflutter.so.debug.10 and /dev/null differ diff --git a/ohos/string_scanner_test/ohos/har/har_product/libflutter.so.release.10 b/ohos/string_scanner_test/ohos/har/har_product/libflutter.so.release.10 deleted file mode 100644 index 7cdf26180489e807496f02cd4736425b4ad42845..0000000000000000000000000000000000000000 Binary files a/ohos/string_scanner_test/ohos/har/har_product/libflutter.so.release.10 and /dev/null differ diff --git a/ohos/string_scanner_test/ohos/oh-package-lock.json5 b/ohos/string_scanner_test/ohos/oh-package-lock.json5 index 8117ee588b7b4e9899feee78e294b5fbb14fbc3f..b078f7693c70ed0ae65123aa88ffca135d1dc27d 100644 --- a/ohos/string_scanner_test/ohos/oh-package-lock.json5 +++ b/ohos/string_scanner_test/ohos/oh-package-lock.json5 @@ -1,28 +1,27 @@ -/* -* 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. -*/ - { - "lockfileVersion": 1, + "meta": { + "stableOrder": true + }, + "lockfileVersion": 3, "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "specifiers": { + "@ohos/flutter_ohos@har/flutter.har": "@ohos/flutter_ohos@har/flutter.har", "@ohos/hypium@1.0.6": "@ohos/hypium@1.0.6" }, "packages": { + "@ohos/flutter_ohos@har/flutter.har": { + "name": "flutter", + "version": "1.0.0", + "resolved": "har/flutter.har", + "registryType": "local" + }, "@ohos/hypium@1.0.6": { + "name": "@ohos/hypium", + "version": "1.0.6", + "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ==", "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.6.tgz", - "integrity": "sha512-bb3DWeWhYrFqj9mPFV3yZQpkm36kbcK+YYaeY9g292QKSjOdmhEIQR2ULPvyMsgSR4usOBf5nnYrDmaCCXirgQ==" + "shasum": "3f5fed65372633233264b3447705b0831dfe7ea1", + "registryType": "ohpm" } } } \ No newline at end of file diff --git a/ohos/string_scanner_test/ohos/oh-package.json5 b/ohos/string_scanner_test/ohos/oh-package.json5 index a8af3823de9add0ff16aa5b1b10f7db123531cea..40d35a4b6e107682d5f75e4a04216ac77f67cbbb 100644 --- a/ohos/string_scanner_test/ohos/oh-package.json5 +++ b/ohos/string_scanner_test/ohos/oh-package.json5 @@ -1,13 +1,33 @@ +/* +* 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", + "name": "pro", + "version": "1.0.0", + "description": "Please describe the basic information.", + "main": "", + "author": "", "license": "", + "dependencies": { + "@ohos/flutter_ohos": "file:./har/flutter.har" + }, "devDependencies": { "@ohos/hypium": "1.0.6" }, - "author": "", - "name": "apptemplate", - "description": "Please describe the basic information.", - "main": "", - "version": "1.0.0", - "dependencies": {} -} \ No newline at end of file + "overrides": { + "@ohos/flutter_ohos": "file:./har/flutter.har" + } +} diff --git a/ohos/testchat/ohos/AppScope/app.json5 b/ohos/testchat/ohos/AppScope/app.json5 index fa158b5c90812da9f447fa2eb314fb76c6d666ab..5d071bc45417353485e5e92c18fb4c7c3f56b17a 100644 --- a/ohos/testchat/ohos/AppScope/app.json5 +++ b/ohos/testchat/ohos/AppScope/app.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. -*/ { "app": { "bundleName": "com.example.testchat", @@ -21,4 +7,4 @@ "icon": "$media:app_icon", "label": "$string:app_name" } -} +} \ No newline at end of file diff --git a/ohos/testchat/ohos/build-profile.json5 b/ohos/testchat/ohos/build-profile.json5 index 1d12140d202702d7c73d64f1b291fe5c45a660ce..6d9d459831bd1dc0ea9f1fc19119bca36cc257be 100644 --- a/ohos/testchat/ohos/build-profile.json5 +++ b/ohos/testchat/ohos/build-profile.json5 @@ -1,27 +1,25 @@ { - "app": { - "signingConfigs": [], - "products": [ + app: { + signingConfigs: [], + products: [ { - "name": "default", - "signingConfig": "default", - "compatibleSdkVersion": "5.0.0(12)", - "runtimeOS": "HarmonyOS" - } - ] + name: "default", + signingConfig: "default", + compatibleSdkVersion: "5.0.0(12)", + runtimeOS: "HarmonyOS", + }, + ], }, - "modules": [ + modules: [ { - "name": "entry", - "srcPath": "./entry", - "targets": [ + name: "entry", + srcPath: "./entry", + targets: [ { - "name": "default", - "applyToProducts": [ - "default" - ] - } - ] - } - ] -} \ No newline at end of file + name: "default", + applyToProducts: ["default"], + }, + ], + }, + ], +} diff --git a/ohos/testchat/ohos/entry/libs/arm64-v8a/libc++_shared.so b/ohos/testchat/ohos/entry/libs/arm64-v8a/libc++_shared.so deleted file mode 100644 index 831c9353702073d45889352a4dafb93103d67d20..0000000000000000000000000000000000000000 Binary files a/ohos/testchat/ohos/entry/libs/arm64-v8a/libc++_shared.so and /dev/null differ diff --git a/ohos/testchat/ohos/entry/oh-package.json5 b/ohos/testchat/ohos/entry/oh-package.json5 index ab756b7624a009a30db809d7d64c62d84dc7b153..803b25293388deda7b9a05a21b5aeadeb716b4d5 100644 --- a/ohos/testchat/ohos/entry/oh-package.json5 +++ b/ohos/testchat/ohos/entry/oh-package.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. -*/ - { "name": "entry", "version": "1.0.0", @@ -20,8 +5,5 @@ "main": "", "author": "", "license": "", - "dependencies": { - "@ohos/flutter_ohos": "file:../har/flutter_embedding.har" - } -} - + "dependencies": {} +} \ No newline at end of file diff --git a/ohos/testchat/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/ohos/testchat/ohos/entry/src/main/ets/entryability/EntryAbility.ets index e409e57ec4b40b6d3eb073b38bf909f268f4628e..8bc48be8773196f34cccb15cf517f87f5c6b94d2 100644 --- a/ohos/testchat/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/ohos/testchat/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -13,17 +13,12 @@ * limitations under the License. */ -import { FlutterAbility } from '@ohos/flutter_ohos' -import { FlutterPlugin } from '@ohos/flutter_ohos/src/main/ets/embedding/engine/plugins/FlutterPlugin'; +import { FlutterAbility, FlutterEngine } from '@ohos/flutter_ohos'; import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant'; -import List from '@ohos.util.List'; export default class EntryAbility extends FlutterAbility { - onFlutterEngineReady(): void { - super.onFlutterEngineReady() - let plugins = GeneratedPluginRegistrant.getPlugins() as List; - plugins.forEach((plugin) => { - this.addPlugin(plugin); - }) + configureFlutterEngine(flutterEngine: FlutterEngine) { + super.configureFlutterEngine(flutterEngine) + GeneratedPluginRegistrant.registerWith(flutterEngine) } } diff --git a/ohos/testchat/ohos/entry/src/main/ets/pages/Index.ets b/ohos/testchat/ohos/entry/src/main/ets/pages/Index.ets index b53a20c437e96d195487b281e5e95402ea6cb97d..1125f9fdd95f4310a182c1c9e3680f37f73686c9 100644 --- a/ohos/testchat/ohos/entry/src/main/ets/pages/Index.ets +++ b/ohos/testchat/ohos/entry/src/main/ets/pages/Index.ets @@ -16,16 +16,18 @@ import common from '@ohos.app.ability.common'; import { FlutterPage } from '@ohos/flutter_ohos' +let storage = LocalStorage.getShared() const EVENT_BACK_PRESS = 'EVENT_BACK_PRESS' -@Entry +@Entry(storage) @Component struct Index { private context = getContext(this) as common.UIAbilityContext + @LocalStorageLink('viewId') viewId: string = ""; build() { Column() { - FlutterPage() + FlutterPage({ viewId: this.viewId }) } } diff --git a/ohos/testchat/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets b/ohos/testchat/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets index 2131f1f507fed5a6cf54e398e6a66179ee99e27e..40f130cd4ad66fbe957f382dc9d34c384d33341c 100644 --- a/ohos/testchat/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets +++ b/ohos/testchat/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets @@ -13,17 +13,27 @@ * limitations under the License. */ -import { FlutterPlugin } from '@ohos/flutter_ohos/src/main/ets/embedding/engine/plugins/FlutterPlugin'; -import List from '@ohos.util.List'; +import { FlutterEngine, Log } from '@ohos/flutter_ohos'; /** * Generated file. Do not edit. * This file is generated by the Flutter tool based on the * plugins that support the Ohos platform. */ + +const TAG = "GeneratedPluginRegistrant"; + export class GeneratedPluginRegistrant { - static getPlugins(): List { - let pluginList : List = new List(); - return pluginList; + + static registerWith(flutterEngine: FlutterEngine) { + try { + } catch (e) { + Log.e( + TAG, + "Tried to register plugins with FlutterEngine (" + + flutterEngine + + ") failed."); + Log.e(TAG, "Received exception while registering", e); + } } } diff --git a/ohos/testchat/ohos/entry/src/main/resources/en_US/element/string.json b/ohos/testchat/ohos/entry/src/main/resources/en_US/element/string.json index f94595515a99e0c828807e243494f57f09251930..571e05b311864bef8b8344b3171f947b1e0546c0 100644 --- a/ohos/testchat/ohos/entry/src/main/resources/en_US/element/string.json +++ b/ohos/testchat/ohos/entry/src/main/resources/en_US/element/string.json @@ -10,7 +10,7 @@ }, { "name": "EntryAbility_label", - "value": "label" + "value": "test_label" } ] } \ No newline at end of file diff --git a/ohos/testchat/ohos/entry/src/ohosTest/resources/base/element/string.json b/ohos/testchat/ohos/entry/src/ohosTest/resources/base/element/string.json index 65d8fa5a7cf54aa3943dcd0214f58d1771bc1f6c..14f95cec718c7752c8d6843d27fc93eb61558cd2 100644 --- a/ohos/testchat/ohos/entry/src/ohosTest/resources/base/element/string.json +++ b/ohos/testchat/ohos/entry/src/ohosTest/resources/base/element/string.json @@ -10,7 +10,7 @@ }, { "name": "TestAbility_label", - "value": "test label" + "value": "label" } ] } \ No newline at end of file diff --git a/ohos/testchat/ohos/har/har_product/flutter_embedding.har.debug.10 b/ohos/testchat/ohos/har/har_product/flutter_embedding.har.debug.10 deleted file mode 100644 index fb25ab6a0aaa1e99ed0f532214080062b213f8f1..0000000000000000000000000000000000000000 Binary files a/ohos/testchat/ohos/har/har_product/flutter_embedding.har.debug.10 and /dev/null differ diff --git a/ohos/testchat/ohos/har/har_product/flutter_embedding.har.debug.9 b/ohos/testchat/ohos/har/har_product/flutter_embedding.har.debug.9 deleted file mode 100644 index f0df4ca0064821178bf4254b16e8d23d873827da..0000000000000000000000000000000000000000 Binary files a/ohos/testchat/ohos/har/har_product/flutter_embedding.har.debug.9 and /dev/null differ diff --git a/ohos/testchat/ohos/har/har_product/flutter_embedding.har.profile.10 b/ohos/testchat/ohos/har/har_product/flutter_embedding.har.profile.10 deleted file mode 100644 index 27a247af9dbf3b48bdaafa7fda931a29bf0d63f0..0000000000000000000000000000000000000000 Binary files a/ohos/testchat/ohos/har/har_product/flutter_embedding.har.profile.10 and /dev/null differ diff --git a/ohos/testchat/ohos/har/har_product/flutter_embedding.har.release.10 b/ohos/testchat/ohos/har/har_product/flutter_embedding.har.release.10 deleted file mode 100644 index 708cb2d4846a781cabcaefc6400e4746dc5e49fa..0000000000000000000000000000000000000000 Binary files a/ohos/testchat/ohos/har/har_product/flutter_embedding.har.release.10 and /dev/null differ diff --git a/ohos/testchat/ohos/har/har_product/flutter_embedding.har.release.9 b/ohos/testchat/ohos/har/har_product/flutter_embedding.har.release.9 deleted file mode 100644 index ba52754a80826e5614438b3faf931ed2f487eaab..0000000000000000000000000000000000000000 Binary files a/ohos/testchat/ohos/har/har_product/flutter_embedding.har.release.9 and /dev/null differ diff --git a/ohos/testchat/ohos/har/har_product/libflutter.so.debug.10 b/ohos/testchat/ohos/har/har_product/libflutter.so.debug.10 deleted file mode 100644 index ef3d6df293ac7ca140f005c9f07c29e29a5c4d5b..0000000000000000000000000000000000000000 Binary files a/ohos/testchat/ohos/har/har_product/libflutter.so.debug.10 and /dev/null differ diff --git a/ohos/testchat/ohos/har/har_product/libflutter.so.profile.10 b/ohos/testchat/ohos/har/har_product/libflutter.so.profile.10 deleted file mode 100644 index e167f9ac1b6b5ab60bea76af24a5fd8e77be16ff..0000000000000000000000000000000000000000 Binary files a/ohos/testchat/ohos/har/har_product/libflutter.so.profile.10 and /dev/null differ diff --git a/ohos/testchat/ohos/har/har_product/libflutter.so.release.10 b/ohos/testchat/ohos/har/har_product/libflutter.so.release.10 deleted file mode 100644 index 0f36ca0904405844d13d9d2a80a7cc315ac74239..0000000000000000000000000000000000000000 Binary files a/ohos/testchat/ohos/har/har_product/libflutter.so.release.10 and /dev/null differ diff --git a/ohos/testchat/ohos/oh-package.json5 b/ohos/testchat/ohos/oh-package.json5 index 8b0a0be108647f00bf48aa1f04f65471ee8513df..50b80505c2bb200b8221b5d7137da06e4bc49b4e 100644 --- a/ohos/testchat/ohos/oh-package.json5 +++ b/ohos/testchat/ohos/oh-package.json5 @@ -1,3 +1,18 @@ +/* +* 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", "name": "apptemplate", @@ -7,8 +22,12 @@ "author": "", "license": "", "dependencies": { + "@ohos/flutter_ohos": "file:./har/flutter.har" }, "devDependencies": { "@ohos/hypium": "1.0.6" + }, + "overrides": { + "@ohos/flutter_ohos": "file:./har/flutter.har" } -} \ No newline at end of file +}