增加二维码显示、保存相册、扦样列表筛选功能

android/app/src/main/AndroidManifest.xml

@@ -41,7 +41,8 @@
     <application
         android:name="${applicationName}"
         android:icon="@drawable/ic_launcher"
-        android:label="国粮质检">
+        android:label="国粮质检"
+        android:requestLegacyExternalStorage="true">
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

lib/base/base_state.dart

@@ -8,6 +8,10 @@ export 'package:lszlgl/router/my_router.dart';
 export 'package:lszlgl/ext/value_notifier_ext.dart';
 
 abstract class BaseState<T extends StatefulWidget> extends State<T> {
+  EdgeInsets get mediaPadding => MediaQuery.of(context).padding;
+
+  double getBottomPadding(double defaultValue) => mediaPadding.bottom != 0 ? mediaPadding.bottom : defaultValue;
+
   /// 隐藏软键盘
   void hideKeyboard() {
     FocusScopeNode currentFocus = FocusScope.of(context);
@@ -40,11 +44,7 @@ abstract class BaseState<T extends StatefulWidget> extends State<T> {
       body: Stack(
         children: [
           SizedBox(width: double.infinity, child: Image.asset(imgHomeTopBg)),
-          Padding(
-            padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
-            child: child,
-          ),
-           // child,
+          child,
         ],
       ),
     );

lib/model/req/sample_task_list_req.dart

@@ -16,19 +16,27 @@ class SampleTaskListReq {
   /// 环节类型：1收获环节,2库存环节
   int? rwlx;
 
-  /// 采样品种ID集合
-  List<int>? pzIdList;
+  /// 采样品种名称
+  String? cypzName;
+
+  /// 检验指标
+  String? jyzb;
+
+  /// 样品等级
+  int? ypdj;
 
   /// 行政区划
-  String? xzqh;
+  String? qydq;
 
   SampleTaskListReq({
     this.pageNo = 1,
     this.pageSize = 10,
     this.deliveryStatus,
     this.rwlx,
-    this.pzIdList,
-    this.xzqh,
+    this.cypzName,
+    this.jyzb,
+    this.ypdj,
+    this.qydq,
   });
 
   factory SampleTaskListReq.fromJson(Map<String, dynamic> json) => _$SampleTaskListReqFromJson(json);

lib/model/req/sample_task_list_req.g.dart

@@ -12,9 +12,10 @@ SampleTaskListReq _$SampleTaskListReqFromJson(Map<String, dynamic> json) =>
       pageSize: json['pageSize'] as int? ?? 10,
       deliveryStatus: json['deliveryStatus'] as int?,
       rwlx: json['rwlx'] as int?,
-      pzIdList:
-          (json['pzIdList'] as List<dynamic>?)?.map((e) => e as int).toList(),
-      xzqh: json['xzqh'] as String?,
+      cypzName: json['cypzName'] as String?,
+      jyzb: json['jyzb'] as String?,
+      ypdj: json['ypdj'] as int?,
+      qydq: json['qydq'] as String?,
     );
 
 Map<String, dynamic> _$SampleTaskListReqToJson(SampleTaskListReq instance) =>
@@ -23,6 +24,8 @@ Map<String, dynamic> _$SampleTaskListReqToJson(SampleTaskListReq instance) =>
       'pageSize': instance.pageSize,
       'deliveryStatus': instance.deliveryStatus,
       'rwlx': instance.rwlx,
-      'pzIdList': instance.pzIdList,
-      'xzqh': instance.xzqh,
+      'cypzName': instance.cypzName,
+      'jyzb': instance.jyzb,
+      'ypdj': instance.ypdj,
+      'qydq': instance.qydq,
     };

lib/model/rsp/sample_task_rsp.dart

@@ -297,9 +297,10 @@ class SampleTaskItem {
 
 @JsonSerializable()
 class UrlItem {
+  final String? name;
   final String? url;
 
-  const UrlItem({this.url});
+  const UrlItem({this.name,this.url});
 
   factory UrlItem.fromJson(Map<String, dynamic> json) => _$UrlItemFromJson(json);
 

lib/model/rsp/sample_task_rsp.g.dart

@@ -234,10 +234,12 @@ Map<String, dynamic> _$SampleTaskItemToJson(SampleTaskItem instance) =>
     };
 
 UrlItem _$UrlItemFromJson(Map<String, dynamic> json) => UrlItem(
+      name: json['name'] as String?,
       url: json['url'] as String?,
     );
 
 Map<String, dynamic> _$UrlItemToJson(UrlItem instance) => <String, dynamic>{
+      'name': instance.name,
       'url': instance.url,
     };
 

lib/page/filter/filter_page.dart

@@ -24,53 +24,59 @@ class _FilterPageState extends BaseState<FilterPage> {
   late SampleListVM vm;
 
   /// 采样品种
-  List<CardMenuData> cypzList = [];
-  final cypzNames = null.notifier<String?>();
-  List<CardMenuData> selectCypzList = [];
+  final cypzList = <CardMenuData>[].notifier<List<CardMenuData>>();
+  final cypz = null.notifier<CardMenuData?>();
+
+  /// 检验指标
+  final jyzbList = <CardMenuData>[].notifier<List<CardMenuData>>();
+  final jyzb = null.notifier<CardMenuData?>();
+
+  /// 样品等级
+  final ypdjList = <CardMenuData>[].notifier<List<CardMenuData>>();
+  final ypdj = null.notifier<CardMenuData?>();
 
   /// 扦样地区
-  String? xzqh;
+  String? qydq;
 
   void getCypzList() {
-    cypzList = (DictService.getDictList(DictType.cypz) ?? []).map((e) => CardMenuData(e.label, e.value)).toList();
-    if ((vm.reqList.first.pzIdList ?? []).isNotEmpty) {
-      for (var id in vm.reqList.first.pzIdList!) {
-        for (var menu in cypzList) {
-          if (int.parse(menu.value) == id) {
-            menu.select = true;
-            selectCypzList.add(menu);
-            break;
-          }
-        }
+    cypzList.value = (DictService.getDictList(DictType.cypz) ?? []).map((e) => CardMenuData(e.label, e.value)).toList();
+    for (var item in cypzList.value) {
+      if (vm.reqList.first.cypzName == item.name) {
+        cypz.value = item;
+        break;
       }
     }
-    cypzSelCallback(selectCypzList);
   }
 
-  void cypzSelCallback(List<CardMenuData> selectList) async {
-    selectCypzList = selectList;
-    if (selectList.isEmpty) {
-      cypzNames.value = null;
-      return;
+  void getJyzbList() {
+    jyzbList.value = (DictService.getDictList(DictType.jylx) ?? []).map((e) => CardMenuData(e.label, e.value)).toList();
+    if (vm.reqList.first.jyzb == null) return;
+
+    for (var item in jyzbList.value) {
+      if (vm.reqList.first.jyzb == item.name) {
+        jyzb.value = item;
+        break;
+      }
     }
-    var names = StringBuffer();
-    var ids = StringBuffer();
-    for (int i = 0; i < selectList.length; i++) {
-      var item = selectList[i];
-      names.write(item.name);
-      ids.write(item.value);
-      if (i < selectList.length - 1) {
-        names.write(',');
-        ids.write(',');
+  }
+
+  void getYpdjList() {
+    ypdjList.value = (DictService.getDictList(DictType.ypdj) ?? []).map((e) => CardMenuData(e.label, e.value)).toList();
+    if (vm.reqList.first.ypdj == null) return;
+    for (var item in ypdjList.value) {
+      if (vm.reqList.first.ypdj == item.value) {
+        ypdj.value = item;
+        break;
       }
     }
-    cypzNames.value = names.toString();
   }
 
   void onReset() {
     for (var req in vm.reqList) {
-      req.pzIdList = null;
-      req.xzqh = null;
+      req.cypzName = null;
+      req.jyzb = null;
+      req.ypdj = null;
+      req.qydq = null;
     }
     vm.refreshAll();
     MyNavigator.pop();
@@ -78,8 +84,10 @@ class _FilterPageState extends BaseState<FilterPage> {
 
   void onConfirm() {
     for (var req in vm.reqList) {
-      req.pzIdList = selectCypzList.map((e) => int.parse(e.value)).toList();
-      req.xzqh = xzqh;
+      req.cypzName = cypz.value?.name;
+      req.jyzb = jyzb.value?.name;
+      req.ypdj = ypdj.value == null ? null : int.parse(ypdj.value!.value);
+      req.qydq = qydq;
     }
     vm.refreshAll();
     MyNavigator.pop();
@@ -92,12 +100,15 @@ class _FilterPageState extends BaseState<FilterPage> {
 
     // 采样品种
     getCypzList();
-    xzqh = vm.reqList.first.xzqh;
+    // 检验指标
+    getJyzbList();
+    // 样品等级
+    getYpdjList();
+    qydq = vm.reqList.first.qydq;
   }
 
   @override
   void dispose() {
-    cypzNames.dispose();
     super.dispose();
   }
 
@@ -111,27 +122,40 @@ class _FilterPageState extends BaseState<FilterPage> {
           mainAxisSize: MainAxisSize.min,
           children: [
             buildTitle(),
-            cypzNames.builder(
-              (v) => CardWidgets.buildMenuDialog(
-                false,
-                '采样品种',
-                v,
-                cypzList,
-                cypzSelCallback,
-                multiple: true,
-                showTopLine: true,
-                hint: '请选择',
-              ),
+            CardWidgets.buildMenu(
+              false,
+              '采样品种',
+              cypzList,
+              cypz,
+              (_, sel) {},
+              hint: '请选择',
+            ),
+            CardWidgets.buildMenu(
+              false,
+              '检验指标',
+              jyzbList,
+              jyzb,
+              (_, sel) {},
+              hint: '请选择',
+            ),
+            CardWidgets.buildMenu(
+              false,
+              '样品等级',
+              ypdjList,
+              ypdj,
+              (_, sel) {},
+              hint: '请选择',
             ),
             CardWidgets.buildEdit(
               false,
               '扦样地区',
-              xzqh,
-              onChanged: (value) => xzqh = value,
-              hint: '请输入（模糊查询）',
+              qydq,
+              onChanged: (value) => qydq = value,
+              hint: '请输入',
+              bottomLine: false,
             ),
             Padding(
-              padding: const EdgeInsets.only(top: 64, bottom: 48, left: 16, right: 16),
+              padding: EdgeInsets.only(left: 16, right: 16, top: 64, bottom: getBottomPadding(12)),
               child: Row(
                 children: [
                   Expanded(child: MyButton('重置', onTap: onReset)),

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -1,9 +1,11 @@
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:flutter/cupertino.dart';
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
+import 'package:image_gallery_saver/image_gallery_saver.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/config/colors.dart';
 import 'package:lszlgl/model/rsp/sample_task_rsp.dart';
@@ -142,6 +144,61 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
     ];
   }
 
+  /// 查看二维码
+  void startQRCode() {
+    UrlItem picInfo = pageStatus.value.data!.ewmfilePictureList!.first;
+    MyNavigator.showDialog(
+      builder: (_) => Container(
+        padding: const EdgeInsets.all(16),
+        margin: const EdgeInsets.all(24),
+        decoration: const BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.all(Radius.circular(24)),
+        ),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            CachedNetworkImage(
+              width: double.infinity,
+              fit: BoxFit.cover,
+              imageUrl: picInfo.url!,
+              placeholder: (_, __) => const Center(child: CircularProgressIndicator()),
+              errorWidget: (context, url, error) => const Center(child: Icon(Icons.error)),
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(vertical: 16),
+              child: Text(
+                picInfo.name ?? '',
+                style: const TextStyle(fontSize: 16, color: MyColor.c_333333),
+              ),
+            ),
+            Row(
+              children: [
+                const Expanded(child: MyButton('打印')),
+                const SizedBox(width: 16),
+                Expanded(child: MyButton('保存图片', onTap: savePic)),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  void savePic() async {
+    MyNavigator.showLoading(msg: '保存中...');
+    var response = await Dio().get(
+        'https://gd-hbimg.huaban.com/c7a22fb15d70a0a976e20fb810c048ec11c76fc31ac08-hajElf_fw658webp',
+        options: Options(responseType: ResponseType.bytes));
+    final result = await ImageGallerySaver.saveImage(Uint8List.fromList(response.data), quality: 60, name: "hello");
+    MyNavigator.dismiss();
+    if (result['isSuccess']) {
+      MyNavigator.showToast('保存成功');
+    } else {
+      MyNavigator.showToast('保存失败');
+    }
+  }
+
   @override
   void initState() {
     super.initState();
@@ -281,10 +338,13 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
 
   Widget buildButton() {
     Widget child;
-    EdgeInsets margin = const EdgeInsets.symmetric(horizontal: 16, vertical: 12);
+    EdgeInsets margin = EdgeInsets.only(left: 16, right: 16, top: 12, bottom: getBottomPadding(12));
     if (args.detail) {
       child = Row(
         children: [
+          (pageStatus.value.data?.ewmfilePictureList ?? []).isEmpty
+              ? const SizedBox.shrink()
+              : Expanded(child: MyButton('查看二维码', onTap: startQRCode, margin: margin)),
           Expanded(child: MyButton('重新录入', onTap: startEdit, margin: margin)),
         ],
       );

lib/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart

@@ -111,7 +111,7 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
     });
   }
 
-  void onRemove(NonghuItem item) async {
+  void onRemove(int index, NonghuItem item) async {
     var delete = await showDialog(
       context: context,
       builder: (_) => AlertDialog(
@@ -163,6 +163,9 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
       if (menu.value == data?.tqqk) tqqk.value = menu;
       return menu;
     }).toList();
+    if (!isDetail && (data?.codeSamplingNonghuList ?? []).isEmpty) {
+      data?.codeSamplingNonghuList = [NonghuItem()];
+    }
   }
 
   @override
@@ -239,7 +242,7 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
   Widget buildNonghu(int index, NonghuItem item) {
     bool detail = item.id != null;
     return GestureDetector(
-      onLongPress: detail ? null : () => onRemove(item),
+      onLongPress: detail ? null : () => onRemove(index, item),
       child: Container(
         clipBehavior: Clip.hardEdge,
         decoration: const BoxDecoration(
@@ -247,62 +250,44 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
           borderRadius: BorderRadius.all(Radius.circular(8)),
         ),
         margin: const EdgeInsets.only(left: 12, right: 12, top: 8),
-        child: IntrinsicHeight(
-          child: Row(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Container(
-                color: const Color(0xFF3ACEE6),
-                alignment: Alignment.center,
-                padding: const EdgeInsets.symmetric(horizontal: 2),
-                child: Text(
-                  '${index + 1}',
-                  style: const TextStyle(color: Colors.white, fontSize: 12, fontWeight: FontWeight.w700),
-                ),
-              ),
-              Expanded(
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    CardWidgets.buildEdit(
-                      detail,
-                      '扦样数量（公斤）',
-                      item.qysl?.toString(),
-                      inputType: const TextInputType.numberWithOptions(decimal: true),
-                      formatters: [XNumberTextInputFormatter()],
-                      onChanged: (value) => item.qysl = value.isEmpty ? null : num.parse(value),
-                      backgroundColor: null,
-                    ),
-                    CardWidgets.buildEdit(
-                      detail,
-                      '扦样代表数量（公斤）',
-                      item.qydbsl?.toString(),
-                      inputType: const TextInputType.numberWithOptions(decimal: true),
-                      formatters: [XNumberTextInputFormatter()],
-                      onChanged: (value) => item.qydbsl = value.isEmpty ? null : num.parse(value),
-                      backgroundColor: null,
-                    ),
-                    CardWidgets.buildEdit(
-                      detail,
-                      '被调查农户或合作社',
-                      item.bdcnhhhzs,
-                      onChanged: (value) => item.bdcnhhhzs = value,
-                      backgroundColor: null,
-                    ),
-                    CardWidgets.buildEdit(
-                      detail,
-                      '联系方式',
-                      inputType: TextInputType.number,
-                      item.lxfs,
-                      onChanged: (value) => item.lxfs = value,
-                      backgroundColor: null,
-                      bottomLine: false,
-                    ),
-                  ],
-                ),
-              ),
-            ],
-          ),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            CardWidgets.buildEdit(
+              detail,
+              '扦样数量（公斤）',
+              item.qysl?.toString(),
+              inputType: const TextInputType.numberWithOptions(decimal: true),
+              formatters: [XNumberTextInputFormatter()],
+              onChanged: (value) => item.qysl = value.isEmpty ? null : num.parse(value),
+              backgroundColor: null,
+            ),
+            CardWidgets.buildEdit(
+              detail,
+              '扦样代表数量（公斤）',
+              item.qydbsl?.toString(),
+              inputType: const TextInputType.numberWithOptions(decimal: true),
+              formatters: [XNumberTextInputFormatter()],
+              onChanged: (value) => item.qydbsl = value.isEmpty ? null : num.parse(value),
+              backgroundColor: null,
+            ),
+            CardWidgets.buildEdit(
+              detail,
+              '被调查农户或合作社',
+              item.bdcnhhhzs,
+              onChanged: (value) => item.bdcnhhhzs = value,
+              backgroundColor: null,
+            ),
+            CardWidgets.buildEdit(
+              detail,
+              '联系方式',
+              inputType: TextInputType.number,
+              item.lxfs,
+              onChanged: (value) => item.lxfs = value,
+              backgroundColor: null,
+              bottomLine: false,
+            ),
+          ],
         ),
       ),
     );

lib/page/signature/signature_page.dart

@@ -151,44 +151,22 @@ class _SignaturePageState extends BaseLifecycleState<SignaturePage> {
             ),
           ),
         ),
-        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()),
-          ],
-        )
+        buildBottom(),
+      ],
+    );
+  }
+
+  Widget buildBottom() {
+    EdgeInsets margin = EdgeInsets.only(left: 8, right: 8, top: 8, bottom: getBottomPadding(8));
+    return Row(
+      children: [
+        Expanded(child: MyButton('清除重写', onTap: clearCurrent, margin: margin)),
+        previousEnable.builder(
+            (v) => v ? Expanded(child: MyButton('上一位', onTap: previousPage, margin: margin)) : const SizedBox.shrink()),
+        nextEnable.builder(
+            (v) => v ? Expanded(child: MyButton('下一位', onTap: nextPage, margin: margin)) : const SizedBox.shrink()),
+        submitEnable.builder(
+            (v) => v ? Expanded(child: MyButton('提交', onTap: submit, margin: margin)) : const SizedBox.shrink()),
       ],
     );
   }

lib/service/dict_service.dart

@@ -26,7 +26,9 @@ enum DictType {
   // 重金属污染类型
   zjswrlx('zjswrlx'),
   // 采样品种
-  cypz('cypz');
+  cypz('cypz'),
+  // 检验类型
+  jylx('jylx');
 
   const DictType(this.type);
 

lib/widget/card_item.dart

@@ -414,14 +414,17 @@ class CardWidgets {
     ValueNotifier<CardMenuData?> selNotifier,
     void Function(ValueNotifier<CardMenuData?>, CardMenuData)? onSelectTap, {
     String? hint,
+    bool showTopLine = false,
+    bool bottomLine = true,
   }) {
     if (isDetail) {
       return selNotifier.builder(
         (v) => CardItemWidget(
           title,
           rightText: v?.name,
-          bottomLine: true,
+          bottomLine: bottomLine,
           hint: hint,
+          showTopLine: showTopLine,
         ),
       );
     }
@@ -430,8 +433,9 @@ class CardWidgets {
       listNotifier,
       selNotifier,
       onSelectTap: onSelectTap,
-      bottomLine: true,
+      bottomLine: bottomLine,
       hint: hint,
+      showTopLine: showTopLine,
     );
   }
 }

pubspec.yaml

@@ -87,6 +87,8 @@ dependencies:
   signature: ^5.4.1
   # loading集合
   flutter_spinkit: ^5.2.1
+  # 保存到相册
+  image_gallery_saver: ^2.0.3
 
 dev_dependencies:
   flutter_test: