v0.0.7 修改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/page/sample_task/reap_sample_detail/reap_sample_disaster_detail_page.dart

@@ -22,7 +22,8 @@ class ReapSampleDisasterDetailPage extends StatefulWidget {
   State<ReapSampleDisasterDetailPage> createState() => _ReapSampleDisasterDetailPageState();
 }
 
-class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDisasterDetailPage> with AutomaticKeepAliveClientMixin {
+class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDisasterDetailPage>
+    with AutomaticKeepAliveClientMixin {
   SampleTaskItem? data;
   late bool isDetail;
 
@@ -75,7 +76,8 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
     num? selValue,
   ) {
     // 菜单数据
-    notifier.value = (DictService.getDictList(type) ?? []).map((e) => CardMenuData(e.label, e.value)).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);
@@ -91,18 +93,30 @@ 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;
+    }
 
     // 水源、土壤污染
     setBoolMenuSelNotifier(zztdzwsysytrsfywr, data?.zztdzwsysytrsfywr ?? false);
 
     // 污染物类型
     setDictMenuNotifier(wrwlxList, wrwlx, DictType.wrwlx, data?.wrwlx);
+    if (data?.wrwlx == null) {
+      wrwlx.value = wrwlxList.value[0];
+      data?.wrwlx = wrwlxList.value[0].value;
+    }
 
     // 病虫害
     setBoolMenuSelNotifier(scgczsffsbjyzdbch, data?.scgczsffsbjyzdbch ?? false);
 
     // 病虫害类型
     setDictMenuNotifier(bchlxList, bchlx, DictType.bchlx, data?.bchlx);
+    if (data?.bchlx == null) {
+      bchlx.value = bchlxList.value[0];
+      data?.bchlx = bchlxList.value[0].value;
+    }
 
     // 收货期间是否发生连阴雨天气
     setNumBoolMenuSelNotifier(shqjsffslyytq, data?.shqjsffslyytq ?? 1);
@@ -115,12 +129,20 @@ 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;
+    }
 
     // 近年来本地是否发生重金属污染
     setNumBoolMenuSelNotifier(jnlbdsfzjswr, data?.jnlbdsfzjswr ?? 1);
 
     // 重金属污染类型
     setDictMenuNotifier(zjswrlxList, zjswrlx, DictType.zjswrlx, data?.zjswrlx);
+    if (data?.zjswrlx == null) {
+      zjswrlx.value = zjswrlxList.value[0];
+      data?.zjswrlx = zjswrlxList.value[0].value;
+    }
   }
 
   @override
@@ -147,7 +169,7 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
           '工厂排污类型',
           gcpwlxList,
           gcpwlx,
-          (_, sel) => data?.gcpwlx = num.parse(sel.value),
+          (_, sel) => data?.gcpwlx = sel.value,
         ),
         CardWidgets.buildMenu(
           isDetail,
@@ -161,7 +183,7 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
           '污染物类型',
           wrwlxList,
           wrwlx,
-          (_, sel) => data?.wrwlx = num.parse(sel.value),
+          (_, sel) => data?.wrwlx = sel.value,
         ),
         CardWidgets.buildMenu(
           isDetail,
@@ -175,7 +197,7 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
           '病虫害类型',
           bchlxList,
           bchlx,
-          (_, sel) => data?.bchlx = num.parse(sel.value),
+          (_, sel) => data?.bchlx = sel.value,
         ),
         CardWidgets.buildMenu(
           isDetail,
@@ -203,7 +225,7 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
           '真菌毒素污染类型',
           zjdswrlxList,
           zjdswrlx,
-          (_, sel) => data?.zjdswrlx = num.parse(sel.value),
+          (_, sel) => data?.zjdswrlx = sel.value,
         ),
         CardWidgets.buildMenu(
           isDetail,
@@ -217,7 +239,7 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
           '重金属污染类型',
           zjswrlxList,
           zjswrlx,
-          (_, sel) => data?.zjswrlx = num.parse(sel.value),
+          (_, sel) => data?.zjswrlx = sel.value,
         ),
       ],
     );

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -46,6 +46,8 @@ class ReapSampleTaskPage extends StatefulWidget {
 class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> with TickerProviderStateMixin {
   late ReapSampleTaskPageArgs args;
 
+  bool isDetail = false;
+
   final pageStatus = DataStatusModel<SampleTaskItem?>().notifier<DataStatusModel<SampleTaskItem?>>();
 
   late PageController pageCtrl;
@@ -100,6 +102,7 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
       if (data == null) {
         pageStatus.update(pageStatus.value.empty());
       } else {
+        isDetail = data.deliveryStatus != 1;
         cratePageList(data);
         pageStatus.update(pageStatus.value.success(data: data));
       }

lib/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart

@@ -25,7 +25,8 @@ class ReapSampleVarietyDetailPage extends StatefulWidget {
   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;
@@ -41,6 +42,7 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
   /// 优质品种类型
   final yzpzlxList = <CardMenuData>[].notifier<List<CardMenuData>>();
   final yzpzlx = null.notifier<CardMenuData?>();
+  final yzpzlxEnable = true.notifier<bool>();
 
   /// 收获时间
   final shsj = null.notifier<String?>();
@@ -85,6 +87,10 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
       yzlxType = DictType.dgpzyzlx;
     } else if (cypzName.contains('大豆')) {
       yzlxType = DictType.ddyzpzlx;
+    } else {
+      yzpzlxEnable.value = false;
+      data?.sfyzpz = 1;
+      sfyzpz.value = CardMenuData(StringUtils.boolStrByNum(data?.sfyzpz), data?.sfyzpz);
     }
     // 优质品种类型下拉
     yzpzlxList.value = (DictService.getDictList(yzlxType) ?? []).map((e) => CardMenuData(e.label, e.value)).toList();
@@ -152,12 +158,14 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
           data?.jtpzmc,
           onChanged: (value) => data?.jtpzmc = value,
         ),
-        CardWidgets.buildMenu(
-          isDetail,
-          '是否优质品种',
-          sfList,
-          sfyzpz,
-          (_, sel) => data?.sfyzpz = sel.value,
+        yzpzlxEnable.builder(
+          (enable) => CardWidgets.buildMenu(
+            isDetail || !enable,
+            '是否优质品种',
+            sfList,
+            sfyzpz,
+            (_, sel) => data?.sfyzpz = sel.value,
+          ),
         ),
         CardWidgets.buildMenu(
           isDetail,

lib/page/sample_task/sample_list_vm.dart

@@ -9,56 +9,48 @@ import 'package:lszlgl/model/rsp/sample_task_rsp.dart';
 import '../../network/my_api.dart';
 
 class SampleListVM extends BaseVM {
+  late List<EasyRefreshController> ctrlList;
+  late List<SampleTaskListReq> reqList;
+  late List<ValueNotifier<DataStatusModel<List<SampleTaskItem>>>> pageStateList;
+
   SampleListVM() {
-    _uncompletedCtrl = EasyRefreshController(controlFinishRefresh: true, controlFinishLoad: true);
-    _completeCtrl = EasyRefreshController(controlFinishRefresh: true, controlFinishLoad: true);
-    uncompletedReq = SampleTaskListReq(deliveryStatus: 1);
-    completeReq = SampleTaskListReq(deliveryStatus: 2);
+    pageStateList = [
+      DataStatusModel<List<SampleTaskItem>>().notifier<DataStatusModel<List<SampleTaskItem>>>(),
+      DataStatusModel<List<SampleTaskItem>>().notifier<DataStatusModel<List<SampleTaskItem>>>(),
+      DataStatusModel<List<SampleTaskItem>>().notifier<DataStatusModel<List<SampleTaskItem>>>(),
+    ];
+    ctrlList = [
+      EasyRefreshController(controlFinishRefresh: true, controlFinishLoad: true),
+      EasyRefreshController(controlFinishRefresh: true, controlFinishLoad: true),
+      EasyRefreshController(controlFinishRefresh: true, controlFinishLoad: true),
+    ];
+    reqList = [
+      SampleTaskListReq(deliveryStatus: 0),
+      SampleTaskListReq(deliveryStatus: 1),
+      SampleTaskListReq(deliveryStatus: 2),
+    ];
   }
 
-  /// 刷新控制
-  late final EasyRefreshController _uncompletedCtrl;
-  late final EasyRefreshController _completeCtrl;
-
-  /// 请求参数
-  late final SampleTaskListReq uncompletedReq;
-  late final SampleTaskListReq completeReq;
-
-  /// 页面数据
-  final uncompletedPageState =
-      DataStatusModel<List<SampleTaskItem>>().notifier<DataStatusModel<List<SampleTaskItem>>>();
-  final completePageState = DataStatusModel<List<SampleTaskItem>>().notifier<DataStatusModel<List<SampleTaskItem>>>();
-
   /// 当前页面
   final bool currentComplete = false;
 
-  EasyRefreshController getCtrl(bool complete) => complete ? _completeCtrl : _uncompletedCtrl;
-
-  SampleTaskListReq getReq(bool complete) => complete ? completeReq : uncompletedReq;
-
-  ValueNotifier<DataStatusModel<List<SampleTaskItem>>> getPageState(bool complete) =>
-      complete ? completePageState : uncompletedPageState;
-
-  void refresh(bool complete) {
-    if (complete) {
-      _completeCtrl.callRefresh(overOffset: 100);
-    } else {
-      _uncompletedCtrl.callRefresh(overOffset: 100);
-    }
+  void refresh(int index) {
+    ctrlList[index].callRefresh(overOffset: 100);
   }
 
   void refreshAll() {
-    refresh(false);
-    refresh(true);
+    refresh(0);
+    refresh(1);
+    refresh(2);
   }
 
   /// 获取数据
-  /// * [complete] 刷新页面
+  /// * [index] 页面索引
   /// * [refresh] 是否刷新 true=刷新, false=加载更多
-  void getData(bool complete, {bool refresh = true}) async {
-    var req = getReq(complete);
-    var pageState = getPageState(complete);
-    var ctrl = getCtrl(complete);
+  void getData(int index, {bool refresh = true}) async {
+    var req = reqList[index];
+    var pageState = pageStateList[index];
+    var ctrl = ctrlList[index];
     if (refresh) {
       req.pageNo = 1;
     }
@@ -93,10 +85,12 @@ class SampleListVM extends BaseVM {
 
   @override
   void dispose() {
-    _uncompletedCtrl.dispose();
-    _completeCtrl.dispose();
-    uncompletedPageState.dispose();
-    completePageState.dispose();
+    for (var ctrl in ctrlList) {
+      ctrl.dispose();
+    }
+    for (var pageState in pageStateList) {
+      pageState.dispose();
+    }
     super.dispose();
   }
 }

lib/page/sample_task/sample_task_list_page.dart

@@ -1,7 +1,6 @@
 import 'package:easy_refresh/easy_refresh.dart';
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
-import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/base/base_vm.dart';
 import 'package:lszlgl/config/colors.dart';
 import 'package:lszlgl/model/rsp/sample_task_rsp.dart';
@@ -20,12 +19,12 @@ import 'stock_sample_detail/stock_sample_task_page.dart';
 /// 扦样环节列表
 class SampleTaskListPage extends StatefulWidget {
   final StepType type;
-  final bool complete;
+  final int tabIndex;
 
   const SampleTaskListPage({
     super.key,
     required this.type,
-    this.complete = false,
+    required this.tabIndex,
   });
 
   @override
@@ -73,7 +72,7 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
 
   @override
   void onFirstShow(Duration timeStamp) {
-    vm.refresh(widget.complete);
+    vm.refresh(widget.tabIndex);
   }
 
   @override
@@ -92,19 +91,19 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
 
   Widget buildBody() {
     return EasyRefresh.builder(
-      controller: vm.getCtrl(widget.complete),
-      onRefresh: () => vm.getData(widget.complete, refresh: true),
-      onLoad: () => vm.getData(widget.complete, refresh: false),
+      controller: vm.ctrlList[widget.tabIndex],
+      onRefresh: () => vm.getData(widget.tabIndex, refresh: true),
+      onLoad: () => vm.getData(widget.tabIndex, refresh: false),
       childBuilder: (_, physics) => buildList(physics),
     );
   }
 
   Widget buildList(ScrollPhysics physics) {
-    var sliver = vm.getPageState(widget.complete).builder((v) {
+    var sliver = vm.pageStateList[widget.tabIndex].builder((v) {
       var list = v.data;
       if (v.status == DataStatus.error) {
         // 加载失败
-        return SliverToBoxAdapter(child: PageLoadingWidget.error(onTap: () => vm.refresh(widget.complete)));
+        return SliverToBoxAdapter(child: PageLoadingWidget.error(onTap: () => vm.refresh(widget.tabIndex)));
       } else if (list == null || list.isEmpty) {
         // 无数据
         return const SliverToBoxAdapter(child: PageLoadingWidget.empty());
@@ -125,7 +124,7 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
     return GestureDetector(
       behavior: HitTestBehavior.opaque,
       onTap: () {
-        if (!widget.complete) return;
+        if (item.deliveryStatus != 2) return;
         startTaskDetail(true, item);
       },
       child: Container(
@@ -202,7 +201,8 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
 
   Widget buildGrid(SampleTaskItem item) {
     List<Map<String, String?>> infoList;
-    if (!widget.complete) {
+    if (item.deliveryStatus != 2) {
+      // 未扦样
       infoList = [
         {'采样品种': item.cypzName},
         {'检验指标': item.jyzb},
@@ -210,6 +210,7 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
         {'扦样地区': item.qydq},
       ];
     } else {
+      // 已扦样
       infoList = [
         {'采样品种': item.cypzName},
         {'检验指标': item.jyzb},
@@ -240,8 +241,8 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
   }
 
   Widget buildBottom(SampleTaskItem item) {
-    if (widget.complete) return const SizedBox.shrink();
-    Widget button;
+    if (item.deliveryStatus == 2) return const SizedBox.shrink();
+    Widget button = const SizedBox.shrink();
     if (widget.type == StepType.reap && item.deliveryStatus == 0) {
       button = MyButton(
         '任务领取',

lib/page/sample_task/sample_task_list_tab_page.dart

@@ -52,17 +52,19 @@ class _SampleTaskListTabPageState extends BaseLifecycleState<SampleTaskListTabPa
   @override
   void onInit() {
     vm = Inject.put<SampleListVM>(SampleListVM(), dispose: (v) => v.dispose());
-    vm.uncompletedReq.rwlx = widget.args.type.value;
-    vm.completeReq.rwlx = widget.args.type.value;
+    for (var req in vm.reqList) {
+      req.rwlx = widget.args.type.value;
+    }
 
-    tabCtrl = TabController(length: 2, vsync: this);
-    pageCtrl = PageController();
-
-    tabTextList = ['未扦样', '已扦样'];
+    tabTextList = ['待领取', '待扦样', '已扦样'];
     pageList = [
-      SampleTaskListPage(type: widget.args.type),
-      SampleTaskListPage(type: widget.args.type, complete: true),
+      SampleTaskListPage(type: widget.args.type, tabIndex: 0),
+      SampleTaskListPage(type: widget.args.type, tabIndex: 1),
+      SampleTaskListPage(type: widget.args.type, tabIndex: 2),
     ];
+
+    tabCtrl = TabController(length: tabTextList.length, vsync: this);
+    pageCtrl = PageController();
   }
 
   @override

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