v0.0.8 修改App名称；增加污染类型校验；

android/app/src/main/AndroidManifest.xml

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

lib/model/rsp/sample_task_rsp.dart

@@ -99,8 +99,8 @@ class SampleTaskItem {
   // List<>? fplist; // 分配多条信息
   num? sfyzpz; // 是否优质品种
   num? yzpzlx; // 优质品种类型
-  num? shqjsffslyytq; // 收货期间是否发生连阴雨天气
-  num? shlssfsfpg; // 收货粮食水分是否偏高
+  num? shqjsffslyytq; // 收获期间是否发生连阴雨天气
+  num? shlssfsfpg; // 收获粮食水分是否偏高
   num? jnlbdsffszmwr; // 近年来本地是否发生真菌毒素污染
   num? zjdswrlx; // 真菌毒素污染类型
   num? jnlbdsfzjswr; // 近年来本地是否发生重金属污染

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -28,7 +28,8 @@ 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;
 
@@ -128,7 +129,7 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   void getPersonData() async {
     try {
       // 获取扦样人员列表
-      var rsp = await MyApi.get().getPersonMenu(data?.jhcyjg ?? 29964);
+      var rsp = await MyApi.get().getPersonMenu(data?.jhcyjg ?? 0);
       personList
         ..clear()
         ..addAll((rsp.data ?? []).map((e) => CardMenuData(e.name, e.id)).toList());
@@ -303,7 +304,8 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
       children: [
         CardItemWidget('扦样任务单号', rightText: data?.qyrwdh, bottomLine: true),
         CardItemWidget('扦样单位', rightText: data?.dwmc, bottomLine: true),
-        name.builder((v) => CardWidgets.buildMenuDialog(isDetail, '扦样人员', v, personList, personSelCallback, multiple: true)),
+        name.builder(
+            (v) => CardWidgets.buildMenuDialog(isDetail, '扦样人员', v, personList, personSelCallback, multiple: true)),
         CardItemWidget('监测类别', rightText: DictService.getLabel(DictType.jclb, value: data?.jclb), bottomLine: true),
         sheng.builder((v) => CardItemWidget('省份', rightText: v?.name, bottomLine: true)),
         shi.builder((v) => CardItemWidget('市区', rightText: v?.name, bottomLine: true)),

lib/page/sample_task/reap_sample_detail/reap_sample_disaster_detail_page.dart

@@ -94,8 +94,8 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
     // 工厂排污类型
     setDictMenuNotifier(gcpwlxList, gcpwlx, DictType.gcpwlx, data?.gcpwlx);
     if (data?.gcpwlx == null) {
-      gcpwlx.value = gcpwlxList.value[0];
-      data?.gcpwlx = gcpwlxList.value[0].value;
+      gcpwlx.value = gcpwlxList.value.first;
+      data?.gcpwlx = gcpwlxList.value.first.value;
     }
 
     // 水源、土壤污染
@@ -104,8 +104,8 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
     // 污染物类型
     setDictMenuNotifier(wrwlxList, wrwlx, DictType.wrwlx, data?.wrwlx);
     if (data?.wrwlx == null) {
-      wrwlx.value = wrwlxList.value[0];
-      data?.wrwlx = wrwlxList.value[0].value;
+      wrwlx.value = wrwlxList.value.first;
+      data?.wrwlx = wrwlxList.value.first.value;
     }
 
     // 病虫害
@@ -114,14 +114,14 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
     // 病虫害类型
     setDictMenuNotifier(bchlxList, bchlx, DictType.bchlx, data?.bchlx);
     if (data?.bchlx == null) {
-      bchlx.value = bchlxList.value[0];
-      data?.bchlx = bchlxList.value[0].value;
+      bchlx.value = bchlxList.value.first;
+      data?.bchlx = bchlxList.value.first.value;
     }
 
-    // 收货期间是否发生连阴雨天气
+    // 收获期间是否发生连阴雨天气
     setNumBoolMenuSelNotifier(shqjsffslyytq, data?.shqjsffslyytq ?? 1);
 
-    // 收货粮食水分是否偏高
+    // 收获粮食水分是否偏高
     setNumBoolMenuSelNotifier(shlssfsfpg, data?.shlssfsfpg ?? 1);
 
     // 近年来本地是否发生真菌毒素污染
@@ -130,8 +130,8 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
     // 真菌毒素污染类型
     setDictMenuNotifier(zjdswrlxList, zjdswrlx, DictType.zjdswrlx, data?.zjdswrlx);
     if (data?.zjdswrlx == null) {
-      zjdswrlx.value = zjdswrlxList.value[0];
-      data?.zjdswrlx = zjdswrlxList.value[0].value;
+      zjdswrlx.value = zjdswrlxList.value.first;
+      data?.zjdswrlx = zjdswrlxList.value.first.value;
     }
 
     // 近年来本地是否发生重金属污染
@@ -140,8 +140,8 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
     // 重金属污染类型
     setDictMenuNotifier(zjswrlxList, zjswrlx, DictType.zjswrlx, data?.zjswrlx);
     if (data?.zjswrlx == null) {
-      zjswrlx.value = zjswrlxList.value[0];
-      data?.zjswrlx = zjswrlxList.value[0].value;
+      zjswrlx.value = zjswrlxList.value.first;
+      data?.zjswrlx = zjswrlxList.value.first.value;
     }
   }
 
@@ -162,7 +162,18 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
           '种植土地周围是否有工厂排污',
           boolList,
           zztdzwsfygcpw,
-          (_, sel) => data?.zztdzwsfygcpw = sel.value,
+          (_, sel) {
+            data?.zztdzwsfygcpw = sel.value;
+            if (sel.value) {
+              // 是：类型置空
+              gcpwlx.value = null;
+              data?.gcpwlx = null;
+            } else {
+              // 否：选中第一选项
+              gcpwlx.value = gcpwlxList.value.first;
+              data?.gcpwlx = gcpwlx.value?.value;
+            }
+          },
         ),
         CardWidgets.buildMenu(
           isDetail,
@@ -176,7 +187,18 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
           '种植土地周围使用水源、土壤是否有污染',
           boolList,
           zztdzwsysytrsfywr,
-          (_, sel) => data?.zztdzwsysytrsfywr = sel.value,
+          (_, sel) {
+            data?.zztdzwsysytrsfywr = sel.value;
+            if (sel.value) {
+              // 是：类型置空
+              wrwlx.value = null;
+              data?.wrwlx = null;
+            } else {
+              // 否：选中第一选项
+              wrwlx.value = wrwlxList.value.first;
+              data?.wrwlx = wrwlx.value?.value;
+            }
+          },
         ),
         CardWidgets.buildMenu(
           isDetail,
@@ -190,25 +212,38 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
           '生产过程中是否发生比较严重的病虫害',
           boolList,
           scgczsffsbjyzdbch,
-          (_, sel) => data?.scgczsffsbjyzdbch = sel.value,
+          (_, sel) {
+            data?.scgczsffsbjyzdbch = sel.value;
+            if (sel.value) {
+              // 是：类型置空
+              bchlx.value = null;
+              data?.bchlx = null;
+            } else {
+              // 否：选中第一选项
+              bchlx.value = bchlxList.value.first;
+              data?.bchlx = bchlx.value?.value;
+            }
+          },
         ),
         CardWidgets.buildMenu(
           isDetail,
           '病虫害类型',
           bchlxList,
           bchlx,
-          (_, sel) => data?.bchlx = sel.value,
+          (_, sel) {
+            data?.bchlx = sel.value;
+          },
         ),
         CardWidgets.buildMenu(
           isDetail,
-          '收货期间是否发生连阴雨天气',
+          '收获期间是否发生连阴雨天气',
           sfList,
           shqjsffslyytq,
           (_, sel) => data?.shqjsffslyytq = sel.value,
         ),
         CardWidgets.buildMenu(
           isDetail,
-          '收货粮食水分是否偏高',
+          '收获粮食水分是否偏高',
           sfList,
           shlssfsfpg,
           (_, sel) => data?.shlssfsfpg = sel.value,
@@ -218,7 +253,18 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
           '近年来本地是否发生真菌毒素污染',
           sfList,
           jnlbdsffszmwr,
-          (_, sel) => data?.jnlbdsffszmwr = sel.value,
+          (_, sel) {
+            data?.jnlbdsffszmwr = sel.value;
+            if (sel.value == 0) {
+              // 是：类型置空
+              zjdswrlx.value = null;
+              data?.zjdswrlx = null;
+            } else {
+              // 否：选中第一选项
+              zjdswrlx.value = zjdswrlxList.value.first;
+              data?.zjdswrlx = zjdswrlx.value?.value;
+            }
+          },
         ),
         CardWidgets.buildMenu(
           isDetail,
@@ -232,7 +278,18 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
           '近年来本地是否发生重金属污染',
           sfList,
           jnlbdsfzjswr,
-          (_, sel) => data?.jnlbdsfzjswr = sel.value,
+          (_, sel) {
+            data?.jnlbdsfzjswr = sel.value;
+            if (sel.value == 0) {
+              // 是：类型置空
+              zjswrlx.value = null;
+              data?.zjswrlx = null;
+            } else {
+              // 否：选中第一选项
+              zjswrlx.value = zjswrlxList.value.first;
+              data?.zjswrlx = zjswrlx.value?.value;
+            }
+          },
         ),
         CardWidgets.buildMenu(
           isDetail,

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -30,7 +30,7 @@ class ReapSampleTaskPageArgs {
   }
 }
 
-/// 收货扦样任务
+/// 收获扦样任务
 class ReapSampleTaskPage extends StatefulWidget {
   final ReapSampleTaskPageArgs args;
 

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.7+7
+version: 0.0.8+8
 
 environment:
   sdk: '>=3.1.5 <4.0.0'