修改扫一扫入口icon、修改扫一扫页面UI，收获扦样单乡镇村改为编辑框；

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';
@@ -33,3 +35,10 @@ const String imgUserCenterSetting = 'assets/images/user_center_setting.webp';
 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';

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

@@ -74,7 +74,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/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

@@ -34,8 +34,7 @@ class ReapSampleBasicDetailPage extends StatefulWidget {
   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 +45,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?>();
@@ -99,38 +98,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,9 +190,9 @@ 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;
@@ -242,8 +241,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;
             }
           }
         }
@@ -402,8 +401,8 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     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;
@@ -447,8 +446,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_task_page.dart

@@ -147,6 +147,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(
@@ -351,15 +355,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);
         // 最后一页
@@ -367,7 +368,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)),
             ],
           );
@@ -378,12 +379,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

@@ -181,7 +181,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/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/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(