一些代码迁移

lib/src/custom_qrcode_builder.dart

@@ -0,0 +1,101 @@
+import 'dart:async';
+import 'dart:ui' as ui;
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+// ignore: directives_ordering
+import 'package:fis_lib_qrcode/qr_flutter.dart';
+import 'package:fis_ui/index.dart';
+
+class CustomFutureBuilder<T> extends StatefulWidget implements FWidget {
+  /// Creates a widget that builds itself based on the latest snapshot of
+  /// interaction with a [Future].
+  ///
+  /// The [builder] must not be null.
+  const CustomFutureBuilder({
+    Key? key,
+    this.future,
+    this.initialData,
+    required this.builder,
+  })  : assert(builder != null),
+        super(key: key);
+
+  final Future<T>? future;
+  final AsyncWidgetBuilder<T> builder;
+  final T? initialData;
+  static bool debugRethrowError = false;
+
+  @override
+  State<CustomFutureBuilder<T>> createState() => _CustomFutureBuilderState<T>();
+}
+
+class _CustomFutureBuilderState<T> extends State<CustomFutureBuilder<T>> {
+  /// An object that identifies the currently active callbacks. Used to avoid
+  /// calling setState from stale callbacks, e.g. after disposal of this state,
+  /// or after widget reconfiguration to a new Future.
+  Object? _activeCallbackIdentity;
+  late AsyncSnapshot<T> _snapshot;
+
+  @override
+  void initState() {
+    super.initState();
+    _snapshot = widget.initialData == null
+        ? AsyncSnapshot<T>.nothing()
+        : AsyncSnapshot<T>.withData(
+            ConnectionState.none, widget.initialData as T);
+    _subscribe();
+  }
+
+  @override
+  void didUpdateWidget(CustomFutureBuilder<T> oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.future != widget.future) {
+      if (_activeCallbackIdentity != null) {
+        _unsubscribe();
+        _snapshot = _snapshot.inState(ConnectionState.none);
+      }
+      _subscribe();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) => widget.builder(context, _snapshot);
+
+  @override
+  void dispose() {
+    _unsubscribe();
+    super.dispose();
+  }
+
+  void _subscribe() {
+    if (widget.future != null) {
+      final Object callbackIdentity = Object();
+      _activeCallbackIdentity = callbackIdentity;
+      widget.future!.then<void>((T data) {
+        if (_activeCallbackIdentity == callbackIdentity) {
+          setState(() {
+            _snapshot = AsyncSnapshot<T>.withData(ConnectionState.done, data);
+          });
+        }
+      }, onError: (Object error, StackTrace stackTrace) {
+        if (_activeCallbackIdentity == callbackIdentity) {
+          setState(() {
+            _snapshot = AsyncSnapshot<T>.withError(
+                ConnectionState.done, error, stackTrace);
+          });
+        }
+        assert(() {
+          if (FutureBuilder.debugRethrowError) {
+            Future<Object>.error(error, stackTrace);
+          }
+          return true;
+        }());
+      });
+      _snapshot = _snapshot.inState(ConnectionState.waiting);
+    }
+  }
+
+  void _unsubscribe() {
+    _activeCallbackIdentity = null;
+  }
+}

lib/src/qrcode_withlogo.dart

@@ -0,0 +1,102 @@
+import 'dart:async';
+import 'dart:html';
+import 'dart:ui' as ui;
+
+import 'package:fis_lib_qrcode/src/custom_qrcode_builder.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+// ignore: directives_ordering
+import 'package:fis_lib_qrcode/qr_flutter.dart';
+import 'package:fis_ui/index.dart';
+import 'package:flutter/services.dart';
+
+/// 带logo的二维码
+class QRCodeWithLogo extends StatefulWidget implements FWidget {
+  final String qrData;
+  final String? codeStatement;
+  final String? operationStatement;
+  final void Function()? operationSuccessCallback;
+
+  QRCodeWithLogo(
+    this.qrData, {
+    this.codeStatement = "QRCodeStatement",
+    this.operationStatement = "QRCodeOperationStatement",
+    this.operationSuccessCallback,
+  });
+  @override
+  _QRCodeWithLogoState createState() => _QRCodeWithLogoState();
+}
+
+class _QRCodeWithLogoState extends State<QRCodeWithLogo> {
+  @override
+  Widget build(BuildContext context) {
+    final qrFutureBuilder = CustomFutureBuilder<ui.Image>(
+      future: _loadOverlayImage(),
+      builder: (ctx, snapshot) {
+        final size = 280.0;
+        if (!snapshot.hasData) {
+          return Container(width: size, height: size);
+        }
+        return CustomPaint(
+          size: Size.square(size),
+          painter: QrPainter(
+            data: widget.qrData,
+            version: QrVersions.auto,
+            eyeStyle: const QrEyeStyle(
+              eyeShape: QrEyeShape.square,
+              color: Colors.black,
+            ),
+            dataModuleStyle: const QrDataModuleStyle(
+              dataModuleShape: QrDataModuleShape.square,
+              color: Colors.black,
+            ),
+            // size: 320.0,
+            embeddedImage: snapshot.data,
+            embeddedImageStyle: QrEmbeddedImageStyle(
+              size: Size.square(60),
+            ),
+          ),
+        );
+      },
+    );
+
+    return Material(
+      color: Colors.white,
+      child: FContainer(
+        width: 160,
+        child: FColumn(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            qrFutureBuilder,
+            FPadding(
+              padding: EdgeInsets.symmetric(vertical: 20, horizontal: 40)
+                  .copyWith(bottom: 5),
+              child: FText(widget.codeStatement!),
+            ),
+            FInk(
+              decoration: UnderlineTabIndicator(
+                  borderSide: BorderSide(color: Colors.blue),
+                  insets: EdgeInsets.fromLTRB(0, 0, 0, 1)),
+              child: FInkWell(
+                  child: FText(
+                    widget.operationStatement!,
+                    style: TextStyle(color: Colors.blue),
+                  ),
+                  onTap: () => {
+                        Clipboard.setData(ClipboardData(text: widget.qrData)),
+                        widget.operationSuccessCallback?.call()
+                      }),
+            )
+          ],
+        ),
+      ),
+    );
+  }
+
+  Future<ui.Image> _loadOverlayImage() async {
+    final completer = Completer<ui.Image>();
+    final byteData = await rootBundle.load('assets/images/4.0x/flyinsono.png');
+    ui.decodeImageFromList(byteData.buffer.asUint8List(), completer.complete);
+    return completer.future;
+  }
+}

pubspec.yaml

@@ -1,4 +1,4 @@
-name: fis_lib_qrflutter
+name: fis_lib_qrcode
 description: >
   QR.Flutter is a Flutter library for simple and fast QR code rendering via a
   Widget or custom painter.
@@ -9,6 +9,24 @@ environment:
   sdk: ">=2.12.0 <3.0.0"
   flutter: ">=1.16.0"
 
+dependency_overrides:
+  fis_common:
+    git:
+      url: http://git.ius.plus:88/Project-Wing/fis_lib_common.git
+      ref: 63dcf70026
+  fis_ui:
+    git:
+      url: http://git.ius.plus:88/Project-Wing/fis_lib_ui.git
+      ref: 147958b2d3
+  fis_jsonrpc:
+    git:
+      url: http://git.ius.plus:88/Project-Wing/fis_lib_jsonrpc.git
+      ref: e5cf2c6c0ccabb1706ad859c031d698345848d5d
+    #  path: ../fis_lib_report
+  vid:
+    git:
+      url: http://git.ius.plus:88/Project-Wing/flutter_vid
+      ref: 54343a18f3 
 dependencies:
   flutter:
     sdk: flutter

qrcode/lib/main.dart

@@ -4,7 +4,7 @@
  * See LICENSE for distribution and usage details.
  */
 
-import 'package:example/qrcode_withlogo.dart';
+import 'package:fis_lib_qrtest/qrcode_withlogo.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 

qrcode/lib/qrcode_withlogo.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:html';
 import 'dart:ui' as ui;
 
-import 'package:example/custom_qrcode_builder.dart';
+import 'package:fis_lib_qrtest/custom_qrcode_builder.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 // ignore: directives_ordering

qrcode/pubspec.yaml

@@ -1,4 +1,4 @@
-name: fis_lib_qrcode
+name: fis_lib_qrtest
 description: >
   The QR.Flutter example app.
 version: 2.0.0

qrcode/test/widget_test.dart

@@ -5,7 +5,7 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
-import 'package:example/main.dart';
+import 'package:fis_lib_qrtest/main.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';