增加电子签名上传;

.gitignore

@@ -73,7 +73,6 @@ unlinked_spec.ds
 **/android/local.properties
 **/android/**/GeneratedPluginRegistrant.java
 **/android/key.properties
-*.jks
 
 # iOS/XCode related
 **/ios/**/*.mode1v3

lib/model/rsp/sample_task_rsp.dart

@@ -112,6 +112,7 @@ class SampleTaskItem {
   num? tqqk; // 天气情况
   List<NonghuItem>? codeSamplingNonghuList; // 扦样农户信息
   String? xzqhCode; // 行政区划六位编码
+  List<String>? filePictureList; // 签名图片url
 
   SampleTaskItem({
     this.id,
@@ -201,6 +202,7 @@ class SampleTaskItem {
     this.tqqk,
     this.codeSamplingNonghuList,
     this.xzqhCode,
+    this.filePictureList,
   });
 
   SampleTaskItem createUI() {
@@ -286,6 +288,7 @@ class SampleTaskItem {
     if (nonghuList != null && nonghuList.isNotEmpty) {
       map['codeSamplingNonghuList'] = nonghuList.map((e) => e.toReqJson()).toList();
     }
+    map['filePictureList'] = filePictureList;
     return map;
   }
 }

lib/model/rsp/sample_task_rsp.g.dart

@@ -126,6 +126,9 @@ SampleTaskItem _$SampleTaskItemFromJson(Map<String, dynamic> json) =>
           ?.map((e) => NonghuItem.fromJson(e as Map<String, dynamic>))
           .toList(),
       xzqhCode: const StringConverter().fromJson(json['xzqhCode']),
+      filePictureList: (json['filePictureList'] as List<dynamic>?)
+          ?.map((e) => e as String)
+          .toList(),
     );
 
 Map<String, dynamic> _$SampleTaskItemToJson(SampleTaskItem instance) =>
@@ -223,6 +226,7 @@ Map<String, dynamic> _$SampleTaskItemToJson(SampleTaskItem instance) =>
       'tqqk': const NumConverter().toJson(instance.tqqk),
       'codeSamplingNonghuList': instance.codeSamplingNonghuList,
       'xzqhCode': const StringConverter().toJson(instance.xzqhCode),
+      'filePictureList': instance.filePictureList,
     };
 
 EnterpriseItem _$EnterpriseItemFromJson(Map<String, dynamic> json) =>

lib/network/api.dart

@@ -82,5 +82,5 @@ abstract class Api {
 
   /// 上传图片
   @POST('/admin-api/infra/file/upload')
-  Future<void> upload(@Part(name: 'path') File path);
+  Future<ApiRsp<String?>> upload(@Part(name: 'file') File file);
 }

lib/network/api.g.dart

@@ -477,34 +477,40 @@ class _Api implements Api {
   }
 
   @override
-  Future<void> upload(File path) async {
+  Future<ApiRsp<String?>> upload(File file) async {
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _headers = <String, dynamic>{};
     final _data = FormData();
     _data.files.add(MapEntry(
-      'path',
+      'file',
       MultipartFile.fromFileSync(
-        path.path,
-        filename: path.path.split(Platform.pathSeparator).last,
+        file.path,
+        filename: file.path.split(Platform.pathSeparator).last,
       ),
     ));
-    await _dio.fetch<void>(_setStreamType<void>(Options(
+    final _result = await _dio
+        .fetch<Map<String, dynamic>>(_setStreamType<ApiRsp<String>>(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,
-        ))));
+            .compose(
+              _dio.options,
+              '/admin-api/infra/file/upload',
+              queryParameters: queryParameters,
+              data: _data,
+            )
+            .copyWith(
+                baseUrl: _combineBaseUrls(
+              _dio.options.baseUrl,
+              baseUrl,
+            ))));
+    final value = ApiRsp<String?>.fromJson(
+      _result.data!,
+      (json) => json as String?,
+    );
+    return value;
   }
 
   RequestOptions _setStreamType<T>(RequestOptions requestOptions) {

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -1,3 +1,6 @@
+import 'dart:io';
+import 'dart:typed_data';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
@@ -8,10 +11,12 @@ import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_disaster_
 import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_medicine_detail_page.dart';
 import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_org_detail_page.dart';
 import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart';
+import 'package:lszlgl/page/signature/signature_page.dart';
 
 import '../../../base/base_vm.dart';
 import '../../../main.dart';
 import '../../../network/my_api.dart';
+import '../../../utils/file_utils.dart';
 import '../../../widget/button.dart';
 import '../../../widget/page_widget.dart';
 
@@ -76,27 +81,26 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
   }
 
   void submit() async {
-    /*
+    SampleTaskItem req = (pageStatus.value.data ?? SampleTaskItem());
     // 去签名
-    List<Uint8List?>? list = await MyRouter.startSignature();
+    var args = SignaturePageArgs(count: req.dgryName?.split(',').length ?? 0);
+    List<Uint8List?>? list = await MyRouter.startSignature(args: args);
     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;
-
-     */
+    var rspList = await Future.wait(fileList.map((file) => MyApi.get().upload(file)));
+    logger.d('图片url:${rspList.map((e) => e.data)}');
+    req.filePictureList = rspList.map((e) => e.data ?? '').toList();
 
     MyNavigator.showLoading();
     // 已分解
     pageStatus.value.data?.state = 2;
     try {
-      var rsp = await MyApi.get().updateSampleTaskSgjc((pageStatus.value.data ?? SampleTaskItem()).getReqJson());
+      var rsp = await MyApi.get().updateSampleTaskSgjc(req.getReqJson());
       if (!mounted) return;
       if (rsp.data ?? false) {
         MyNavigator.showToast('提交成功');

lib/widget/loading_widget.dart

@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_spinkit/flutter_spinkit.dart';
+
+class LoadingWidget extends StatelessWidget {
+  const LoadingWidget({Key? key, required this.msg}) : super(key: key);
+
+  ///loading msg
+  final String msg;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 30, vertical: 20),
+      decoration: BoxDecoration(
+        color: Colors.black,
+        borderRadius: BorderRadius.circular(15),
+      ),
+      child: Column(mainAxisSize: MainAxisSize.min, children: [
+        //loading animation
+        const SpinKitCircle(
+          color: Colors.white,
+        ),
+        //msg
+        Container(
+          margin: const EdgeInsets.only(top: 20),
+          child: Text(msg, style: const TextStyle(color: Colors.white)),
+        ),
+      ]),
+    );
+  }
+}

pubspec.yaml

@@ -85,6 +85,8 @@ dependencies:
   qr_code_scanner: ^1.0.1
   # 手写签名
   signature: ^5.4.1
+  # loading集合
+  flutter_spinkit: ^5.2.1
 
 dev_dependencies:
   flutter_test: