增加电子签名

lib/base/base_state.dart

@@ -20,11 +20,13 @@ abstract class BaseState<T extends StatefulWidget> extends State<T> {
     String? titleIcon,
     bool autoLeading = true,
     PreferredSizeWidget? bottom,
+    double? toolbarHeight,
   }) {
     return AppBar(
       title: Text(title),
       bottom: bottom,
       automaticallyImplyLeading: autoLeading,
+      toolbarHeight: toolbarHeight,
     );
   }
 

lib/model/rsp/sample_task_rsp.dart

@@ -111,7 +111,7 @@ class SampleTaskItem {
   num? jypzStatus; // 检验品质按钮0显示1不显示
   num? tqqk; // 天气情况
   List<NonghuItem>? codeSamplingNonghuList; // 扦样农户信息
-
+  String? xzqhCode; // 行政区划六位编码
 
   SampleTaskItem({
     this.id,
@@ -199,6 +199,8 @@ class SampleTaskItem {
     this.jyjgxxRespVOList,
     this.jypzStatus,
     this.tqqk,
+    this.codeSamplingNonghuList,
+    this.xzqhCode,
   });
 
   SampleTaskItem createUI() {
@@ -286,7 +288,7 @@ class SampleTaskItem {
     if (nonghuList != null && nonghuList.isNotEmpty) {
       map['codeSamplingNonghuList'] = nonghuList.map((e) => e.toReqJson()).toList();
     }
-
+    map['xzqhCode'] = xzqhCode;
     return map;
   }
 }
@@ -429,20 +431,27 @@ class UseMedicineItem {
     return map;
   }
 }
+
 @JsonSerializable(converters: [NumConverter(), StringConverter()])
 class NonghuItem {
   /// ID
   num? id;
+
   /// 被调查农户或合作社
   String? bdcnhhhzs;
+
   /// 扦样数量（公斤）
   num? qysl;
+
   /// 联系方式
   String? lxfs;
+
   /// 扦样代表数量（公斤）
   num? qydbsl;
+
   /// 收购扦样任务单ID
   num? zjCodeSamplingTaskDetailsSgjcId;
+
   /// 库存扦样任务单ID
   num? zjCodeSamplingTaskDetailsKcjcId;
 
@@ -471,7 +480,6 @@ class NonghuItem {
   }
 }
 
-
 @JsonSerializable(converters: [NumConverter(), StringConverter()])
 class SamplingTaskAllotSgjcItem {
   final num? id; //id

lib/model/rsp/sample_task_rsp.g.dart

@@ -122,10 +122,11 @@ SampleTaskItem _$SampleTaskItemFromJson(Map<String, dynamic> json) =>
           .toList(),
       jypzStatus: const NumConverter().fromJson(json['jypzStatus']),
       tqqk: const NumConverter().fromJson(json['tqqk']),
-    )..codeSamplingNonghuList =
-        (json['codeSamplingNonghuList'] as List<dynamic>?)
-            ?.map((e) => NonghuItem.fromJson(e as Map<String, dynamic>))
-            .toList();
+      codeSamplingNonghuList: (json['codeSamplingNonghuList'] as List<dynamic>?)
+          ?.map((e) => NonghuItem.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      xzqhCode: const StringConverter().fromJson(json['xzqhCode']),
+    );
 
 Map<String, dynamic> _$SampleTaskItemToJson(SampleTaskItem instance) =>
     <String, dynamic>{
@@ -221,6 +222,7 @@ Map<String, dynamic> _$SampleTaskItemToJson(SampleTaskItem instance) =>
       'jypzStatus': const NumConverter().toJson(instance.jypzStatus),
       'tqqk': const NumConverter().toJson(instance.tqqk),
       'codeSamplingNonghuList': instance.codeSamplingNonghuList,
+      'xzqhCode': const StringConverter().toJson(instance.xzqhCode),
     };
 
 EnterpriseItem _$EnterpriseItemFromJson(Map<String, dynamic> json) =>

lib/network/api.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:dio/dio.dart';
 import 'package:lszlgl/model/api_rsp.dart';
 import 'package:lszlgl/model/req/login_req.dart';
@@ -77,4 +79,8 @@ abstract class Api {
     @Query('uLevel') num uLevel, {
     @Query('id') num? id,
   });
+
+  /// 上传图片
+  @POST('/admin-api/infra/file/upload')
+  Future<void> upload(@Part(name: 'path', contentType: 'image/png') File path);
 }

lib/network/api.g.dart

@@ -476,6 +476,37 @@ class _Api implements Api {
     return value;
   }
 
+  @override
+  Future<void> upload(File path) async {
+    const _extra = <String, dynamic>{};
+    final queryParameters = <String, dynamic>{};
+    final _headers = <String, dynamic>{};
+    final _data = FormData();
+    _data.files.add(MapEntry(
+      'path',
+      MultipartFile.fromFileSync(
+        path.path,
+        filename: path.path.split(Platform.pathSeparator).last,
+      ),
+    ));
+    await _dio.fetch<void>(_setStreamType<void>(Options(
+      method: 'POST',
+      headers: _headers,
+      extra: _extra,
+    )
+        .compose(
+          _dio.options,
+          '/admin-api/infra/file/upload',
+          queryParameters: queryParameters,
+          data: _data,
+        )
+        .copyWith(
+            baseUrl: _combineBaseUrls(
+          _dio.options.baseUrl,
+          baseUrl,
+        ))));
+  }
+
   RequestOptions _setStreamType<T>(RequestOptions requestOptions) {
     if (T != dynamic &&
         !(requestOptions.responseType == ResponseType.bytes ||

lib/network/base_dio.dart

@@ -75,7 +75,12 @@ class MyInterceptor extends Interceptor {
     map['url'] = options.uri;
     map['method'] = options.method;
     map['headers'] = options.headers;
-    map['data'] = jsonEncode(options.data);
+
+    if (options.data is List || options.data is Map) {
+      map['data'] = jsonEncode(options.data);
+    } else {
+      map['data'] = options.data.toString();
+    }
     if (options.queryParameters.isNotEmpty) map['queryParameters'] = options.queryParameters;
     if (options.extra.isNotEmpty) map['extra'] = options.extra;
     logger.i('ApiRequest: $map');

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -169,10 +169,12 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
       String district = value['district'] as String;
       String street = value['street'] as String;
       String streetNumber = value['streetNumber'] as String;
+      String adCode = value['adCode'] as String;
       if (province == city) {
         city = district;
         district = '';
       }
+      data?.xzqhCode = adCode;
       // if (value['province'] != data?.sheng) {
       //   MyNavigator.showToast('扦样地点有误，请检查扦样人员所在地点。');
       //   return;

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -76,6 +76,22 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
   }
 
   void submit() async {
+    /*
+    // 去签名
+    List<Uint8List?>? list = await MyRouter.startSignature();
+    if (list == null || list.isEmpty) return;
+    // 字节转文件
+    List<File> fileList = [];
+    for (int i = 0; i < list.length; i++) {
+      fileList.add(await FileUtils.convertUint8ListToFile(list[i]!, 'signatrue_$i.png'));
+    }
+    logger.d('图片:${fileList.map((e) async => await e.length()).toList()}');
+    // 上传图片
+    await MyApi.get().upload(fileList.first);
+    return;
+
+     */
+
     MyNavigator.showLoading();
     // 已分解
     pageStatus.value.data?.state = 2;

lib/page/signature/signature_page.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
+import 'package:signature/signature.dart';
+import 'package:lszlgl/widget/button.dart';
 
 class SignaturePageArgs {
   /// 签名数量
@@ -28,12 +30,82 @@ class SignaturePage extends StatefulWidget {
 }
 
 class _SignaturePageState extends BaseLifecycleState<SignaturePage> {
+  late int count;
+  late List<SignatureController> ctrlList;
+  late PageController pageCtrl;
+
+  final previousEnable = false.notifier<bool>();
+  final nextEnable = false.notifier<bool>();
+  final submitEnable = false.notifier<bool>();
+
+  /// 清除当前签名
+  void clearCurrent() {
+    ctrlList[pageCtrl.page!.toInt()].clear();
+  }
+
+  /// 上一个
+  void previousPage() {
+    pageCtrl.jumpToPage(pageCtrl.page!.toInt() - 1);
+    if (pageCtrl.page == 0) {
+      previousEnable.value = false;
+    }
+    nextEnable.value = true;
+    submitEnable.value = false;
+  }
+
+  /// 下一个
+  void nextPage() {
+    if (!checkCurrentPage()) return;
+    pageCtrl.jumpToPage(pageCtrl.page!.toInt() + 1);
+    if (pageCtrl.page == count - 1) {
+      nextEnable.value = false;
+      submitEnable.value = true;
+    }
+    previousEnable.value = true;
+  }
+
+  void submit() async {
+    if (!checkCurrentPage()) return;
+    // 取出所有签名资源
+    List<Uint8List?> images = [];
+    for (var ctrl in ctrlList) {
+      images.add(await ctrl.toPngBytes());
+    }
+    MyNavigator.pop(images);
+  }
+
+  bool checkCurrentPage() {
+    if (ctrlList[pageCtrl.page!.toInt()].isEmpty) {
+      MyNavigator.showToast('请先签名');
+      return false;
+    }
+    return true;
+  }
+
   @override
   void onInit() {
+    // 强制横屏
     SystemChrome.setPreferredOrientations([
       DeviceOrientation.landscapeLeft,
       DeviceOrientation.landscapeRight,
     ]);
+    // 创建签名列表
+    count = widget.args.count;
+    ctrlList = List.generate(
+      count,
+      (index) => SignatureController(
+        penStrokeWidth: 6,
+        penColor: Colors.black,
+        strokeJoin: StrokeJoin.round,
+        strokeCap: StrokeCap.round,
+      ),
+    ).toList();
+    pageCtrl = PageController();
+    if (count == 1) {
+      submitEnable.value = true;
+    } else {
+      nextEnable.value = true;
+    }
   }
 
   @override
@@ -42,10 +114,82 @@ class _SignaturePageState extends BaseLifecycleState<SignaturePage> {
       DeviceOrientation.portraitUp,
       DeviceOrientation.portraitDown,
     ]);
+    for (var ctrl in ctrlList) {
+      ctrl.dispose();
+    }
   }
 
   @override
   Widget build(BuildContext context) {
-    return const Placeholder();
+    return Scaffold(
+      body: Stack(
+        children: [
+          SizedBox(width: double.infinity, child: Image.asset(imgHomeTopBg, fit: BoxFit.cover)),
+          buildBody(),
+        ],
+      ),
+    );
+  }
+
+  Widget buildBody() {
+    return Column(
+      children: [
+        myAppBar(title: '电子签名', toolbarHeight: 32),
+        Expanded(
+          child: Container(
+            decoration: const BoxDecoration(
+              color: Colors.white,
+            ),
+            width: double.infinity,
+            child: PageView.builder(
+              controller: pageCtrl,
+              physics: const NeverScrollableScrollPhysics(),
+              itemBuilder: (_, index) => Signature(
+                controller: ctrlList[index],
+                backgroundColor: Colors.transparent,
+              ),
+            ),
+          ),
+        ),
+        Row(
+          children: [
+            Expanded(
+              child: MyButton(
+                '清除重写',
+                onTap: clearCurrent,
+                margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+              ),
+            ),
+            previousEnable.builder((v) => v
+                ? Expanded(
+                    child: MyButton(
+                      '上一位',
+                      onTap: previousPage,
+                      margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+                    ),
+                  )
+                : const SizedBox.shrink()),
+            nextEnable.builder((v) => v
+                ? Expanded(
+                    child: MyButton(
+                      '下一位',
+                      onTap: nextPage,
+                      margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+                    ),
+                  )
+                : const SizedBox.shrink()),
+            submitEnable.builder((v) => v
+                ? Expanded(
+                    child: MyButton(
+                      '提交',
+                      onTap: submit,
+                      margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+                    ),
+                  )
+                : const SizedBox.shrink()),
+          ],
+        )
+      ],
+    );
   }
 }

lib/utils/file_utils.dart

@@ -0,0 +1,14 @@
+import 'dart:io';
+import 'dart:typed_data';
+
+import 'package:path_provider/path_provider.dart';
+
+class FileUtils {
+  static Future<File> convertUint8ListToFile(Uint8List data, String fileName) async {
+    final directory = await getApplicationCacheDirectory();
+    final filePath = '${directory.path}/$fileName';
+    final file = File(filePath);
+    await file.writeAsBytes(data);
+    return file;
+  }
+}

pubspec.lock

@@ -33,6 +33,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.3"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.4.10"
   args:
     dependency: transitive
     description:
@@ -403,6 +411,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.9.6+1"
+  flutter_svg:
+    dependency: transitive
+    description:
+      name: flutter_svg
+      sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.10+1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -445,14 +461,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.3.1"
-  hand_signature:
-    dependency: "direct main"
-    description:
-      name: hand_signature
-      sha256: a76d56edd2b31bffb3998937be1c6b1eba98696f6e8d817381260c41da415ede
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "3.0.2"
   http:
     dependency: transitive
     description:
@@ -477,6 +485,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.2"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "4.1.7"
   install_plugin:
     dependency: "direct main"
     description:
@@ -789,6 +805,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.8"
+  pointycastle:
+    dependency: transitive
+    description:
+      name: pointycastle
+      sha256: "79fbafed02cfdbe85ef3fd06c7f4bc2cbcba0177e61b765264853d4253b21744"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.9.0"
   pool:
     dependency: transitive
     description:
@@ -917,6 +941,14 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
+  signature:
+    dependency: "direct main"
+    description:
+      name: signature
+      sha256: d072a766e9a40496296b7593c0d9dee2abded0bdcfb306d9962d0320a9763395
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "5.4.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -1074,6 +1106,30 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.4.0"
+  vector_graphics:
+    dependency: transitive
+    description:
+      name: vector_graphics
+      sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.1.11+1"
+  vector_graphics_codec:
+    dependency: transitive
+    description:
+      name: vector_graphics_codec
+      sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.1.11+1"
+  vector_graphics_compiler:
+    dependency: transitive
+    description:
+      name: vector_graphics_compiler
+      sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.1.11+1"
   vector_math:
     dependency: transitive
     description:

pubspec.yaml

@@ -84,7 +84,7 @@ dependencies:
 #  mobile_scanner: ^5.0.0-beta.3
   qr_code_scanner: ^1.0.1
   # 手写签名
-  hand_signature: ^3.0.2
+  signature: ^5.4.1
 
 dev_dependencies:
   flutter_test: