android/app/src/main/res/layout/toast_custom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:layout_marginStart="50dp"
+    android:layout_marginEnd="50dp">
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="#CC000000"
+        android:paddingStart="16dp"
+        android:paddingTop="10dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="10dp"
+        android:textStyle="bold"
+        android:textColor="#FFFFFF"
+        tools:text="Toast should be short." />
+</FrameLayout>

lib/config/pics.dart

@@ -23,6 +23,8 @@ const String imgHomeListBg = 'assets/images/home_list_bg.webp';
 const String imgHomeListPzjc = 'assets/images/home_list_pzjc.webp';
 // 首页列表整仓检验
 const String imgHomeListZcjy = 'assets/images/home_list_zcjy.webp';
+// 首页扫一扫
+const String imgHomeScan = 'assets/images/home_scan.webp';
 
 // 用户中心账户
 const String imgUserCenterAccount = 'assets/images/user_center_account.webp';
@@ -34,6 +36,12 @@ const String imgItemArrowRight = 'assets/images/item_arrow_right.webp';
 // 列表项下箭头
 const String imgItemArrowDown = 'assets/images/item_arrow_down.webp';
 
+// 扫一扫 返回
+const String imgScanBack = 'assets/images/scan_back.webp';
+// 扫一扫 闪光灯
+const String imgScanFlash= 'assets/images/scan_flash.webp';
+// 扫一扫 扫描中
+const String imgScanScanning= 'assets/images/scan_scanning.webp';
 
 // 搜索图标
 const String imgBleSearch = 'assets/images/search_ble.png';

lib/main.dart

@@ -64,6 +64,7 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    var theme = Theme.of(context);
     return MaterialApp(
       title: '粮食质量管理${kReleaseMode ? '' : '-测试'}',
       theme: ThemeData(
@@ -78,11 +79,24 @@ class MyApp extends StatelessWidget {
           backgroundColor: Colors.transparent,
           systemOverlayStyle: SystemUiOverlayStyle.light,
         ),
-        bottomSheetTheme: const BottomSheetThemeData(
+        bottomSheetTheme: theme.bottomSheetTheme.copyWith(
           backgroundColor: Colors.white,
           modalBackgroundColor: Colors.white,
           surfaceTintColor: Colors.white,
         ),
+        dialogTheme: theme.dialogTheme.copyWith(
+          backgroundColor: Colors.white,
+          surfaceTintColor: Colors.white,
+          titleTextStyle: const TextStyle(
+            fontSize: 16,
+            color: MyColor.c_333333,
+            fontWeight: FontWeight.w500,
+          ),
+          contentTextStyle: const TextStyle(
+            fontSize: 14,
+            color: MyColor.c_666666,
+          ),
+        ),
         useMaterial3: true,
       ),
       builder: FlutterSmartDialog.init(),

lib/model/num_converter.dart

@@ -1,5 +1,7 @@
 import 'package:json_annotation/json_annotation.dart';
 
+import '../main.dart';
+
 /// Json解析num类型
 class NumConverter extends JsonConverter<num?, dynamic> {
   const NumConverter();
@@ -13,6 +15,7 @@ class NumConverter extends JsonConverter<num?, dynamic> {
       try {
         return num.parse(json);
       } catch (e) {
+        logger.e(e);
         return null;
       }
     }

lib/page/filter/filter_page.dart

@@ -140,7 +140,7 @@ class _FilterPageState extends BaseState<FilterPage> {
             ),
             CardWidgets.buildMenu(
               false,
-              '样品等级',
+              '样品层级',
               ypdjList,
               ypdj,
               (_, sel) {},

lib/page/home/home_page.dart

@@ -76,7 +76,7 @@ class _HomePageState extends BaseState<HomePage> with AutomaticKeepAliveClientMi
       child: Container(
         padding: const EdgeInsets.symmetric(horizontal: 16),
         alignment: Alignment.center,
-        child: const Text('扫一扫', style: TextStyle(fontSize: 14, color: Colors.white)),
+        child: Image.asset(imgHomeScan, height: 24,width: 24),
       ),
     );
   }

lib/page/login/login_page.dart

@@ -12,13 +12,10 @@ import 'package:lszlgl/service/user_service.dart';
 import 'package:lszlgl/widget/button.dart';
 
 import '../../config/reresh_config.dart';
-import '../../drfit/database.dart';
 import '../../network/base_dio.dart';
 import '../../utils/location_utils.dart';
 import '../../utils/sp_utils.dart';
 import 'package:lszlgl/service/print_service.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:path/path.dart' as p;
 
 /// 登录页面
 class LoginPage extends StatefulWidget {
@@ -46,7 +43,8 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
       await UserService.get().saveLogin(login.data);
       getSystemData();
     } on DioException catch (_) {
-    } catch (_) {
+    } catch (e) {
+      logger.e(e);
       MyNavigator.showToast('获取数据失败');
     }
     MyNavigator.dismissLoading();

lib/page/qrcode_scan/qrcode_scan_page.dart

@@ -1,6 +1,9 @@
 import 'dart:io';
 
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
 import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_task_page.dart';
 import 'package:qr_code_scanner/qr_code_scanner.dart';
 
@@ -14,10 +17,12 @@ class QrCodeScanPage extends StatefulWidget {
   State<QrCodeScanPage> createState() => _QrCodeScanPageState();
 }
 
-class _QrCodeScanPageState extends BaseLifecycleState<QrCodeScanPage> {
+class _QrCodeScanPageState extends BaseLifecycleState<QrCodeScanPage> with SingleTickerProviderStateMixin {
   final GlobalKey qrKey = GlobalKey(debugLabel: 'QR');
   Barcode? result;
   QRViewController? controller;
+  late AnimationController _ctrl;
+  late Animation<Offset> animation;
 
   void _onQRViewCreated(QRViewController controller) {
     this.controller = controller;
@@ -90,28 +95,89 @@ class _QrCodeScanPageState extends BaseLifecycleState<QrCodeScanPage> {
   @override
   void dispose() {
     controller?.dispose();
+    _ctrl.dispose();
     super.dispose();
   }
 
   @override
+  void initState() {
+    super.initState();
+    // 创建动画控制器
+    _ctrl = AnimationController(
+      vsync: this,
+      duration: const Duration(seconds: 2),
+    );
+    animation = Tween<Offset>(
+      begin: const Offset(0, -0.25),
+      end: const Offset(0, 0.25),
+    ).animate(_ctrl);
+    _ctrl.repeat();
+  }
+
+  @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,
+    return AnnotatedRegion<SystemUiOverlayStyle>(
+      value: SystemUiOverlayStyle.light,
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          // myAppBar(
+          //   title: '扫一扫',
+          //   actions: [buildFlash()],
+          // ),
+          Positioned.fill(
+            child: QRView(
+              key: qrKey,
+              onQRViewCreated: _onQRViewCreated,
+            ),
           ),
-        ),
-      ],
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            child: buildAppBar(),
+          ),
+          SlideTransition(
+            position: animation,
+            child: Image.asset(imgScanScanning, width: double.infinity),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget buildAppBar() {
+    return Padding(
+      padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
+      child: Stack(
+        alignment: Alignment.center,
+        children: [
+          Positioned(left: 0, child: buildBack()),
+          const Text(
+            '扫一扫',
+            textAlign: TextAlign.center,
+            style: TextStyle(color: Colors.white, fontSize: 20),
+          ),
+          Positioned(
+            right: 0,
+            child: buildFlash(),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget buildBack() {
+    return GestureDetector(
+      onTap: () => MyNavigator.pop(),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16),
+        child: Image.asset(imgScanBack, width: 24, height: 24),
+      ),
     );
   }
 
@@ -119,10 +185,18 @@ class _QrCodeScanPageState extends BaseLifecycleState<QrCodeScanPage> {
     return GestureDetector(
       onTap: () => controller?.toggleFlash(),
       behavior: HitTestBehavior.opaque,
-      child: Container(
+      child: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 16),
-        alignment: Alignment.center,
-        child: const Text('闪光灯', style: TextStyle(fontSize: 14, color: Colors.white)),
+        child: Row(
+          children: [
+            Image.asset(imgScanFlash, width: 24, height: 24),
+            const Text(
+              '闪光灯',
+              textAlign: TextAlign.center,
+              style: TextStyle(color: Colors.white, fontSize: 14),
+            ),
+          ],
+        ),
       ),
     );
   }

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -18,24 +18,26 @@ import '../../../network/my_api.dart';
 import '../../../service/user_service.dart';
 import '../../../utils/file_utils.dart';
 import '../../../widget/card_item.dart';
+import 'reap_sample_task_page.dart';
 
 /// 收获扦样-基础信息
 class ReapSampleBasicDetailPage extends StatefulWidget {
   final SampleTaskItem? data;
   final bool detail;
+  final ReapSampleTaskController ctrl;
 
   const ReapSampleBasicDetailPage(
     this.data, {
     super.key,
     this.detail = true,
+    required this.ctrl,
   });
 
   @override
   State<ReapSampleBasicDetailPage> createState() => _ReapSampleBasicDetailPageState();
 }
 
-class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasicDetailPage>
-    with AutomaticKeepAliveClientMixin {
+class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasicDetailPage> with AutomaticKeepAliveClientMixin {
   SampleTaskItem? data;
   late bool isDetail;
 
@@ -46,8 +48,8 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   final sheng = null.notifier<CardMenuData?>();
   final shi = null.notifier<CardMenuData?>();
   final qu = null.notifier<CardMenuData?>();
-  final xian = null.notifier<CardMenuData?>();
-  final cun = null.notifier<CardMenuData?>();
+  final TextEditingController xian = TextEditingController();
+  final TextEditingController cun = TextEditingController();
 
   final trxxList = <CardMenuData>[].notifier<List<CardMenuData>>();
   final trxx = null.notifier<CardMenuData?>();
@@ -59,8 +61,7 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   List<CardMenuData> personList = [];
 
   /// 获取行政区划列表
-  Future<List<CardMenuData>?> getDistrictList(num level, {num? id, bool showLoading = true}) async {
-    if (showLoading) MyNavigator.showLoading();
+  Future<List<CardMenuData>?> getDistrictList(num level, {num? id}) async {
     try {
       var rsp = await MyApi.get().districtList(level, id: id);
       List<CardMenuData> list = (rsp.data ?? []).map((e) => CardMenuData(e.uname, e.id)).toList();
@@ -69,18 +70,15 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
       } else if (level == 5) {
         cunList.value = list;
       }
-      if (showLoading) MyNavigator.dismissLoading();
       return list;
     } catch (e) {
       logger.e(e);
     }
-    if (showLoading) MyNavigator.dismissLoading();
     return null;
   }
 
   /// 获取土壤信息列表
   Future<void> getTrxxList() async {
-    MyNavigator.showLoading();
     try {
       var rsp = await MyApi.get().trxxList();
       List<CardMenuData> list = [];
@@ -99,38 +97,38 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     MyNavigator.dismissLoading();
   }
 
-  /// 选中行政区划
-  void onSelectXzqh(ValueNotifier<CardMenuData?> selNotifier, CardMenuData selData) {
-    num level = 100;
-    if (selNotifier == xian) {
-      level = 4;
-      data?.xiangXzqh = selData.value;
-      data?.cunXzqh = null;
-      cun.value = null;
-      cunList.value = [];
-    } else if (selNotifier == cun) {
-      level = 5;
-      data?.cunXzqh = selData.value;
-    }
-    if (level < 5) {
-      // 获取下一个等级的菜单数据
-      getDistrictList(level + 1, id: selData.value ?? 0);
-    }
-  }
-
-  /// 获取编辑数据
-  void getEditData() async {
-    MyNavigator.showLoading();
-    // 县
-    if (data?.quXzqh != null) {
-      await getDistrictList(4, id: data?.quXzqh, showLoading: false);
-    }
-    // 村
-    if (data?.xiangXzqh != null) {
-      await getDistrictList(5, id: data?.xiangXzqh, showLoading: false);
-    }
-    MyNavigator.dismissLoading();
-  }
+  // /// 选中行政区划
+  // void onSelectXzqh(ValueNotifier<CardMenuData?> selNotifier, CardMenuData selData) {
+  //   num level = 100;
+  //   if (selNotifier == xian) {
+  //     level = 4;
+  //     data?.xiangXzqh = selData.value;
+  //     data?.cunXzqh = null;
+  //     cun.value = null;
+  //     cunList.value = [];
+  //   } else if (selNotifier == cun) {
+  //     level = 5;
+  //     data?.cunXzqh = selData.value;
+  //   }
+  //   if (level < 5) {
+  //     // 获取下一个等级的菜单数据
+  //     getDistrictList(level + 1, id: selData.value ?? 0);
+  //   }
+  // }
+
+  // /// 获取编辑数据
+  // void getEditData() async {
+  //   MyNavigator.showLoading();
+  //   // 县
+  //   if (data?.quXzqh != null) {
+  //     await getDistrictList(4, id: data?.quXzqh, showLoading: false);
+  //   }
+  //   // 村
+  //   if (data?.xiangXzqh != null) {
+  //     await getDistrictList(5, id: data?.xiangXzqh, showLoading: false);
+  //   }
+  //   MyNavigator.dismissLoading();
+  // }
 
   void getPersonData() async {
     try {
@@ -191,14 +189,14 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
       shi.value = null;
       qu.value = null;
       data?.xiangXzqhName = null;
-      xian.value = null;
+      xian.text = '';
       data?.cunXzqhName = null;
-      cun.value = null;
+      cun.text = '';
 
       MyNavigator.showLoading();
       bool stepSuccess = false;
       // 省
-      var provinceList = await getDistrictList(1, showLoading: false);
+      var provinceList = await getDistrictList(1);
       if (provinceList != null) {
         for (CardMenuData item in provinceList) {
           if (item.name == province) {
@@ -210,7 +208,7 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
         if (stepSuccess) {
           stepSuccess = false;
           // 市
-          var cityList = await getDistrictList(2, id: sheng.value!.value, showLoading: false);
+          var cityList = await getDistrictList(2, id: sheng.value!.value);
           if (cityList == null) return;
           for (CardMenuData item in cityList) {
             if (item.name == city) {
@@ -224,7 +222,7 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
             stepSuccess = false;
             // 区
             if (district.isNotEmpty) {
-              var districtList = await getDistrictList(3, id: shi.value!.value, showLoading: false);
+              var districtList = await getDistrictList(3, id: shi.value!.value);
               if (districtList == null) return;
               for (CardMenuData item in districtList) {
                 if (item.name == district) {
@@ -242,8 +240,8 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
               // 乡、村
               data?.xiangXzqhName = street;
               data?.cunXzqhName = streetNumber;
-              xian.value = CardMenuData(street, null);
-              cun.value = CardMenuData(streetNumber, null);
+              xian.text = street;
+              cun.text = streetNumber;
             }
           }
         }
@@ -389,6 +387,41 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     }
   }
 
+  /// 校验数据
+  bool verifyData() {
+    // 扦样/陪同人员
+    if ((data?.dgryName ?? '').isEmpty) {
+      MyNavigator.showToast('扦样/陪同人员不能为空');
+      return false;
+    }
+    // 乡镇
+    if ((data?.xiangXzqhName ?? '').isEmpty) {
+      MyNavigator.showToast('乡镇不能为空');
+      return false;
+    }
+    // 村
+    if ((data?.cunXzqhName ?? '').isEmpty) {
+      MyNavigator.showToast('村不能为空');
+      return false;
+    }
+    // 扦样地点经纬度
+    if ((data?.qyddjwd ?? '').isEmpty) {
+      MyNavigator.showToast('扦样地点经纬度不能为空');
+      return false;
+    }
+    // 种植面积（亩地）
+    if (data?.zzmj == null) {
+      MyNavigator.showToast('种植面积不能为空');
+      return false;
+    }
+    // 土壤地理类型
+    if (data?.trdllx == null) {
+      MyNavigator.showToast('土壤地理类型不能为空');
+      return false;
+    }
+    return true;
+  }
+
   @override
   bool get wantKeepAlive => true;
 
@@ -396,14 +429,16 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   void onInit() {
     data = widget.data;
     isDetail = widget.detail;
+    widget.ctrl.verifyData = verifyData;
+
     // 土壤信息
     getTrxxList();
 
     if (data?.sheng != null) sheng.value = CardMenuData(data?.sheng, data?.shengXzqh);
     if (data?.shi != null) shi.value = CardMenuData(data?.shi, data?.shiXzqh);
     if (data?.qu != null) qu.value = CardMenuData(data?.qu, data?.quXzqh);
-    if (data?.xian != null) xian.value = CardMenuData(data?.xian, data?.xiangXzqh);
-    if (data?.cun != null) cun.value = CardMenuData(data?.cun, data?.cunXzqh);
+    if (data?.xiangXzqhName != null) xian.text = data!.xiangXzqhName!;
+    if (data?.cunXzqhName != null) cun.text = data!.cunXzqhName!;
     qyddjwd.value = data?.qyddjwd;
     if ((data?.dgryName ?? '0') == '0') {
       data?.dgryName = UserService.get().getUser()?.nickname;
@@ -417,6 +452,11 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   }
 
   @override
+  void onFirstShow(Duration timeStamp) {
+    MyNavigator.showLoading();
+  }
+
+  @override
   void onDestroy() {
     LocationUtils.stopLocation();
     LocationUtils.destroy();
@@ -447,8 +487,22 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
         sheng.builder((v) => CardItemWidget('省份', rightText: v?.name, bottomLine: true)),
         shi.builder((v) => CardItemWidget('市/州', rightText: v?.name, bottomLine: true)),
         qu.builder((v) => CardItemWidget('区县', rightText: v?.name, bottomLine: true)),
-        xian.builder((v) => CardItemWidget('乡镇', rightText: v?.name, bottomLine: true)),
-        cun.builder((v) => CardItemWidget('村', rightText: v?.name, bottomLine: true)),
+        // xian.builder((v) => CardItemWidget('乡镇', rightText: v?.name, bottomLine: true)),
+        // cun.builder((v) => CardItemWidget('村', rightText: v?.name, bottomLine: true)),
+        CardWidgets.buildEdit(
+          isDetail,
+          ctrl: xian,
+          '乡镇',
+          data?.xiangXzqhName?.toString(),
+          onChanged: (value) => data?.xiangXzqhName = value.isEmpty ? null : value,
+        ),
+        CardWidgets.buildEdit(
+          isDetail,
+          ctrl: cun,
+          '村',
+          data?.cunXzqhName?.toString(),
+          onChanged: (value) => data?.cunXzqhName = value.isEmpty ? null : value,
+        ),
         qyddjwd.builder(
           (v) => CardItemWidget(
             '扦样地点经纬度',

lib/page/sample_task/reap_sample_detail/reap_sample_disaster_detail_page.dart

@@ -6,24 +6,26 @@ import 'package:lszlgl/widget/card_item.dart';
 import '../../../model/rsp/dict_rsp.dart';
 import '../../../model/rsp/sample_task_rsp.dart';
 import '../../../service/dict_service.dart';
+import 'reap_sample_task_page.dart';
 
 /// 收获扦样-灾害污染
 class ReapSampleDisasterDetailPage extends StatefulWidget {
   final SampleTaskItem? data;
   final bool detail;
+  final ReapSampleTaskController ctrl;
 
   const ReapSampleDisasterDetailPage(
     this.data, {
     super.key,
     this.detail = true,
+    required this.ctrl,
   });
 
   @override
   State<ReapSampleDisasterDetailPage> createState() => _ReapSampleDisasterDetailPageState();
 }
 
-class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDisasterDetailPage>
-    with AutomaticKeepAliveClientMixin {
+class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDisasterDetailPage> with AutomaticKeepAliveClientMixin {
   SampleTaskItem? data;
   late bool isDetail;
 
@@ -76,17 +78,25 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
     num? selValue,
   ) {
     // 菜单数据
-    notifier.value =
-        (DictService.getDictList(type) ?? []).map((e) => CardMenuData(e.label, num.parse(e.value ?? '0'))).toList();
+    notifier.value = (DictService.getDictList(type) ?? []).map((e) => CardMenuData(e.label, num.parse(e.value ?? '0'))).toList();
     // 选中项
     DictRsp? dict = DictService.getDict(type, value: selValue);
     if (dict != null) selNotifier.value = CardMenuData(dict.label, dict.value);
   }
 
+  /// 校验数据
+  bool verifyData() {
+    return true;
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+
   @override
   void onInit() {
     data = widget.data;
     isDetail = widget.detail;
+    widget.ctrl.verifyData = verifyData;
 
     // 工厂排污
     setBoolMenuSelNotifier(zztdzwsfygcpw, data?.zztdzwsfygcpw);
@@ -115,9 +125,6 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
   }
 
   @override
-  bool get wantKeepAlive => true;
-
-  @override
   Widget build(BuildContext context) {
     super.build(context);
     return SingleChildScrollView(child: buildList());

lib/page/sample_task/reap_sample_detail/reap_sample_medicine_detail_page.dart

@@ -6,24 +6,26 @@ import '../../../model/rsp/sample_task_rsp.dart';
 import '../../../utils/date_time_utils.dart';
 import '../../../utils/input_formatter.dart';
 import '../../../widget/button.dart';
+import 'reap_sample_task_page.dart';
 
 /// 收获扦样-用药情况
 class ReapSampleMedicineDetailPage extends StatefulWidget {
   final SampleTaskItem? data;
   final bool detail;
+  final ReapSampleTaskController ctrl;
 
   const ReapSampleMedicineDetailPage(
     this.data, {
     super.key,
     this.detail = true,
+    required this.ctrl,
   });
 
   @override
   State<ReapSampleMedicineDetailPage> createState() => _ReapSampleMedicineDetailPageState();
 }
 
-class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMedicineDetailPage>
-    with AutomaticKeepAliveClientMixin {
+class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMedicineDetailPage> with AutomaticKeepAliveClientMixin {
   SampleTaskItem? data;
   late bool isDetail;
 
@@ -52,38 +54,44 @@ class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMe
   }
 
   void onRemove(UseMedicineItem item) async {
-    var delete = await showDialog(
-      context: context,
+    var delete = await MyNavigator.showDialog(
+      tag: 'delete',
       builder: (_) => AlertDialog(
-        title: const Text('是否删除用药记录?'),
+        title: const Text('系统提示'),
+        content: const Text('是否删除用药记录?'),
         actions: [
           MyButton(
             '删除',
             alignment: null,
             backgroundColor: const Color(0xFFCE615A),
-            onTap: () => MyNavigator.pop(true),
+            onTap: () => MyNavigator.dismiss(tag: 'delete', result: true),
           ),
-          MyButton('取消', alignment: null, onTap: () => MyNavigator.pop()),
+          MyButton('取消', alignment: null, onTap: () => MyNavigator.dismiss(tag: 'delete')),
         ],
       ),
     );
-    if (delete ?? false) {
-      setState(() {
-        data?.codeUseMedicineList?.remove(item);
-      });
-    }
+    if (!(delete ?? false)) return;
+    setState(() {
+      data?.codeUseMedicineList?.remove(item);
+    });
   }
 
+  /// 校验数据
+  bool verifyData() {
+    return true;
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+
   @override
   void onInit() {
     data = widget.data;
     isDetail = widget.detail;
+    widget.ctrl.verifyData = verifyData;
   }
 
   @override
-  bool get wantKeepAlive => true;
-
-  @override
   Widget build(BuildContext context) {
     super.build(context);
     return SingleChildScrollView(child: buildList());

lib/page/sample_task/reap_sample_detail/reap_sample_org_detail_page.dart

@@ -3,17 +3,20 @@ import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
 import '../../../model/rsp/sample_task_rsp.dart';
+import 'reap_sample_task_page.dart';
 
 /// 收获扦样-检验机构
 class ReapSampleOrgDetailPage extends StatefulWidget {
   final SampleTaskItem? data;
   final bool detail;
+  final ReapSampleTaskController ctrl;
 
   const ReapSampleOrgDetailPage(
-      this.data, {
-        super.key,
-        this.detail = true,
-      });
+    this.data, {
+    super.key,
+    this.detail = true,
+    required this.ctrl,
+  });
 
   @override
   State<ReapSampleOrgDetailPage> createState() => _ReapSampleOrgDetailPageState();
@@ -27,9 +30,18 @@ class _ReapSampleOrgDetailPageState extends BaseLifecycleState<ReapSampleOrgDeta
   String? aqjg;
   String? aqdz;
 
+  /// 校验数据
+  bool verifyData() {
+    return true;
+  }
+
+  @override
+  bool get wantKeepAlive => true;
+
   @override
   void onInit() {
     data = widget.data;
+    widget.ctrl.verifyData = verifyData;
     var list = data?.jyjgxxRespVOList;
     if (list != null && list.isNotEmpty) {
       for (JyjgxxItem item in list) {
@@ -45,9 +57,6 @@ class _ReapSampleOrgDetailPageState extends BaseLifecycleState<ReapSampleOrgDeta
   }
 
   @override
-  bool get wantKeepAlive => true;
-
-  @override
   Widget build(BuildContext context) {
     super.build(context);
     return SingleChildScrollView(child: buildList());

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -19,11 +19,9 @@ import 'package:lszlgl/page/signature/signature_page.dart';
 import '../../../base/base_vm.dart';
 import '../../../main.dart';
 import '../../../network/my_api.dart';
-import '../../../plugin/bluetooth_plugin.dart';
 import '../../../utils/file_utils.dart';
 import '../../../widget/button.dart';
 import '../../../widget/page_widget.dart';
-import 'dart:ui' as ui;
 
 class ReapSampleTaskPageArgs {
   final bool detail;
@@ -40,6 +38,10 @@ class ReapSampleTaskPageArgs {
   }
 }
 
+class ReapSampleTaskController {
+  bool Function()? verifyData;
+}
+
 /// 收获扦样任务
 class ReapSampleTaskPage extends StatefulWidget {
   final ReapSampleTaskPageArgs args;
@@ -63,6 +65,7 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
   late PageController pageCtrl;
 
   late List<String> tabTextList;
+  late List<ReapSampleTaskController> ctrlList;
   late List<Widget> pageList;
 
   ValueNotifier<int> tabIndex = ValueNotifier(0);
@@ -86,7 +89,14 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
   }
 
   void submit() async {
-    SampleTaskItem req = (pageStatus.value.data ?? SampleTaskItem());
+    // 空值判断
+    for (int i = 0; i < ctrlList.length; i++) {
+      if (!(ctrlList[i].verifyData?.call() ?? true)) {
+        pageCtrl.jumpToPage(i);
+        return;
+      }
+    }
+    SampleTaskItem req = pageStatus.value.data!;
     // 去签名
     var args = SignaturePageArgs(count: req.dgryName?.split(',').length ?? 0);
     List<Uint8List?>? list = await MyRouter.startSignature(args: args);
@@ -132,17 +142,18 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
         pageStatus.update(pageStatus.value.success(data: data));
       }
     } catch (e) {
+      logger.e(e);
       pageStatus.update(pageStatus.value.error());
     }
   }
 
   void cratePageList(SampleTaskItem data) {
     pageList = [
-      ReapSampleBasicDetailPage(data, detail: args.detail),
-      ReapSampleVarietyDetailPage(data, detail: args.detail),
-      ReapSampleDisasterDetailPage(data, detail: args.detail),
-      ReapSampleMedicineDetailPage(data, detail: args.detail),
-      ReapSampleOrgDetailPage(data, detail: args.detail),
+      ReapSampleBasicDetailPage(data, detail: args.detail, ctrl: ctrlList[0]),
+      ReapSampleVarietyDetailPage(data, detail: args.detail, ctrl: ctrlList[1]),
+      ReapSampleDisasterDetailPage(data, detail: args.detail, ctrl: ctrlList[2]),
+      ReapSampleMedicineDetailPage(data, detail: args.detail, ctrl: ctrlList[3]),
+      ReapSampleOrgDetailPage(data, detail: args.detail, ctrl: ctrlList[4]),
     ];
   }
 
@@ -150,6 +161,10 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
 
   /// 查看二维码
   void showQRCode() {
+    if (pageStatus.value.data?.ewmfilePictureList?.isEmpty ?? true) {
+      MyNavigator.showToast('没有二维码');
+      return;
+    }
     UrlItem picInfo = pageStatus.value.data!.ewmfilePictureList!.first;
     MyNavigator.showDialog(
       builder: (_) => Container(
@@ -229,6 +244,7 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
     super.initState();
     args = widget.args;
     tabTextList = ['基础信息', '品种信息', '灾害污染', '用药情况', '检验机构'];
+    ctrlList = tabTextList.map((e) => ReapSampleTaskController()).toList();
     pageCtrl = PageController();
   }
 
@@ -307,9 +323,8 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
       child: GestureDetector(
         behavior: HitTestBehavior.opaque,
         onTap: () {
-          tabIndex.value = index;
           if ((pageCtrl.page?.toInt() ?? 0) == index) return;
-          pageCtrl.jumpToPage(index);
+          pageCtrl.animateToPage(index, duration: const Duration(milliseconds: 200), curve: Curves.linear);
         },
         child: Container(
           alignment: Alignment.center,
@@ -362,15 +377,12 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
   }
 
   Widget buildButton() {
-    Widget child;
+    if (args.detail) return const SizedBox.shrink();
     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: showQRCode, margin: margin));
-    if (args.detail) {
-      child = Row(children: [ewmWidget]);
-    } else {
-      child = tabIndex.builder((v) {
+    return Container(
+      color: const Color(0xFFF1F7F6),
+      padding: const EdgeInsets.symmetric(horizontal: 8),
+      child: tabIndex.builder((v) {
         // 第一页
         if (v == 0) return MyButton('下一步', onTap: next, margin: margin);
         // 最后一页
@@ -378,7 +390,7 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
           return Row(
             children: [
               Expanded(child: MyButton('上一步', onTap: previous, margin: margin)),
-              ewmWidget,
+              Expanded(child: MyButton('查看二维码', onTap: showQRCode, margin: margin)),
               Expanded(child: MyButton('提交', onTap: submit, margin: margin)),
             ],
           );
@@ -389,12 +401,7 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
             Expanded(child: MyButton('下一步', onTap: next, margin: margin)),
           ],
         );
-      });
-    }
-    return Container(
-      color: const Color(0xFFF1F7F6),
-      padding: const EdgeInsets.symmetric(horizontal: 8),
-      child: child,
+      }),
     );
   }
 }

lib/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
+import 'package:lszlgl/main.dart';
 import 'package:lszlgl/service/dict_service.dart';
 import 'package:lszlgl/utils/string_utils.dart';
 import 'package:lszlgl/widget/card_item.dart';
@@ -10,24 +11,26 @@ import '../../../network/my_api.dart';
 import '../../../utils/date_time_utils.dart';
 import '../../../utils/input_formatter.dart';
 import '../../../widget/button.dart';
+import 'reap_sample_task_page.dart';
 
 /// 收获扦样-品种信息
 class ReapSampleVarietyDetailPage extends StatefulWidget {
   final SampleTaskItem? data;
   final bool detail;
+  final ReapSampleTaskController ctrl;
 
   const ReapSampleVarietyDetailPage(
     this.data, {
     super.key,
     this.detail = true,
+    required this.ctrl,
   });
 
   @override
   State<ReapSampleVarietyDetailPage> createState() => _ReapSampleVarietyDetailPageState();
 }
 
-class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVarietyDetailPage>
-    with AutomaticKeepAliveClientMixin {
+class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVarietyDetailPage> with AutomaticKeepAliveClientMixin {
   SampleTaskItem? data;
   late bool isDetail;
   late Widget arrowDown;
@@ -57,7 +60,6 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
 
   /// 获取粮食信息列表
   Future<void> getLsxxList() async {
-    MyNavigator.showLoading();
     try {
       var rsp = await MyApi.get().lsxxList(data?.cypzName ?? '');
       List<CardMenuData> list = [];
@@ -70,7 +72,9 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
         }
       }
       lspzList.value = list;
-    } catch (e) {}
+    } catch (e) {
+      logger.e(e);
+    }
     MyNavigator.dismissLoading();
   }
 
@@ -112,32 +116,98 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
   }
 
   void onRemove(int index, NonghuItem item) async {
-    var delete = await showDialog(
-      context: context,
+    var delete = await MyNavigator.showDialog(
+      tag: 'delete',
       builder: (_) => AlertDialog(
-        title: const Text('是否删除扦样农户信息?'),
+        title: const Text('系统提示'),
+        content: const Text('是否删除扦样农户信息?'),
         actions: [
           MyButton(
             '删除',
             alignment: null,
             backgroundColor: const Color(0xFFCE615A),
-            onTap: () => MyNavigator.pop(true),
+            onTap: () {
+              if (data!.codeSamplingNonghuList!.length > 1) {
+                MyNavigator.dismiss(tag: 'delete', result: true);
+              } else {
+                MyNavigator.showToast('必须有一条扦样农户信息');
+                MyNavigator.dismiss(tag: 'delete');
+              }
+            },
           ),
-          MyButton('取消', alignment: null, onTap: () => MyNavigator.pop()),
+          MyButton('取消', alignment: null, onTap: () => MyNavigator.dismiss(tag: 'delete')),
         ],
       ),
     );
-    if (delete ?? false) {
-      setState(() {
-        data?.codeSamplingNonghuList?.remove(item);
-      });
+    if (!(delete ?? false)) return;
+    setState(() {
+      data?.codeSamplingNonghuList?.remove(item);
+    });
+  }
+
+  /// 校验数据
+  bool verifyData() {
+    // 粮食品类
+    if ((data?.lspz ?? '').isEmpty) {
+      MyNavigator.showToast('粮食品类不能为空');
+      return false;
+    }
+    // 是否优质品种
+    if (data?.sfyzpz == null) {
+      MyNavigator.showToast('是否优质品种不能为空');
+      return false;
+    }
+    // 品种优质类型
+    if (data?.sfyzpz == 0 && data?.yzpzlx == null) {
+      MyNavigator.showToast('品种优质类型不能为空');
+      return false;
+    }
+    debugPrint('天气情况: ${data?.tqqk}');
+    // 天气情况
+    if ((data?.tqqk ?? 0) == 0) {
+      MyNavigator.showToast('天气情况不能为空');
+      return false;
+    }
+    // 收获时间
+    if ((data?.shsj ?? '').isEmpty) {
+      MyNavigator.showToast('收获时间不能为空');
+      return false;
+    }
+    // 扦样时间
+    if ((data?.qysj ?? '').isEmpty) {
+      MyNavigator.showToast('扦样时间不能为空');
+      return false;
     }
+    // 农户信息
+    for (var item in data?.codeSamplingNonghuList ?? <NonghuItem>[]) {
+      if (item.qysl == null) {
+        MyNavigator.showToast('扦样数量不能为空');
+        return false;
+      }
+      if (item.qydbsl == null) {
+        MyNavigator.showToast('扦样代表数量不能为空');
+        return false;
+      }
+      if ((item.lxfs ?? '').isEmpty) {
+        MyNavigator.showToast('联系方式不能为空');
+        return false;
+      }
+      if ((item.bdcnhhhzs ?? '').isEmpty) {
+        MyNavigator.showToast('被调查农户或合作社不能为空');
+        return false;
+      }
+    }
+    return true;
   }
 
   @override
+  bool get wantKeepAlive => true;
+
+  @override
   void onInit() {
     data = widget.data;
     isDetail = widget.detail;
+    widget.ctrl.verifyData = verifyData;
     arrowDown = Image.asset(imgItemArrowDown, width: 20, color: const Color(0xFF01B2C8));
 
     // 粮食品类菜单数据
@@ -164,12 +234,16 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
       return menu;
     }).toList();
     if (!isDetail && (data?.codeSamplingNonghuList ?? []).isEmpty) {
-      data?.codeSamplingNonghuList = [NonghuItem()];
+      setState(() {
+        data?.codeSamplingNonghuList = [NonghuItem()];
+      });
     }
   }
 
   @override
-  bool get wantKeepAlive => true;
+  void onFirstShow(Duration timeStamp) {
+    MyNavigator.showLoading();
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -181,7 +255,7 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
     return Column(
       children: [
         CardItemWidget('采样品种', rightText: data?.cypzName, bottomLine: true),
-        CardItemWidget('样品等级', rightText: DictService.getLabel(DictType.ypdj, value: data?.ypdj), bottomLine: true),
+        CardItemWidget('样品层级', rightText: DictService.getLabel(DictType.ypdj, value: data?.ypdj), bottomLine: true),
         CardWidgets.buildMenu(
           isDetail,
           '粮食品类',

lib/page/sample_task/sample_task_list_page.dart

@@ -1,5 +1,6 @@
 import 'package:easy_refresh/easy_refresh.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/base/base_vm.dart';
 import 'package:lszlgl/config/colors.dart';
@@ -13,6 +14,7 @@ import 'package:lszlgl/utils/inject.dart';
 import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/page_widget.dart';
 
+import '../../main.dart';
 import 'reap_sample_detail/reap_sample_task_page.dart';
 import 'stock_sample_detail/stock_sample_task_page.dart';
 
@@ -52,6 +54,23 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
 
   /// 领取扦样任务
   void receiveTask(SampleTaskItem data) async {
+    var delete = await MyNavigator.showDialog(
+      builder: (_) => AlertDialog(
+        title: const Text('系统提示'),
+        content: const Text('任务认领后不可撤销，请确认是否认领任务！'),
+        actions: [
+          MyButton(
+            '领取',
+            alignment: null,
+            backgroundColor: const Color(0xFFCE615A),
+            onTap: () => MyNavigator.dismiss(status: SmartStatus.dialog, result: true),
+          ),
+          MyButton('取消', alignment: null, onTap: () => MyNavigator.dismiss()),
+        ],
+      ),
+    );
+    if (!(delete ?? false)) return;
+
     MyNavigator.showLoading();
     try {
       var rsp = await MyApi.get().receiveSampleTaskSgjc(data.id ?? 0);
@@ -61,6 +80,7 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
         vm.refreshAll();
       }
     } catch (e) {
+      logger.e(e);
       MyNavigator.dismissLoading();
     }
   }

lib/page/sample_task/stock_sample_detail/stock_sample_task_page.dart

@@ -5,6 +5,7 @@ import 'package:lszlgl/config/colors.dart';
 import 'package:lszlgl/model/rsp/sample_task_rsp.dart';
 
 import '../../../base/base_vm.dart';
+import '../../../main.dart';
 import '../../../network/my_api.dart';
 import '../../../widget/button.dart';
 import '../../../widget/page_widget.dart';
@@ -83,7 +84,9 @@ class _StockSampleTaskPageState extends BaseLifecycleState<StockSampleTaskPage>
       } else {
         MyNavigator.showToast('提交失败');
       }
-    } catch (e) {}
+    } catch (e) {
+      logger.e(e);
+    }
     MyNavigator.dismissLoading();
   }
 
@@ -100,6 +103,7 @@ class _StockSampleTaskPageState extends BaseLifecycleState<StockSampleTaskPage>
         pageStatus.update(pageStatus.value.success(data: data));
       }
     } catch (e) {
+      logger.e(e);
       pageStatus.update(pageStatus.value.error());
     }
   }

lib/page/user_center/user_center_page.dart

@@ -7,6 +7,7 @@ import 'package:lszlgl/model/rsp/user_rsp.dart';
 import 'package:lszlgl/service/user_service.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
+import '../../main.dart';
 import '../../network/my_api.dart';
 
 /// 用户中心
@@ -33,7 +34,9 @@ class _UserCenterPageState extends BaseLifecycleState<UserCenterPage> with Autom
       var value = await MyApi.get().userProfile();
       if (value.data != null) userNotify.value = value.data;
       await UserService.get().saveUser(value.data);
-    } catch (err) {}
+    } catch (e) {
+      logger.e(e);
+    }
   }
 
   @override

lib/router/my_navigator.dart

@@ -355,7 +355,7 @@ class MyNavigator {
         msg,
         controller: controller,
         displayTime: displayTime,
-        alignment: alignment,
+        alignment: alignment ?? Alignment.center,
         clickMaskDismiss: clickMaskDismiss,
         animationType: null,
         nonAnimationTypes: null,

lib/service/upgrade_service.dart

@@ -80,6 +80,7 @@ class UpgradeService {
         }
       }
     } catch (e) {
+      logger.e(e);
       if (showLoading) MyNavigator.dismissLoading();
     }
     checking = false;

lib/widget/card_item.dart

@@ -308,7 +308,7 @@ class CardWidgets {
       title,
       rightChild: TextFormField(
         controller: ctrl,
-        initialValue: value,
+        initialValue: ctrl == null ? value : null,
         keyboardType: inputType,
         textAlign: TextAlign.right,
         decoration: InputDecoration(

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.15+15
+version: 0.0.17+17
 
 environment:
   sdk: '>=3.1.5 <4.0.0'
@@ -39,7 +39,7 @@ dependencies:
   cupertino_icons: ^1.0.2
 
   # 弹框
-  flutter_smart_dialog: ^4.9.6
+  flutter_smart_dialog: 4.9.6
   # 轮播图
   card_swiper: ^3.0.1
   # 缓存网络图片