Merge branch 'master' into dev

* master:
  登录接口增加平台类型参数;
  修改版本号:v0.0.14
  扦样详情页面增加查看二维码和查看签名，去掉重新录入按钮；
  修改扦样列表样品层级和检验指标为空时不显示；
  修复筛选页面的样品等级不回显问题
  增加扫描二维码；
  修改扦样单申请页底部按钮外边距;

# Conflicts:
#	lib/router/my_router.dart

lib/model/req/login_req.dart

@@ -7,9 +7,13 @@ class LoginReq {
   final String? username;
   final String? password;
 
+  /// 登录平台: 0=web 1=app
+  final int? platform;
+
   const LoginReq({
     this.username,
     this.password,
+    this.platform = 1,
   });
 
   factory LoginReq.fromJson(Map<String, dynamic> json) => _$LoginReqFromJson(json);

lib/model/req/login_req.g.dart

@@ -9,9 +9,11 @@ part of 'login_req.dart';
 LoginReq _$LoginReqFromJson(Map<String, dynamic> json) => LoginReq(
       username: json['username'] as String?,
       password: json['password'] as String?,
+      platform: json['platform'] as int? ?? 1,
     );
 
 Map<String, dynamic> _$LoginReqToJson(LoginReq instance) => <String, dynamic>{
       'username': instance.username,
       'password': instance.password,
+      'platform': instance.platform,
     };

lib/page/filter/filter_page.dart

@@ -64,7 +64,7 @@ class _FilterPageState extends BaseState<FilterPage> {
     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) {
+      if (vm.reqList.first.ypdj == int.parse(item.value)) {
         ypdj.value = item;
         break;
       }

lib/page/home/home_page.dart

@@ -48,6 +48,7 @@ class _HomePageState extends BaseState<HomePage> with AutomaticKeepAliveClientMi
           title: '质量安全检验监测',
           autoLeading: false,
           naviBarColor: Colors.white,
+          actions: [buildScan()],
         ),
         Expanded(
           child: SingleChildScrollView(
@@ -68,6 +69,18 @@ class _HomePageState extends BaseState<HomePage> with AutomaticKeepAliveClientMi
     );
   }
 
+  Widget buildScan() {
+    return GestureDetector(
+      onTap: MyRouter.startQrCodeScan,
+      behavior: HitTestBehavior.opaque,
+      child: Container(
+        padding: const EdgeInsets.symmetric(horizontal: 16),
+        alignment: Alignment.center,
+        child: const Text('扫一扫', style: TextStyle(fontSize: 14, color: Colors.white)),
+      ),
+    );
+  }
+
   Widget buildBanner() {
     return Container(
       margin: const EdgeInsets.symmetric(horizontal: 12),

lib/page/qrcode_scan/qrcode_scan_page.dart

@@ -0,0 +1,129 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_task_page.dart';
+import 'package:qr_code_scanner/qr_code_scanner.dart';
+
+import '../../base/base_lifecycle_state.dart';
+import '../../widget/button.dart';
+
+class QrCodeScanPage extends StatefulWidget {
+  const QrCodeScanPage({super.key});
+
+  @override
+  State<QrCodeScanPage> createState() => _QrCodeScanPageState();
+}
+
+class _QrCodeScanPageState extends BaseLifecycleState<QrCodeScanPage> {
+  final GlobalKey qrKey = GlobalKey(debugLabel: 'QR');
+  Barcode? result;
+  QRViewController? controller;
+
+  void _onQRViewCreated(QRViewController controller) {
+    this.controller = controller;
+    controller.scannedDataStream.listen((scanData) {
+      debugPrint('code:${scanData.code} format:${scanData.format} rawBytes:${scanData.rawBytes}');
+      controller.pauseCamera();
+      parseCode(scanData);
+    });
+  }
+
+  void parseCode(Barcode data) {
+    String code = data.code ?? '';
+    if (code.isEmpty) {
+      showErrorDialog('内容为空，请扫描正确二维码');
+      return;
+    }
+    // 121.36.17.6:19090/admin-api/zj/code-sampling-task-details-sgjc/getSamplingTaskDetails?id=47106
+    List<String> split = code.split('?');
+    if (!code.contains('?') || split.length <= 1 || !split[0].contains('/')) {
+      showErrorDialog(code);
+      return;
+    }
+    String api = split[0].split('/').last;
+
+    Map<String, String> params = {};
+    for (String value in split[1].split('&')) {
+      List<String> kv = value.split('=');
+      params[kv[0]] = kv[1];
+    }
+
+    switch (api) {
+      case 'getSamplingTaskDetails':
+        // 收获扦样详情
+        if (params['id'] == null) {
+          showErrorDialog(code);
+          return;
+        }
+        MyRouter.startReapSampleTask(
+          args: ReapSampleTaskPageArgs(id: num.parse(params['id']!), detail: true),
+          replace: true,
+        );
+      default:
+        showErrorDialog(code);
+    }
+  }
+
+  void showErrorDialog(String msg) async {
+    await showDialog(
+      context: context,
+      builder: (_) => AlertDialog(
+        title: Text(msg),
+        actions: [MyButton('确定', alignment: null, onTap: () => MyNavigator.pop())],
+      ),
+    );
+    controller?.resumeCamera();
+  }
+
+  // In order to get hot reload to work we need to pause the camera if the platform
+  // is android, or resume the camera if the platform is iOS.
+  @override
+  void reassemble() {
+    super.reassemble();
+    if (Platform.isAndroid) {
+      controller!.pauseCamera();
+    } else if (Platform.isIOS) {
+      controller!.resumeCamera();
+    }
+  }
+
+  @override
+  void dispose() {
+    controller?.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return myScaffold(child: buildBody());
+  }
+
+  Widget buildBody() {
+    return Column(
+      children: [
+        myAppBar(
+          title: '扫一扫',
+          actions: [buildFlash()],
+        ),
+        Expanded(
+          child: QRView(
+            key: qrKey,
+            onQRViewCreated: _onQRViewCreated,
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget buildFlash() {
+    return GestureDetector(
+      onTap: () => controller?.toggleFlash(),
+      behavior: HitTestBehavior.opaque,
+      child: Container(
+        padding: const EdgeInsets.symmetric(horizontal: 16),
+        alignment: Alignment.center,
+        child: const Text('闪光灯', style: TextStyle(fontSize: 14, color: Colors.white)),
+      ),
+    );
+  }
+}

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -1,16 +1,22 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:typed_data';
 import 'package:amap_flutter_location/amap_location_option.dart';
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:card_swiper/card_swiper.dart';
 import 'package:flutter/material.dart';
+import 'package:image_gallery_saver/image_gallery_saver.dart';
 import 'package:lszlgl/main.dart';
 import 'package:lszlgl/utils/input_formatter.dart';
 import 'package:lszlgl/utils/location_utils.dart';
 import 'package:lszlgl/widget/button.dart';
 import '../../../base/base_lifecycle_state.dart';
+import '../../../config/colors.dart';
 import '../../../model/rsp/dict_rsp.dart';
 import '../../../model/rsp/sample_task_rsp.dart';
 import '../../../network/my_api.dart';
 import '../../../service/user_service.dart';
+import '../../../utils/file_utils.dart';
 import '../../../widget/card_item.dart';
 
 /// 收获扦样-基础信息
@@ -274,6 +280,115 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     name.value = names.toString();
   }
 
+  void showSignature() {
+    if (data?.filePictureList?.isEmpty ?? true) {
+      MyNavigator.showToast('没有电子签名');
+      return;
+    }
+    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: AspectRatio(
+          aspectRatio: 1 / 1,
+          child: Swiper(
+            itemCount: data!.filePictureList!.length,
+            itemBuilder: (_, index) => CachedNetworkImage(
+              fit: BoxFit.contain,
+              imageUrl: data!.filePictureList![index].url ?? '',
+              placeholder: (_, __) => const Center(child: CircularProgressIndicator()),
+              errorWidget: (context, url, error) => const Center(child: Icon(Icons.error)),
+            ),
+            viewportFraction: 0.8,
+            scale: 0.9,
+            fade: 0.0,
+            loop: false,
+            pagination: const FractionPaginationBuilder(color: Colors.grey),
+            // control: const SwiperControl(padding: EdgeInsets.zero, size: 25),
+          ),
+        ),
+      ),
+    );
+  }
+
+  GlobalKey ewmKey = GlobalKey();
+
+  /// 查看二维码
+  void showQRCode() {
+    if (data?.ewmfilePictureList?.isEmpty ?? true) {
+      MyNavigator.showToast('没有二维码');
+      return;
+    }
+    UrlItem picInfo = 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: [
+            RepaintBoundary(
+              key: ewmKey,
+              child: Container(
+                color: Colors.white,
+                child: Column(
+                  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: 18, color: MyColor.c_333333),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+            Row(
+              children: [
+                const Expanded(child: MyButton('打印')),
+                const SizedBox(width: 16),
+                Expanded(child: MyButton('保存图片', onTap: () => savePic(picInfo.name))),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  void savePic(String? name) async {
+    MyNavigator.showLoading(msg: '保存中...');
+    Uint8List? bytes = await FileUtils.getBitmapFromContext(ewmKey.currentContext);
+    if (bytes == null) {
+      MyNavigator.dismiss();
+      MyNavigator.showToast('保存失败');
+      return;
+    }
+    final result = await ImageGallerySaver.saveImage(bytes, quality: 60, name: name);
+    MyNavigator.dismiss();
+    if (result['isSuccess']) {
+      MyNavigator.showToast('保存成功');
+    } else {
+      MyNavigator.showToast('保存失败');
+    }
+  }
+
   @override
   bool get wantKeepAlive => true;
 
@@ -358,6 +473,23 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
           trxx,
           (_, sel) => data?.trdllx = sel.value,
         ),
+        isDetail
+            ? CardItemWidget(
+                '电子签名',
+                rightText: '点击查看',
+                bottomLine: true,
+                onTap: showSignature,
+              )
+            : const SizedBox.shrink(),
+        isDetail
+            ? CardItemWidget(
+                '样品二维码',
+                rightText: '点击查看',
+                bottomLine: true,
+                onTap: showQRCode,
+              )
+            : const SizedBox.shrink(),
+
         // CardWidgets.buildEdit(
         //   isDetail,
         //   '被调查农户或合作社',

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -149,7 +149,7 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
   GlobalKey ewmKey = GlobalKey();
 
   /// 查看二维码
-  void startQRCode() {
+  void showQRCode() {
     UrlItem picInfo = pageStatus.value.data!.ewmfilePictureList!.first;
     MyNavigator.showDialog(
       builder: (_) => Container(
@@ -370,17 +370,12 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
 
   Widget buildButton() {
     Widget child;
-    EdgeInsets margin = EdgeInsets.only(left: 8, right: 8, top: 12, bottom: getBottomPadding(12));
+    EdgeInsets margin = EdgeInsets.only(left: 4, right: 4, top: 12, bottom: getBottomPadding(12));
     Widget ewmWidget = (pageStatus.value.data?.ewmfilePictureList ?? []).isEmpty
         ? const SizedBox.shrink()
-        : Expanded(child: MyButton('查看二维码', onTap: startQRCode, margin: margin));
+        : Expanded(child: MyButton('查看二维码', onTap: showQRCode, margin: margin));
     if (args.detail) {
-      child = Row(
-        children: [
-          ewmWidget,
-          Expanded(child: MyButton('重新录入', onTap: startEdit, margin: margin)),
-        ],
-      );
+      child = Row(children: [ewmWidget]);
     } else {
       child = tabIndex.builder((v) {
         // 第一页

lib/page/sample_task/sample_task_list_page.dart

@@ -203,12 +203,14 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
     List<Map<String, String?>> infoList = [];
     if (item.deliveryStatus != 2) {
       // 未扦样
-      infoList.addAll([
-        {'采样品种': item.cypzName},
-        {'检验指标': item.jyzb},
-        {'样品等级': DictService.getDict(DictType.ypdj, value: item.ypdj)?.label},
-        {'扦样地区': item.qydq},
-      ]);
+      infoList.add({'采样品种': item.cypzName});
+      if (item.jyzb != null) {
+        infoList.add({'检验指标': item.jyzb});
+      }
+      infoList.add({'扦样地区': item.qydq});
+      if (item.ypdj != null) {
+        infoList.add({'样品层级': DictService.getDict(DictType.ypdj, value: item.ypdj)?.label});
+      }
     } else {
       // 已扦样
       infoList.addAll([
@@ -216,7 +218,7 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
         {'扦样地区': item.qydq},
       ]);
       if (item.ypdj != null) {
-        infoList.add({'样品等级': DictService.getDict(DictType.ypdj, value: item.ypdj)?.label});
+        infoList.add({'样品层级': DictService.getDict(DictType.ypdj, value: item.ypdj)?.label});
       }
       if (item.jyzb != null) {
         infoList.add({'检验指标': item.jyzb});

lib/page/sample_task/stock_sample_detail/stock_sample_task_page.dart

@@ -252,32 +252,29 @@ class _StockSampleTaskPageState extends BaseLifecycleState<StockSampleTaskPage>
   }
 
   Widget buildButton() {
-    Widget child;
-    if (args.detail) {
-      child = MyButton('重新录入', onTap: startEdit);
-    } else {
-      child = tabIndex.builder((v) {
-        // 第一页
-        if (v == 0) return MyButton('下一步', onTap: next);
-        // 最后一页
-        if (v == tabTextList.length - 1) {
-          return Row(
-            children: [
-              Expanded(flex: 2, child: MyButton('上一步', onTap: previous)),
-              const Spacer(flex: 1),
-              Expanded(flex: 2, child: MyButton('提交', onTap: submit)),
-            ],
-          );
-        }
+    if (args.detail) return const SizedBox.shrink();
+    Widget child = tabIndex.builder((v) {
+      // 第一页
+      if (v == 0) return MyButton('下一步', onTap: next);
+      // 最后一页
+      if (v == tabTextList.length - 1) {
         return Row(
           children: [
             Expanded(flex: 2, child: MyButton('上一步', onTap: previous)),
             const Spacer(flex: 1),
-            Expanded(flex: 2, child: MyButton('下一步', onTap: next)),
+            Expanded(flex: 2, child: MyButton('提交', onTap: submit)),
           ],
         );
-      });
-    }
+      }
+      return Row(
+        children: [
+          Expanded(flex: 2, child: MyButton('上一步', onTap: previous)),
+          const Spacer(flex: 1),
+          Expanded(flex: 2, child: MyButton('下一步', onTap: next)),
+        ],
+      );
+    });
+
     return Container(
       color: const Color(0xFFF1F7F6),
       padding: const EdgeInsets.all(12),

lib/router/my_router.dart

@@ -1,3 +1,4 @@
+import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/page/login/login_page.dart';
 import 'package:lszlgl/page/main_tab_page.dart';
 import 'package:lszlgl/page/print/connect_print_page.dart';
@@ -9,6 +10,7 @@ import 'package:lszlgl/page/user_center/change_pwd_page.dart';
 import 'package:lszlgl/page/user_center/setting_page.dart';
 import 'package:lszlgl/router/my_navigator.dart';
 
+import '../page/qrcode_scan/qrcode_scan_page.dart';
 import '../page/sample_task/stock_sample_detail/stock_sample_task_page.dart';
 import '../page/signature/signature_page.dart';
 
@@ -34,6 +36,8 @@ const rSignaturePage = '/SignaturePage';
 const rPrintPage = '/PrintPage';
 // 连接
 const rConnectPrintPage = '/ConnectPrintPage';
+// 扫一扫
+const rQrCodeScanPage = '/QrCodeScanPage';
 
 final Map<String, MyNavigatorBuilder> rRouteMap = {
   // 根页面
@@ -48,6 +52,7 @@ final Map<String, MyNavigatorBuilder> rRouteMap = {
   rSignaturePage: (context, args) => SignaturePage(args: args as SignaturePageArgs),
   rPrintPage: (context, args) => PrintPage(args: args as PrintPageArgs),
   rConnectPrintPage: (context, args) => ConnectPrintPage(args: args as ConnectPrintPageArgs),
+  rQrCodeScanPage: (context, args) => const QrCodeScanPage(),
 };
 
 class MyRouter {
@@ -92,8 +97,13 @@ class MyRouter {
   }
 
   /// 收获扦样任务
-  static Future<dynamic> startReapSampleTask({ReapSampleTaskPageArgs? args}) async {
-    return MyNavigator.push(rReapSampleTaskPage, args: args ?? ReapSampleTaskPageArgs());
+  static Future<dynamic> startReapSampleTask({ReapSampleTaskPageArgs? args, bool replace = false}) async {
+    args ??= ReapSampleTaskPageArgs();
+    if (replace) {
+      return MyNavigator.pushReplace(rReapSampleTaskPage, args: args);
+    } else {
+      return MyNavigator.push(rReapSampleTaskPage, args: args);
+    }
   }
 
   /// 库存扦样任务
@@ -114,5 +124,8 @@ class MyRouter {
   /// 打印任务
   static Future<dynamic> startConnectPrint({ConnectPrintPageArgs? args}) {
     return MyNavigator.push(rConnectPrintPage, args: args ?? ConnectPrintPageArgs());
+  /// 扫一扫
+  static Future<dynamic> startQrCodeScan() {
+    return MyNavigator.push(rQrCodeScanPage);
   }
 }

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.0.13+13
+version: 0.0.14+14
 
 environment:
   sdk: '>=3.1.5 <4.0.0'