diff --git a/ohos/testcamera/lib/main.dart b/ohos/testcamera/lib/main.dart index 411e6ee7f0481392dae4f0bec8ffb19a53b9981d..be1e3f32e35108d6602ff969a6a57528b18166cb 100644 --- a/ohos/testcamera/lib/main.dart +++ b/ohos/testcamera/lib/main.dart @@ -42,92 +42,6 @@ class MyApp extends StatelessWidget { primarySwatch: Colors.blue, ), home: const CameraPage(), - // 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/testcamera/ohos/entry/src/main/ets/entryability/EntryAbility.ets b/ohos/testcamera/ohos/entry/src/main/ets/entryability/EntryAbility.ets index 2bfdc7e0cd5fd8627c7e8cfcaf415dc4f7db6562..4ab705ae06816e2605de8ca0205e01899ca4b3c1 100644 --- a/ohos/testcamera/ohos/entry/src/main/ets/entryability/EntryAbility.ets +++ b/ohos/testcamera/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 { CameraPlugin } from '../cameraplugin/CameraPlugin'; 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 CameraPlugin()); } } diff --git a/ohos/testcamera/ohos/hvigor/hvigor-config.json5 b/ohos/testcamera/ohos/hvigor/hvigor-config.json5 index 3b49b04cedb43e28fc032cd52daa2d1f304bdc91..2701bc230418fb38fa03d410a4041c442a67156c 100644 --- a/ohos/testcamera/ohos/hvigor/hvigor-config.json5 +++ b/ohos/testcamera/ohos/hvigor/hvigor-config.json5 @@ -17,21 +17,5 @@ "hvigorVersion": "4.0.2", "dependencies": { "@ohos/hvigor-ohos-plugin": "4.0.2" - }, - "execution": { - // "analyze": "default", /* Define the build analyze mode. Value: [ "default" | "verbose" | false ]. Default: "default" */ - // "daemon": true, /* Enable daemon compilation. Value: [ true | false ]. Default: true */ - // "incremental": true, /* Enable incremental compilation. Value: [ true | false ]. Default: true */ - // "parallel": true, /* Enable parallel compilation. Value: [ true | false ]. Default: true */ - // "typeCheck": false, /* Enable typeCheck. Value: [ true | false ]. Default: false */ - }, - "logging": { - // "level": "info" /* Define the log level. Value: [ "debug" | "info" | "warn" | "error" ]. Default: "info" */ - }, - "debugging": { - // "stacktrace": false /* Disable stacktrace compilation. Value: [ true | false ]. Default: false */ - }, - "nodeOptions": { - // "maxOldSpaceSize": 4096 /* Enable nodeOptions maxOldSpaceSize compilation. Unit M. Used for the daemon process */ } } diff --git a/ohos/testcamera/ohos/oh-package.json5 b/ohos/testcamera/ohos/oh-package.json5 index 0fbdbba945b95f604e8b66b68edbc4e9703444af..c29a29a6ea295b682cf503bb4fb1fbc4fa813246 100644 --- a/ohos/testcamera/ohos/oh-package.json5 +++ b/ohos/testcamera/ohos/oh-package.json5 @@ -25,5 +25,8 @@ }, "devDependencies": { "@ohos/hypium": "1.0.6" + }, + "overrides": { + "@ohos/flutter_ohos": "file:./har/flutter.har" } }