diff --git a/flutter_smart_agriculture/lib/utils/AssetsUtil.dart b/flutter_smart_agriculture/lib/utils/AssetsUtil.dart index ac0b3a24d4ce9432c41c70e724fbce3bb16981b7..5889dfdb525d07b9e41e4730ce38b73fdb7a7b50 100644 --- a/flutter_smart_agriculture/lib/utils/AssetsUtil.dart +++ b/flutter_smart_agriculture/lib/utils/AssetsUtil.dart @@ -42,6 +42,8 @@ String getWeatherAsset(String? type) { image = "assets/images/weather_hrain.png"; break; case "大雪": + case "中雪": + case "小雪": image = "assets/images/weather_hsnow.png"; break; case "阴": diff --git a/flutter_smart_agriculture/ohos/.gitignore b/flutter_smart_agriculture/ohos/.gitignore index bab37d29ed84869718d4d6ad439eb2a2fe269bb4..72ed18417197d1266224f9845747eb744d136cca 100644 --- a/flutter_smart_agriculture/ohos/.gitignore +++ b/flutter_smart_agriculture/ohos/.gitignore @@ -10,4 +10,5 @@ /.clang-tidy **/.test /entry/src/main/resources/rawfile/flutter_assets -/har/flutter_embedding.har \ No newline at end of file +/har/flutter_embedding.har +oh-package-lock.json5 \ No newline at end of file diff --git a/flutter_smart_agriculture/ohos/build-profile.json5 b/flutter_smart_agriculture/ohos/build-profile.json5 index 26733084878869ff8adf5e2c3bae5e8339978508..e8c7d7eb0de5e1a65194730cc12e2a4c3d3e4a92 100644 --- a/flutter_smart_agriculture/ohos/build-profile.json5 +++ b/flutter_smart_agriculture/ohos/build-profile.json5 @@ -20,8 +20,8 @@ { "name": "default", "signingConfig": "default", - "compileSdkVersion": "4.0.0(10)", - "compatibleSdkVersion": "4.0.0(10)", + "compileSdkVersion": "4.1.0(11)", + "compatibleSdkVersion": "4.1.0(11)", "runtimeOS": "HarmonyOS", } ] diff --git a/flutter_smart_agriculture/ohos/dependencies/hvigor-3.0.9-s.tgz b/flutter_smart_agriculture/ohos/dependencies/hvigor-3.1.0-s.tgz similarity index 61% rename from flutter_smart_agriculture/ohos/dependencies/hvigor-3.0.9-s.tgz rename to flutter_smart_agriculture/ohos/dependencies/hvigor-3.1.0-s.tgz index 65b0d24f94d2aecc1099f8f8220beec695bfb779..db5e00ee455145d45b7f4bc2a708559b6c2d1413 100644 Binary files a/flutter_smart_agriculture/ohos/dependencies/hvigor-3.0.9-s.tgz and b/flutter_smart_agriculture/ohos/dependencies/hvigor-3.1.0-s.tgz differ diff --git a/flutter_smart_agriculture/ohos/dependencies/hvigor-ohos-arkui-x-plugin-2.1.7-s.tgz b/flutter_smart_agriculture/ohos/dependencies/hvigor-ohos-arkui-x-plugin-2.1.7-s.tgz deleted file mode 100644 index 233a449cbfef6be702d861744254dd89ce633fb7..0000000000000000000000000000000000000000 Binary files a/flutter_smart_agriculture/ohos/dependencies/hvigor-ohos-arkui-x-plugin-2.1.7-s.tgz and /dev/null differ diff --git a/flutter_smart_agriculture/ohos/dependencies/hvigor-ohos-plugin-3.0.9-s.tgz b/flutter_smart_agriculture/ohos/dependencies/hvigor-ohos-plugin-3.1.0-s.tgz similarity index 44% rename from flutter_smart_agriculture/ohos/dependencies/hvigor-ohos-plugin-3.0.9-s.tgz rename to flutter_smart_agriculture/ohos/dependencies/hvigor-ohos-plugin-3.1.0-s.tgz index e2e499e18dfcd05e1e275579d11697640eb80323..2d50659b9337bd217434a62e8af619ffea7c0120 100644 Binary files a/flutter_smart_agriculture/ohos/dependencies/hvigor-ohos-plugin-3.0.9-s.tgz and b/flutter_smart_agriculture/ohos/dependencies/hvigor-ohos-plugin-3.1.0-s.tgz differ diff --git a/flutter_smart_agriculture/ohos/dependencies/rollup.tgz b/flutter_smart_agriculture/ohos/dependencies/rollup.tgz deleted file mode 100644 index b224a37a5f69fd22f58c7a28151742eafe7e6317..0000000000000000000000000000000000000000 Binary files a/flutter_smart_agriculture/ohos/dependencies/rollup.tgz and /dev/null differ diff --git a/flutter_smart_agriculture/ohos/entry/.gitignore b/flutter_smart_agriculture/ohos/entry/.gitignore index 2795a1c5b1fe53659dd1b71d90ba0592eaf7e043..e3a761178211f8ec0a31841bd634f6f01f7b9145 100644 --- a/flutter_smart_agriculture/ohos/entry/.gitignore +++ b/flutter_smart_agriculture/ohos/entry/.gitignore @@ -4,4 +4,5 @@ /.preview /build /.cxx -/.test \ No newline at end of file +/.test +/libs/arm64-v8a/libflutter.so \ No newline at end of file diff --git a/flutter_smart_agriculture/ohos/entry/libs/arm64-v8a/libflutter.so b/flutter_smart_agriculture/ohos/entry/libs/arm64-v8a/libflutter.so deleted file mode 100755 index 04aaf444e4c73c52023c5eb4429d54a412e58833..0000000000000000000000000000000000000000 Binary files a/flutter_smart_agriculture/ohos/entry/libs/arm64-v8a/libflutter.so and /dev/null differ diff --git a/flutter_smart_agriculture/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/flutter_smart_agriculture/ohos/entry/src/main/ets/entryability/EntryAbility.ets index 321a4eeaacd7b8079a876e25c4dafd498e4d9fb9..2e8bccd7799b9c1b2c57afa029a60b94fcc3dd0d 100644 --- a/flutter_smart_agriculture/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/flutter_smart_agriculture/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -13,10 +13,11 @@ * limitations under the License. */ -import { FlutterAbility } from '@ohos/flutter_ohos' +import { FlutterAbility } from '@ohos/flutter_ohos'; +import FlutterEngine from '@ohos/flutter_ohos/src/main/ets/embedding/engine/FlutterEngine'; export default class EntryAbility extends FlutterAbility { - onFlutterEngineReady(): void { - super.onFlutterEngineReady() + configureFlutterEngine(flutterEngine: FlutterEngine) { + super.configureFlutterEngine(flutterEngine); } } diff --git a/flutter_smart_agriculture/ohos/entry/src/main/ets/pages/Index.ets b/flutter_smart_agriculture/ohos/entry/src/main/ets/pages/Index.ets index b53a20c437e96d195487b281e5e95402ea6cb97d..744c7f861f09ff9e36a96199ba16ae362c4002bb 100644 --- a/flutter_smart_agriculture/ohos/entry/src/main/ets/pages/Index.ets +++ b/flutter_smart_agriculture/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' -const EVENT_BACK_PRESS = 'EVENT_BACK_PRESS' +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/flutter_smart_agriculture/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets b/flutter_smart_agriculture/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets new file mode 100644 index 0000000000000000000000000000000000000000..2131f1f507fed5a6cf54e398e6a66179ee99e27e --- /dev/null +++ b/flutter_smart_agriculture/ohos/entry/src/main/ets/plugins/GeneratedPluginRegistrant.ets @@ -0,0 +1,29 @@ +/* +* 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 { FlutterPlugin } from '@ohos/flutter_ohos/src/main/ets/embedding/engine/plugins/FlutterPlugin'; +import List from '@ohos.util.List'; + +/** + * Generated file. Do not edit. + * This file is generated by the Flutter tool based on the + * plugins that support the Ohos platform. + */ +export class GeneratedPluginRegistrant { + static getPlugins(): List { + let pluginList : List = new List(); + return pluginList; + } +} diff --git a/flutter_smart_agriculture/ohos/hvigor/hvigor-config.json5 b/flutter_smart_agriculture/ohos/hvigor/hvigor-config.json5 index 0675e04dd09ab349dcc8cab2ff11f12187c6f26b..1b90ea24c97254582d5ef7f554fe798da84ed3a9 100644 --- a/flutter_smart_agriculture/ohos/hvigor/hvigor-config.json5 +++ b/flutter_smart_agriculture/ohos/hvigor/hvigor-config.json5 @@ -14,9 +14,8 @@ */ { - "hvigorVersion": "file:../dependencies/hvigor-3.0.9-s.tgz", + "hvigorVersion": "file:../dependencies/hvigor-3.1.0-s.tgz", "dependencies": { - "@ohos/hvigor-ohos-plugin": "file:../dependencies/hvigor-ohos-plugin-3.0.9-s.tgz", - "rollup": "file:../dependencies/rollup.tgz", + "@ohos/hvigor-ohos-plugin": "file:../dependencies/hvigor-ohos-plugin-3.1.0-s.tgz", } } \ No newline at end of file