diff --git a/ohos/testpicture/lib/main.dart b/ohos/testpicture/lib/main.dart index fbc4305e7bad434bb96fe03cb106786f59affc2b..33779c2aad5fda24c6a484798f05bc2f0ba29313 100644 --- a/ohos/testpicture/lib/main.dart +++ b/ohos/testpicture/lib/main.dart @@ -42,92 +42,7 @@ class MyApp extends StatelessWidget { primarySwatch: Colors.blue, ), home: const PicturePage(), - // home: const MyHomePage(title: 'Flutter Demo Home Page'), ); } } -class MyHomePage extends StatefulWidget { - const MyHomePage({super.key, required this.title}); - - // This widget is the home page of your application. It is stateful, meaning - // that it has a State object (defined below) that contains fields that affect - // how it looks. - - // This class is the configuration for the state. It holds the values (in this - // case the title) provided by the parent (in this case the App widget) and - // used by the build method of the State. Fields in a Widget subclass are - // always marked "final". - - final String title; - - @override - State createState() => _MyHomePageState(); -} - -class _MyHomePageState extends State { - int _counter = 0; - - void _incrementCounter() { - setState(() { - // This call to setState tells the Flutter framework that something has - // changed in this State, which causes it to rerun the build method below - // so that the display can reflect the updated values. If we changed - // _counter without calling setState(), then the build method would not be - // called again, and so nothing would appear to happen. - _counter++; - }); - } - - @override - Widget build(BuildContext context) { - // This method is rerun every time setState is called, for instance as done - // by the _incrementCounter method above. - // - // The Flutter framework has been optimized to make rerunning build methods - // fast, so that you can just rebuild anything that needs updating rather - // than having to individually change instances of widgets. - return Scaffold( - appBar: AppBar( - // Here we take the value from the MyHomePage object that was created by - // the App.build method, and use it to set our appbar title. - title: Text(widget.title), - ), - body: Center( - // Center is a layout widget. It takes a single child and positions it - // in the middle of the parent. - child: Column( - // Column is also a layout widget. It takes a list of children and - // arranges them vertically. By default, it sizes itself to fit its - // children horizontally, and tries to be as tall as its parent. - // - // Invoke "debug painting" (press "p" in the console, choose the - // "Toggle Debug Paint" action from the Flutter Inspector in Android - // Studio, or the "Toggle Debug Paint" command in Visual Studio Code) - // to see the wireframe for each widget. - // - // Column has various properties to control how it sizes itself and - // how it positions its children. Here we use mainAxisAlignment to - // center the children vertically; the main axis here is the vertical - // axis because Columns are vertical (the cross axis would be - // horizontal). - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Text( - 'You have pushed the button this many times:', - ), - Text( - '$_counter', - style: Theme.of(context).textTheme.headlineMedium, - ), - ], - ), - ), - floatingActionButton: FloatingActionButton( - onPressed: _incrementCounter, - tooltip: 'Increment', - child: const Icon(Icons.add), - ), // This trailing comma makes auto-formatting nicer for build methods. - ); - } -} diff --git a/ohos/testpicture/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/ohos/testpicture/ohos/entry/src/main/ets/entryability/EntryAbility.ets index cc5315a56f92fa0bf0a7f4ed062e1dfd8a5a638e..783ebe4f4a6c9c35dc1030f0a0278d8fc31b38d2 100644 --- a/ohos/testpicture/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/ohos/testpicture/ohos/entry/src/main/ets/entryability/EntryAbility.ets @@ -14,19 +14,14 @@ */ import { FlutterAbility } from '@ohos/flutter_ohos' -import { FlutterPlugin } from '@ohos/flutter_ohos/src/main/ets/embedding/engine/plugins/FlutterPlugin'; import { GeneratedPluginRegistrant } from '../plugins/GeneratedPluginRegistrant'; -import List from '@ohos.util.List'; import FlutterEngine from '@ohos/flutter_ohos/src/main/ets/embedding/engine/FlutterEngine'; import { PicturePlugin } from '../pictureplugin/PicturePlugin'; export default class EntryAbility extends FlutterAbility { configureFlutterEngine(flutterEngine: FlutterEngine) { super.configureFlutterEngine(flutterEngine) - let plugins = GeneratedPluginRegistrant.getPlugins() as List; - plugins.forEach((plugin) => { - this.addPlugin(plugin); - }) + GeneratedPluginRegistrant.registerWith(flutterEngine) this.addPlugin(new PicturePlugin()); } } diff --git a/ohos/testpicture/ohos/oh-package.json5 b/ohos/testpicture/ohos/oh-package.json5 index 0fbdbba945b95f604e8b66b68edbc4e9703444af..c29a29a6ea295b682cf503bb4fb1fbc4fa813246 100644 --- a/ohos/testpicture/ohos/oh-package.json5 +++ b/ohos/testpicture/ohos/oh-package.json5 @@ -25,5 +25,8 @@ }, "devDependencies": { "@ohos/hypium": "1.0.6" + }, + "overrides": { + "@ohos/flutter_ohos": "file:./har/flutter.har" } }