修改待扦样打印灰屏、用药数据校验。发布22版。

lib/page/sample_task/reap_sample_detail/reap_sample_medicine_detail_page.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
+import 'package:lszlgl/config/colors.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
 import '../../../model/rsp/sample_task_rsp.dart';
@@ -78,7 +79,29 @@ class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMe
 
   /// 校验数据
   bool verifyData() {
-    return true;
+    if (data?.codeUseMedicineList == null){
+      return true;
+    } else {
+      for(UseMedicineItem item in data?.codeUseMedicineList ?? <UseMedicineItem>[]){
+        if((item.synypz ?? '').isEmpty){
+          MyNavigator.showToast('农药品种不能为空');
+          return false;
+        }
+        if(item.synysl == null){
+          MyNavigator.showToast('农药数量不能为空');
+          return false;
+        }
+        if((item.sysj ?? '').isEmpty){
+          MyNavigator.showToast('施药时间不能为空');
+          return false;
+        }
+        if((item.syff ?? '').isEmpty){
+          MyNavigator.showToast('施药方法不能为空');
+          return false;
+        }
+      }
+      return true;
+    }
   }
 
   @override
@@ -104,7 +127,13 @@ class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMe
           data?.codeUseMedicineList?.length ?? 0,
           (index) => buildItem(index, data!.codeUseMedicineList![index]),
         ).toList(),
+        if((data?.codeUseMedicineList?.isNotEmpty ?? false) && !isDetail )
+          const Padding(
+            padding: EdgeInsets.only(top: 10),
+            child:  Text('长按上方可删除',style: TextStyle(fontSize: 12,color: MyColor.c_666666)),
+          ),
         buildAdd(),
+
       ],
     );
   }
@@ -146,7 +175,7 @@ class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMe
                     ),
                     CardWidgets.buildEdit(
                       detail,
-                      '使用农药的数量(公斤或毫升/每亩地)',
+                      '使用农药的数量(毫升/每亩地)',
                       item.synysl?.toString(),
                       backgroundColor: null,
                       inputType: const TextInputType.numberWithOptions(decimal: true),

lib/utils/location_utils.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:amap_flutter_location/amap_flutter_location.dart';
 import 'package:amap_flutter_location/amap_location_option.dart';
 import 'package:app_settings/app_settings.dart';
@@ -63,6 +65,7 @@ class LocationUtils {
   ///销毁定位
   static void destroy() {
     location.destroy();
+    cancelLocationListener();
     _location = null;
   }
 
@@ -111,8 +114,25 @@ class LocationUtils {
   /// `errorCode`: 错误码，当定位失败时才会返回对应的错误码， 具体错误请参考：https://lbs.amap.com/api/android-location-sdk/guide/utilities/errorcode
   ///
   /// `errorInfo`: 错误信息， 当定位失败时才会返回
+  // static Stream<Map<String, Object>> onLocationChanged() {
+  //   return location.onLocationChanged().asBroadcastStream();
+  // }
   static Stream<Map<String, Object>> onLocationChanged() {
-    return location.onLocationChanged();
+    if (_locationChange == null) {
+      _locationChange = StreamController.broadcast();
+      _locationListener = location.onLocationChanged().listen((event) => _locationChange?.add(event));
+    }
+    return _locationChange!.stream;
+  }
+
+  static StreamController<Map<String, Object>>? _locationChange;
+  static StreamSubscription<Map<String, Object>>? _locationListener;
+
+  static void cancelLocationListener() {
+    _locationListener?.cancel();
+    _locationListener = null;
+    _locationChange?.close();
+    _locationChange = null;
   }
 
   /// 检查定位是否可用

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.21+21
+version: 0.0.22+22
 
 environment:
   sdk: '>=3.1.5 <4.0.0'