v0.0.5; 修改logo; 修改收购扦样列表; 修改收购扦样详情和编辑;

README.md

@@ -14,3 +14,13 @@ A few resources to get you started if this is your first Flutter project:
 For help getting started with Flutter development, view the
 [online documentation](https://docs.flutter.dev/), which offers tutorials,
 samples, guidance on mobile development, and a full API reference.
+
+### 2024.03.14 app改动点：
+1. 扦样任务单状态新增：待领取, 检测机构收到扦样任务通知时，所有扦样人员都能看到所有任务单据，在app待扦样页面进行任务领取.
+现在的开始扦样按钮改成任务领取，点击任务领取以后扦样任务单状态改成待扦样，列表页按钮变成开始扦样，点击扦样进行正常操作。√
+2. 扦样人员变成多选，后端提供人员接口，选择扦样人员；
+3. 温度、湿度字段去掉，新增字段：天气情况：晴天/阴天/雨天，单选；√
+4. 扦样时间默认给当前时间；√
+5. 灾害污染情况给默认值：否；√
+6. 点击经纬度获取，自动代入省市县乡镇村；√
+7. 列表页显示字段修改：扦样任务单号/状态/检验指标/样品等级/采样品种；√

android/app/build.gradle

@@ -77,6 +77,11 @@ android {
             it.outputFileName = "lszlgl_${buildType}_${defaultConfig.versionName}_${defaultConfig.versionCode}.apk"
         }
     }
+
+    dependencies {
+        implementation fileTree(include: ['*.jar'], dir: 'libs')
+        implementation 'com.amap.api:location:5.6.0'
+    }
 }
 
 flutter {

android/app/src/main/AndroidManifest.xml

@@ -1,32 +1,66 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <!--允许访问网络，必选权限-->
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <!--允许获取精确位置，精准定位必选-->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+    <!--允许获取粗略位置，粗略定位必选-->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+    <!--允许获取设备和运营商信息，用于问题排查和网络定位（无gps情况下的定位），若需网络定位功能则必选-->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
+    <!--允许获取网络状态，用于网络定位（无gps情况下的定位），若需网络定位功能则必选-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <!--允许获取wifi网络信息，用于网络定位（无gps情况下的定位），若需网络定位功能则必选-->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+
+    <!--允许获取wifi状态改变，用于网络定位（无gps情况下的定位），若需网络定位功能则必选-->
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+
+    <!--后台获取位置信息，若需后台定位则必选-->
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+
+    <!--用于申请调用A-GPS模块,卫星定位加速-->
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
+
+    <!--允许写设备缓存，用于问题排查-->
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+
+    <!--允许写入扩展存储，用于写入缓存定位数据-->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <!--允许读设备等信息，用于问题排查-->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+    <!--允许安装应用-->
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+
     <application
-        android:label="粮食质量管理"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:label="粮食质量管理">
         <activity
             android:name=".MainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:exported="true"
+            android:hardwareAccelerated="true"
             android:launchMode="singleTop"
+            android:networkSecurityConfig="@xml/network_security_config"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize"
-            android:networkSecurityConfig="@xml/network_security_config">
+            android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
@@ -34,5 +68,8 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+
+        <!-- 配置定位Service -->
+        <service android:name="com.amap.api.location.APSService"/>
     </application>
 </manifest>

lib/main.dart

@@ -8,6 +8,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:logger/logger.dart';
 import 'package:lszlgl/network/base_dio.dart';
 import 'package:lszlgl/router/my_navigator.dart';
+import 'package:lszlgl/utils/location_utils.dart';
 import 'package:lszlgl/utils/sp_utils.dart';
 
 import 'config/reresh_config.dart';
@@ -25,6 +26,9 @@ void main() async {
     BaseDio.get().init();
     await SPUtils.getInstance().init();
     RefreshConfig.get().initDefault();
+    LocationUtils.updatePrivacyShow(true, true);
+    LocationUtils.updatePrivacyAgree(true);
+    LocationUtils.setApiKey('2c783509376e267b24d63b21681686fa', '');
     runApp(const MyApp());
   });
 }

lib/model/rsp/sample_task_rsp.dart

@@ -26,7 +26,10 @@ class SampleTaskItem {
   String? fjrq; // 分解日期
   String? ypbh; // 样品编号
   String? jtpzmc; // 具体品种名称
-  num? deliveryStatus; // 任务单任务状态：0是待扦样,1已扦样
+  num? deliveryStatus; // 任务单任务状态：0是待领取,1是待扦样,2已扦样
+  num? ypdj; // 样品等级--字典获取
+  String? jyzb; // 检验指标：质量/品质/食安
+  String? qydq; // 扦样地区
   num? jhcysl; // 计划采样数量
   num? zljysl; // 质量检验数量
   num? pzjyjg; // 品质检验机构
@@ -74,6 +77,7 @@ class SampleTaskItem {
   num? createTime; // 创建时间
   num? state; // 0是待扦样,1已扦样,2已完成
   String? name; // 扦样人员姓名
+  String? dgryName; // 扦样多个人员名称: 张三,李四
   String? rwjssj; // 任务接收时间
   String? bsjzsj; // 报送截止时间
   num? rwlx; // 任务类型/监测环节
@@ -103,6 +107,7 @@ class SampleTaskItem {
   num? zjswrlx; // 重金属污染类型
   List<JyjgxxItem>? jyjgxxRespVOList; // 检验机构信息
   num? jypzStatus; // 检验品质按钮0显示1不显示
+  num? tqqk; // 天气情况
 
   SampleTaskItem({
     this.id,
@@ -111,6 +116,9 @@ class SampleTaskItem {
     this.ypbh,
     this.jtpzmc,
     this.deliveryStatus,
+    this.ypdj,
+    this.jyzb,
+    this.qydq,
     this.jhcysl,
     this.zljysl,
     this.pzjyjg,
@@ -158,6 +166,7 @@ class SampleTaskItem {
     this.createTime,
     this.state,
     this.name,
+    this.dgryName,
     this.rwjssj,
     this.bsjzsj,
     this.rwlx,
@@ -185,6 +194,7 @@ class SampleTaskItem {
     this.zjswrlx,
     this.jyjgxxRespVOList,
     this.jypzStatus,
+    this.tqqk,
   });
 
   factory SampleTaskItem.fromJson(Map<String, dynamic> json) => _$SampleTaskItemFromJson(json);
@@ -192,7 +202,8 @@ class SampleTaskItem {
   Map<String, dynamic> toJson() => _$SampleTaskItemToJson(this);
 
   String getDeliveryStatusText() {
-    return switch (deliveryStatus) { 0 => '待扦样', 1 => '已扦样', _ => '' };
+    // 任务单任务状态：0是待领取,1是待扦样,2已扦样
+    return switch (deliveryStatus) { 0 => '待领取', 1 => '待扦样', 2 => '已扦样', _ => '' };
   }
 
   Map<String, dynamic> getReqJson() {
@@ -233,6 +244,8 @@ class SampleTaskItem {
     map['jnlbdsfzjswr'] = jnlbdsfzjswr;
     map['zjswrlx'] = zjswrlx;
     map['codeUseMedicineList'] = codeUseMedicineList?.map((e) => e.toReqJson()).toList();
+    map['dgryName'] = dgryName;
+    map['tqqk'] = tqqk;
 
     return map;
   }

lib/model/rsp/sample_task_rsp.g.dart

@@ -28,6 +28,9 @@ SampleTaskItem _$SampleTaskItemFromJson(Map<String, dynamic> json) =>
       ypbh: const StringConverter().fromJson(json['ypbh']),
       jtpzmc: const StringConverter().fromJson(json['jtpzmc']),
       deliveryStatus: const NumConverter().fromJson(json['deliveryStatus']),
+      ypdj: const NumConverter().fromJson(json['ypdj']),
+      jyzb: const StringConverter().fromJson(json['jyzb']),
+      qydq: const StringConverter().fromJson(json['qydq']),
       jhcysl: const NumConverter().fromJson(json['jhcysl']),
       zljysl: const NumConverter().fromJson(json['zljysl']),
       pzjyjg: const NumConverter().fromJson(json['pzjyjg']),
@@ -80,6 +83,7 @@ SampleTaskItem _$SampleTaskItemFromJson(Map<String, dynamic> json) =>
       createTime: const NumConverter().fromJson(json['createTime']),
       state: const NumConverter().fromJson(json['state']),
       name: const StringConverter().fromJson(json['name']),
+      dgryName: const StringConverter().fromJson(json['dgryName']),
       rwjssj: const StringConverter().fromJson(json['rwjssj']),
       bsjzsj: const StringConverter().fromJson(json['bsjzsj']),
       rwlx: const NumConverter().fromJson(json['rwlx']),
@@ -117,6 +121,7 @@ SampleTaskItem _$SampleTaskItemFromJson(Map<String, dynamic> json) =>
           ?.map((e) => JyjgxxItem.fromJson(e as Map<String, dynamic>))
           .toList(),
       jypzStatus: const NumConverter().fromJson(json['jypzStatus']),
+      tqqk: const NumConverter().fromJson(json['tqqk']),
     );
 
 Map<String, dynamic> _$SampleTaskItemToJson(SampleTaskItem instance) =>
@@ -127,6 +132,9 @@ Map<String, dynamic> _$SampleTaskItemToJson(SampleTaskItem instance) =>
       'ypbh': const StringConverter().toJson(instance.ypbh),
       'jtpzmc': const StringConverter().toJson(instance.jtpzmc),
       'deliveryStatus': const NumConverter().toJson(instance.deliveryStatus),
+      'ypdj': const NumConverter().toJson(instance.ypdj),
+      'jyzb': const StringConverter().toJson(instance.jyzb),
+      'qydq': const StringConverter().toJson(instance.qydq),
       'jhcysl': const NumConverter().toJson(instance.jhcysl),
       'zljysl': const NumConverter().toJson(instance.zljysl),
       'pzjyjg': const NumConverter().toJson(instance.pzjyjg),
@@ -179,6 +187,7 @@ Map<String, dynamic> _$SampleTaskItemToJson(SampleTaskItem instance) =>
       'createTime': const NumConverter().toJson(instance.createTime),
       'state': const NumConverter().toJson(instance.state),
       'name': const StringConverter().toJson(instance.name),
+      'dgryName': const StringConverter().toJson(instance.dgryName),
       'rwjssj': const StringConverter().toJson(instance.rwjssj),
       'bsjzsj': const StringConverter().toJson(instance.bsjzsj),
       'rwlx': const NumConverter().toJson(instance.rwlx),
@@ -207,6 +216,7 @@ Map<String, dynamic> _$SampleTaskItemToJson(SampleTaskItem instance) =>
       'zjswrlx': const NumConverter().toJson(instance.zjswrlx),
       'jyjgxxRespVOList': instance.jyjgxxRespVOList,
       'jypzStatus': const NumConverter().toJson(instance.jypzStatus),
+      'tqqk': const NumConverter().toJson(instance.tqqk),
     };
 
 EnterpriseItem _$EnterpriseItemFromJson(Map<String, dynamic> json) =>

lib/network/api.dart

@@ -63,6 +63,10 @@ abstract class Api {
   @GET('/admin-api/zj/base-grain-information/lsxxfl')
   Future<ApiRsp<List<LsxxRsp>?>> lsxxList(@Query('zlmc') String zlmc);
 
+  /// 领取扦样任务单-收购
+  @GET('/admin-api/zj/code-sampling-task-details-sgjc/updateStatus')
+  Future<ApiRsp<num?>> receiveSampleTaskSgjc(@Query('id') num id);
+
   /// 省市县
   @GET('/admin-api/zj/base-administrative-division/list')
   Future<ApiRsp<List<DistrictRsp>?>> districtList(

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -1,6 +1,12 @@
+import 'dart:async';
+import 'dart:convert';
+import 'package:amap_flutter_location/amap_location_option.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
+import 'package:lszlgl/main.dart';
 import 'package:lszlgl/utils/input_formatter.dart';
+import 'package:lszlgl/utils/location_utils.dart';
+import 'package:lszlgl/widget/button.dart';
+import 'package:lszlgl/widget/menu_dialog.dart';
 import '../../../base/base_lifecycle_state.dart';
 import '../../../model/rsp/dict_rsp.dart';
 import '../../../model/rsp/sample_task_rsp.dart';
@@ -23,14 +29,12 @@ 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;
 
-  final shengList = <CardMenuData>[].notifier<List<CardMenuData>>();
-  final shiList = <CardMenuData>[].notifier<List<CardMenuData>>();
-  final quList = <CardMenuData>[].notifier<List<CardMenuData>>();
+  StreamSubscription? locationListener;
+
   final xianList = <CardMenuData>[].notifier<List<CardMenuData>>();
   final cunList = <CardMenuData>[].notifier<List<CardMenuData>>();
   final sheng = null.notifier<CardMenuData?>();
@@ -42,25 +46,26 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   final trxxList = <CardMenuData>[].notifier<List<CardMenuData>>();
   final trxx = null.notifier<CardMenuData?>();
 
+  final qyddjwd = null.notifier<String?>();
+
   /// 获取行政区划列表
-  Future<void> getDistrictList(num level, {num? id}) async {
+  Future<List<CardMenuData>?> getDistrictList(num level, {num? id}) async {
     MyNavigator.showLoading();
     try {
       var rsp = await MyApi.get().districtList(level, id: id);
       List<CardMenuData> list = (rsp.data ?? []).map((e) => CardMenuData(e.uname, e.id)).toList();
-      if (level == 1) {
-        shengList.value = list;
-      } else if (level == 2) {
-        shiList.value = list;
-      } else if (level == 3) {
-        quList.value = list;
-      } else if (level == 4) {
+      if (level == 4) {
         xianList.value = list;
       } else if (level == 5) {
         cunList.value = list;
       }
-    } catch (e) {}
+      MyNavigator.dismissLoading();
+      return list;
+    } catch (e) {
+      logger.e(e);
+    }
     MyNavigator.dismissLoading();
+    return null;
   }
 
   /// 获取土壤信息列表
@@ -78,50 +83,16 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
         }
       }
       trxxList.value = list;
-    } catch (e) {}
+    } catch (e) {
+      logger.e(e);
+    }
     MyNavigator.dismissLoading();
   }
 
   /// 选中行政区划
   void onSelectXzqh(ValueNotifier<CardMenuData?> selNotifier, CardMenuData selData) {
     num level = 100;
-    if (selNotifier == sheng) {
-      level = 1;
-      data?.shengXzqh = selData.value;
-      data?.shiXzqh = null;
-      data?.quXzqh = null;
-      data?.xiangXzqh = null;
-      data?.cunXzqh = null;
-      shi.value = null;
-      qu.value = null;
-      xian.value = null;
-      cun.value = null;
-      shiList.value = [];
-      quList.value = [];
-      xianList.value = [];
-      cunList.value = [];
-    } else if (selNotifier == shi) {
-      level = 2;
-      data?.shiXzqh = selData.value;
-      data?.quXzqh = null;
-      data?.xiangXzqh = null;
-      data?.cunXzqh = null;
-      qu.value = null;
-      xian.value = null;
-      cun.value = null;
-      quList.value = [];
-      xianList.value = [];
-      cunList.value = [];
-    } else if (selNotifier == qu) {
-      level = 3;
-      data?.quXzqh = selData.value;
-      data?.xiangXzqh = null;
-      data?.cunXzqh = null;
-      xian.value = null;
-      cun.value = null;
-      xianList.value = [];
-      cunList.value = [];
-    } else if (selNotifier == xian) {
+    if (selNotifier == xian) {
       level = 4;
       data?.xiangXzqh = selData.value;
       data?.cunXzqh = null;
@@ -139,8 +110,6 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
 
   /// 获取编辑数据
   void getEditData() {
-    // 省
-    getDistrictList(1);
     // 市
     if (data?.shengXzqh != null) {
       getDistrictList(2, id: data?.shengXzqh);
@@ -159,6 +128,90 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     }
   }
 
+  void getLocation() async {
+    bool granted = await LocationUtils.requestLocationPermission();
+    if (!granted) {
+      MyNavigator.showToast('请打开APP的定位权限');
+      return;
+    }
+    LocationUtils.setLocationOption(AMapLocationOption(onceLocation: true));
+    LocationUtils.startLocation();
+  }
+
+  void initLocation() {
+    locationListener = LocationUtils.onLocationChanged().listen((value) async {
+      logger.d('LocationChanged:${jsonEncode(value)}');
+      var lon = (value['longitude'] as double).toStringAsFixed(2);
+      var lat = (value['latitude'] as double).toStringAsFixed(2);
+      var province = value['province'];
+      var city = value['city'] == province ? '市辖区' : value['city'];
+      var district = value['district'];
+      // if (value['province'] != data?.sheng) {
+      //   MyNavigator.showToast('扦样地点有误，请检查扦样人员所在地点。');
+      //   return;
+      // }
+      // 市、区、县、村数据清除
+      data?.shiXzqh = null;
+      shi.value = null;
+
+      data?.quXzqh = null;
+      qu.value = null;
+
+      data?.xiangXzqh = null;
+      xian.value = null;
+      xianList.value = [];
+
+      data?.cunXzqh = null;
+      cun.value = null;
+      cunList.value = [];
+
+      bool stepSuccess = false;
+      // 省
+      var provinceList = await getDistrictList(1);
+      if (provinceList == null) return;
+      for (CardMenuData item in provinceList) {
+        if (item.name == province) {
+          data?.shengXzqh = item.value;
+          sheng.value = item;
+          stepSuccess = true;
+          break;
+        }
+      }
+      if (!stepSuccess) return;
+      stepSuccess = false;
+      // 市
+      var cityList = await getDistrictList(2, id: data?.shengXzqh);
+      if (cityList == null) return;
+      for (CardMenuData item in cityList) {
+        if (item.name == city) {
+          data?.shiXzqh = item.value;
+          shi.value = item;
+          stepSuccess = true;
+          break;
+        }
+      }
+      if (!stepSuccess) return;
+      stepSuccess = false;
+      // 区
+      var districtList = await getDistrictList(3, id: data?.shiXzqh);
+      if (districtList == null) return;
+      for (CardMenuData item in districtList) {
+        if (item.name == district) {
+          data?.quXzqh = item.value;
+          qu.value = item;
+          getDistrictList(4, id: item.value);
+          break;
+        }
+      }
+      String jwd = '$lon，$lat';
+      qyddjwd.value = jwd;
+      data?.qyddjwd = jwd;
+    });
+    if (!isDetail && data?.shiXzqh == null) {
+      getLocation();
+    }
+  }
+
   @override
   bool get wantKeepAlive => true;
 
@@ -174,13 +227,22 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     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);
+    qyddjwd.value = data?.qyddjwd;
     // 编辑数据
     if (!isDetail) {
       getEditData();
+      initLocation();
     }
   }
 
   @override
+  void onDestroy() {
+    LocationUtils.stopLocation();
+    LocationUtils.destroy();
+    locationListener?.cancel();
+  }
+
+  @override
   Widget build(BuildContext context) {
     super.build(context);
     return SingleChildScrollView(child: buildList());
@@ -191,17 +253,26 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
       children: [
         CardItemWidget('扦样任务单号', rightText: data?.qyrwdh, bottomLine: true),
         CardItemWidget('扦样单位', rightText: data?.dwmc, bottomLine: true),
-        CardItemWidget('扦样人员', rightText: data?.name, bottomLine: true),
+        CardItemWidget(
+          '扦样人员',
+          rightText: data?.name,
+          bottomLine: true,
+          trailing: isDetail ? null : Image.asset(imgItemArrowDown, width: 20),
+          onTap: isDetail ? null : () => showMenuDialog(isScrollControlled: true),
+        ),
         CardItemWidget('监测类别', rightText: DictService.getLabel(DictType.jclb, value: data?.jclb), bottomLine: true),
-        CardWidgets.buildMenu(isDetail, '省份', shengList, sheng, onSelectXzqh),
-        CardWidgets.buildMenu(isDetail, '市区', shiList, shi, onSelectXzqh),
-        CardWidgets.buildMenu(isDetail, '区县', quList, qu, onSelectXzqh),
+        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)),
         CardWidgets.buildMenu(isDetail, '乡镇', xianList, xian, onSelectXzqh),
         CardWidgets.buildMenu(isDetail, '村', cunList, cun, onSelectXzqh),
-        CardItemWidget(
-          '扦样地点经纬度',
-          rightText: data?.qyddjwd,
-          bottomLine: true,
+        qyddjwd.builder(
+          (v) => CardItemWidget(
+            '扦样地点经纬度',
+            rightText: v,
+            bottomLine: true,
+            trailing: isDetail ? null : MyButton('获取经纬度', onTap: getLocation, alignment: null),
+          ),
         ),
         CardWidgets.buildEdit(
           isDetail,

lib/page/sample_task/reap_sample_detail/reap_sample_disaster_detail_page.dart

@@ -22,8 +22,7 @@ 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;
 
@@ -88,37 +87,37 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
     isDetail = widget.detail;
 
     // 工厂排污
-    setBoolMenuSelNotifier(zztdzwsfygcpw, data?.zztdzwsfygcpw);
+    setBoolMenuSelNotifier(zztdzwsfygcpw, data?.zztdzwsfygcpw ?? false);
 
     // 工厂排污类型
     setDictMenuNotifier(gcpwlxList, gcpwlx, DictType.gcpwlx, data?.gcpwlx);
 
     // 水源、土壤污染
-    setBoolMenuSelNotifier(zztdzwsysytrsfywr, data?.zztdzwsysytrsfywr);
+    setBoolMenuSelNotifier(zztdzwsysytrsfywr, data?.zztdzwsysytrsfywr ?? false);
 
     // 污染物类型
     setDictMenuNotifier(wrwlxList, wrwlx, DictType.wrwlx, data?.wrwlx);
 
     // 病虫害
-    setBoolMenuSelNotifier(scgczsffsbjyzdbch, data?.scgczsffsbjyzdbch);
+    setBoolMenuSelNotifier(scgczsffsbjyzdbch, data?.scgczsffsbjyzdbch ?? false);
 
     // 病虫害类型
     setDictMenuNotifier(bchlxList, bchlx, DictType.bchlx, data?.bchlx);
 
     // 收货期间是否发生连阴雨天气
-    setNumBoolMenuSelNotifier(shqjsffslyytq, data?.shqjsffslyytq);
+    setNumBoolMenuSelNotifier(shqjsffslyytq, data?.shqjsffslyytq ?? 1);
 
     // 收货粮食水分是否偏高
-    setNumBoolMenuSelNotifier(shlssfsfpg, data?.shlssfsfpg);
+    setNumBoolMenuSelNotifier(shlssfsfpg, data?.shlssfsfpg ?? 1);
 
     // 近年来本地是否发生真菌毒素污染
-    setNumBoolMenuSelNotifier(jnlbdsffszmwr, data?.jnlbdsffszmwr);
+    setNumBoolMenuSelNotifier(jnlbdsffszmwr, data?.jnlbdsffszmwr ?? 1);
 
     // 真菌毒素污染类型
     setDictMenuNotifier(zjdswrlxList, zjdswrlx, DictType.zjdswrlx, data?.zjdswrlx);
 
     // 近年来本地是否发生重金属污染
-    setNumBoolMenuSelNotifier(jnlbdsfzjswr, data?.jnlbdsfzjswr);
+    setNumBoolMenuSelNotifier(jnlbdsfzjswr, data?.jnlbdsfzjswr ?? 1);
 
     // 重金属污染类型
     setDictMenuNotifier(zjswrlxList, zjswrlx, DictType.zjswrlx, data?.zjswrlx);

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -10,6 +10,7 @@ import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_org_detai
 import 'package:lszlgl/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart';
 
 import '../../../base/base_vm.dart';
+import '../../../main.dart';
 import '../../../network/my_api.dart';
 import '../../../widget/button.dart';
 import '../../../widget/page_widget.dart';
@@ -85,7 +86,9 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
       } else {
         MyNavigator.showToast('提交失败');
       }
-    } catch (e) {}
+    } catch (e) {
+      logger.e(e);
+    }
     MyNavigator.dismissLoading();
   }
 

lib/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart

@@ -48,6 +48,10 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
   /// 扦样时间
   final qysj = null.notifier<String?>();
 
+  /// 天气情况
+  final tqqkList = <CardMenuData>[].notifier<List<CardMenuData>>();
+  final tqqk = null.notifier<CardMenuData?>();
+
   /// 获取粮食信息列表
   Future<void> getLsxxList() async {
     MyNavigator.showLoading();
@@ -102,7 +106,22 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
     // 优质品种菜单数据
     getYxpzList();
     shsj.value = data?.shsj;
+
+    // 扦样时间
     qysj.value = data?.qysj;
+    if (!isDetail && data?.qysj == null) {
+      // 默认当前时间
+      var date = DateTimeUtils.yyyymmdd(date: DateTime.now());
+      qysj.value = date;
+      data?.qysj = date;
+    }
+
+    // 天气情况
+    tqqkList.value = (DictService.getDictList(DictType.tqqk) ?? []).map((e) {
+      var menu = CardMenuData(e.label, num.parse(e.value ?? '0'));
+      if (menu.value == data?.tqqk) tqqk.value = menu;
+      return menu;
+    }).toList();
   }
 
   @override
@@ -118,9 +137,10 @@ 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),
         CardWidgets.buildMenu(
           isDetail,
-          '采样品种',
+          '粮食品类',
           lspzList,
           lspz,
           (_, sel) => data?.lspz = sel.value?.toString(),
@@ -174,21 +194,14 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
           formatters: [XNumberTextInputFormatter()],
           onChanged: (value) => data?.qydbsl = value.isEmpty ? null : num.parse(value),
         ),
-        CardWidgets.buildEdit(
-          isDetail,
-          '温度（℃）',
-          data?.wendu?.toString(),
-          inputType: const TextInputType.numberWithOptions(decimal: true),
-          formatters: [XNumberTextInputFormatter()],
-          onChanged: (value) => data?.wendu = value.isEmpty ? null : num.parse(value),
-        ),
-        CardWidgets.buildEdit(
+        CardWidgets.buildMenu(
           isDetail,
-          '湿度（%）',
-          data?.shidu?.toString(),
-          inputType: const TextInputType.numberWithOptions(decimal: true),
-          formatters: [XNumberTextInputFormatter()],
-          onChanged: (value) => data?.shidu = value.isEmpty ? null : num.parse(value),
+          '天气情况',
+          tqqkList,
+          tqqk,
+          (_, sel) {
+            // data?.tqqk = sel.value?.toString();
+          },
         ),
       ],
     );

lib/page/sample_task/sample_list_vm.dart

@@ -12,8 +12,8 @@ class SampleListVM extends BaseVM {
   SampleListVM() {
     _uncompletedCtrl = EasyRefreshController(controlFinishRefresh: true, controlFinishLoad: true);
     _completeCtrl = EasyRefreshController(controlFinishRefresh: true, controlFinishLoad: true);
-    uncompletedReq = SampleTaskListReq(deliveryStatus: 0);
-    completeReq = SampleTaskListReq(deliveryStatus: 1);
+    uncompletedReq = SampleTaskListReq(deliveryStatus: 1);
+    completeReq = SampleTaskListReq(deliveryStatus: 2);
   }
 
   /// 刷新控制

lib/page/sample_task/sample_task_list_page.dart

@@ -5,6 +5,7 @@ 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';
+import 'package:lszlgl/network/my_api.dart';
 import 'package:lszlgl/page/sample_task/sample_list_vm.dart';
 import 'package:lszlgl/page/sample_task/sample_task_list_tab_page.dart';
 import 'package:lszlgl/service/dict_service.dart';
@@ -50,6 +51,21 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
     }
   }
 
+  /// 领取扦样任务
+  void receiveTask(SampleTaskItem data) async {
+    MyNavigator.showLoading();
+    try {
+      var rsp = await MyApi.get().receiveSampleTaskSgjc(data.id ?? 0);
+      MyNavigator.dismissLoading();
+      if (rsp.data == 1) {
+        MyNavigator.showToast('领取成功');
+        vm.refreshAll();
+      }
+    } catch (e) {
+      MyNavigator.dismissLoading();
+    }
+  }
+
   @override
   void onInit() {
     vm = Inject.get<SampleListVM>()!;
@@ -185,23 +201,22 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
   }
 
   Widget buildGrid(SampleTaskItem item) {
-    List<Map<String, String>> infoList;
-    var jclb = DictService.getDict(DictType.jclb, value: item.jclb)?.label;
-    if (widget.complete) {
+    List<Map<String, String?>> infoList;
+    if (!widget.complete) {
       infoList = [
-        {'采样品种': item.cypzName ?? ''},
-        {'粮食品类': item.lspz ?? ''},
-        {'监测类别': jclb ?? ''},
-        {'扦样数量(kg)': '${item.qysl ?? ''}'},
-        {'扦样人员': item.name ?? ''},
-        {'扦样时间': item.qysj ?? ''},
+        {'采样品种': item.cypzName},
+        {'检验指标': item.jyzb},
+        {'样品等级': DictService.getDict(DictType.ypdj, value: item.ypdj)?.label},
+        {'扦样地区': item.qydq},
       ];
     } else {
       infoList = [
-        {'采样品种': item.cypzName ?? ''},
-        {'报送截止时间': item.bsjzsj ?? ''},
-        {'监测类别': jclb ?? ''},
-        {'扦样人员': item.name ?? ''},
+        {'采样品种': item.cypzName},
+        {'检验指标': item.jyzb},
+        {'样品等级': DictService.getDict(DictType.ypdj, value: item.ypdj)?.label},
+        {'扦样地区': item.qydq},
+        {'扦样人员': item.qyryName},
+        {'扦样时间': item.qysj},
       ];
     }
     return Padding(
@@ -214,7 +229,7 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
             return SizedBox(
               width: constraints.maxWidth / 2 - 2,
               child: Text(
-                '${item.keys.first}：${item.values.first}',
+                '${item.keys.first}：${item.values.first ?? ''}',
                 style: const TextStyle(fontSize: 13, color: MyColor.c_666666),
               ),
             );
@@ -226,6 +241,24 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
 
   Widget buildBottom(SampleTaskItem item) {
     if (widget.complete) return const SizedBox.shrink();
+    Widget button;
+    if (widget.type == StepType.reap && item.deliveryStatus == 0) {
+      button = MyButton(
+        '任务领取',
+        onTap: () => receiveTask(item),
+        fountSize: 13,
+        alignment: null,
+        padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 12),
+      );
+    } else {
+      button = MyButton(
+        '开始扦样',
+        onTap: () => startTaskDetail(false, item),
+        fountSize: 13,
+        alignment: null,
+        padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 12),
+      );
+    }
     return Column(
       children: [
         buildDivider(),
@@ -234,18 +267,12 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
             const SizedBox(width: 8),
             Expanded(
               child: Text(
-                '[${item.qyryName ?? ''}]创建于${DateTimeUtils.yyyymmdd(timestamp: item.createTime) ?? ''}',
+                '扦样单据创建于${DateTimeUtils.yyyymmdd(timestamp: item.createTime) ?? ''}',
                 style: const TextStyle(fontSize: 13, color: MyColor.c_666666),
               ),
             ),
             const SizedBox(width: 4),
-            MyButton(
-              '开始扦样',
-              onTap: () => startTaskDetail(false, item),
-              fountSize: 13,
-              alignment: null,
-              padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 12),
-            ),
+            button,
             const SizedBox(width: 12),
           ],
         ),

lib/page/sample_task/sample_task_list_tab_page.dart

@@ -58,7 +58,7 @@ class _SampleTaskListTabPageState extends BaseLifecycleState<SampleTaskListTabPa
     tabCtrl = TabController(length: 2, vsync: this);
     pageCtrl = PageController();
 
-    tabTextList = ['待扦样', '扦样完成'];
+    tabTextList = ['未扦样', '已扦样'];
     pageList = [
       SampleTaskListPage(type: widget.args.type),
       SampleTaskListPage(type: widget.args.type, complete: true),

lib/router/my_router.dart

@@ -80,7 +80,7 @@ class MyRouter {
   }
 
   /// 收获扦样任务
-  static Future<dynamic> startReapSampleTask({ReapSampleTaskPageArgs? args}) {
+  static Future<dynamic> startReapSampleTask({ReapSampleTaskPageArgs? args}) async {
     return MyNavigator.push(rReapSampleTaskPage, args: args ?? ReapSampleTaskPageArgs());
   }
 

lib/service/dict_service.dart

@@ -1,8 +1,12 @@
 import 'package:lszlgl/model/rsp/dict_rsp.dart';
 
 enum DictType {
+  // 天气情况
+  tqqk('tqqk'),
   // 监测类别
   jclb('jclb'),
+  // 样品等级
+  ypdj('ypdj'),
   // 小麦品种优质类型
   xmpzyzlx('xmpzyzlx'),
   // 玉米品种优质类型

lib/utils/location_utils.dart

@@ -0,0 +1,131 @@
+import 'package:amap_flutter_location/amap_flutter_location.dart';
+import 'package:amap_flutter_location/amap_location_option.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+class LocationUtils {
+  LocationUtils._();
+
+  ///设置Android和iOS的apikey，建议在weigdet初始化时设置<br>
+  ///apiKey的申请请参考高德开放平台官网<br>
+  ///Android端: https://lbs.amap.com/api/android-location-sdk/guide/create-project/get-key<br>
+  ///iOS端: https://lbs.amap.com/api/ios-location-sdk/guide/create-project/get-key<br>
+  ///[androidKey] Android平台的key<br>
+  ///[iosKey] ios平台的key<br>
+  static void setApiKey(String androidKey, String iosKey) {
+    AMapFlutterLocation.setApiKey(androidKey, iosKey);
+  }
+
+  /// 设置是否已经包含高德隐私政策并弹窗展示显示用户查看，如果未包含或者没有弹窗展示，高德定位SDK将不会工作<br>
+  /// 高德SDK合规使用方案请参考官网地址：https://lbs.amap.com/news/sdkhgsy<br>
+  /// <b>必须保证在调用定位功能之前调用， 建议首次启动App时弹出《隐私政策》并取得用户同意</b><br>
+  /// 高德SDK合规使用方案请参考官网地址：https://lbs.amap.com/news/sdkhgsy
+  /// [hasContains] 隐私声明中是否包含高德隐私政策说明<br>
+  /// [hasShow] 隐私权政策是否弹窗展示告知用户<br>
+  static void updatePrivacyShow(bool hasContains, bool hasShow) {
+    AMapFlutterLocation.updatePrivacyShow(hasContains, hasShow);
+  }
+
+  /// 设置是否已经取得用户同意，如果未取得用户同意，高德定位SDK将不会工作<br>
+  /// 高德SDK合规使用方案请参考官网地址：https://lbs.amap.com/news/sdkhgsy<br>
+  /// <b>必须保证在调用定位功能之前调用, 建议首次启动App时弹出《隐私政策》并取得用户同意</b><br>
+  /// [hasAgree] 隐私权政策是否已经取得用户同意<br>
+  static void updatePrivacyAgree(bool hasAgree) {
+    AMapFlutterLocation.updatePrivacyAgree(hasAgree);
+  }
+
+  static AMapFlutterLocation? _location;
+
+  static AMapFlutterLocation get location => _location ??= AMapFlutterLocation();
+
+  /// 设置定位参数
+  static AMapFlutterLocation setLocationOption(AMapLocationOption option) {
+    location.setLocationOption(option);
+    return location;
+  }
+
+  ///开始定位
+  static AMapFlutterLocation startLocation() {
+    location.startLocation();
+    return location;
+  }
+
+  ///停止定位
+  static AMapFlutterLocation stopLocation() {
+    location.stopLocation();
+    return location;
+  }
+
+  ///销毁定位
+  static void destroy() {
+    location.destroy();
+    _location = null;
+  }
+
+  ///定位结果回调
+  ///
+  ///定位结果以map的形式透出，其中包含的key已经含义如下：
+  ///
+  /// `callbackTime`:回调时间，格式为"yyyy-MM-dd HH:mm:ss"
+  ///
+  /// `locationTime`:定位时间， 格式为"yyyy-MM-dd HH:mm:ss"
+  ///
+  /// `locationType`:  定位类型， 具体类型可以参考https://lbs.amap.com/api/android-location-sdk/guide/utilities/location-type
+  ///
+  /// `latitude`:纬度
+  ///
+  /// `longitude`:精度
+  ///
+  /// `accuracy`:精确度
+  ///
+  /// `altitude`:海拔, android上只有locationType==1时才会有值
+  ///
+  /// `bearing`: 角度，android上只有locationType==1时才会有值
+  ///
+  /// `speed`:速度， android上只有locationType==1时才会有值
+  ///
+  /// `country`: 国家，android上只有通过[AMapLocationOption.needAddress]为true时才有可能返回值
+  ///
+  /// `province`: 省，android上只有通过[AMapLocationOption.needAddress]为true时才有可能返回值
+  ///
+  /// `city`: 城市，android上只有通过[AMapLocationOption.needAddress]为true时才有可能返回值
+  ///
+  /// `district`: 城镇（区），android上只有通过[AMapLocationOption.needAddress]为true时才有可能返回值
+  ///
+  /// `street`: 街道，android上只有通过[AMapLocationOption.needAddress]为true时才有可能返回值
+  ///
+  /// `streetNumber`: 门牌号，android上只有通过[AMapLocationOption.needAddress]为true时才有可能返回值
+  ///
+  /// `cityCode`: 城市编码，android上只有通过[AMapLocationOption.needAddress]为true时才有可能返回值
+  ///
+  /// `adCode`: 区域编码， android上只有通过[AMapLocationOption.needAddress]为true时才有可能返回值
+  ///
+  /// `address`: 地址信息， android上只有通过[AMapLocationOption.needAddress]为true时才有可能返回值
+  ///
+  /// `description`: 位置语义， android上只有通过[AMapLocationOption.needAddress]为true时才有可能返回值
+  ///
+  /// `errorCode`: 错误码，当定位失败时才会返回对应的错误码， 具体错误请参考：https://lbs.amap.com/api/android-location-sdk/guide/utilities/errorcode
+  ///
+  /// `errorInfo`: 错误信息， 当定位失败时才会返回
+  static Stream<Map<String, Object>> onLocationChanged() {
+    return location.onLocationChanged();
+  }
+
+  /// 申请定位权限
+  /// 授予定位权限返回true， 否则返回false
+  static Future<bool> requestLocationPermission() async {
+    //获取当前的权限
+    var status = await Permission.location.status;
+    if (status == PermissionStatus.granted) {
+      //已经授权
+      return true;
+    } else {
+      //未授权则发起一次申请
+      status = await Permission.location.request();
+      if (status == PermissionStatus.granted) {
+        return true;
+      } else {
+        return false;
+      }
+    }
+  }
+}

lib/widget/card_item.dart

@@ -94,14 +94,12 @@ class CardItemWidget extends StatelessWidget {
   }
 
   Widget buildTitle() {
-    return Expanded(
-      child: Text(
-        title,
-        style: const TextStyle(
-          color: Color(0xFF333333),
-          fontSize: 14,
-          fontWeight: FontWeight.w500,
-        ),
+    return Text(
+      title,
+      style: const TextStyle(
+        color: Color(0xFF333333),
+        fontSize: 14,
+        fontWeight: FontWeight.w500,
       ),
     );
   }

lib/widget/menu_dialog.dart

@@ -0,0 +1,76 @@
+import 'package:flutter/material.dart';
+import 'package:lszlgl/base/base_lifecycle_state.dart';
+import 'package:lszlgl/widget/button.dart';
+
+Future<T?> showMenuDialog<T>({
+  BoxConstraints? constraints,
+  bool isScrollControlled = false,
+  bool isDismissible = true,
+  bool enableDrag = true,
+  bool useSafeArea = false,
+  RouteSettings? routeSettings,
+  AnimationController? animationCtrl,
+  Offset? anchorPoint,
+}) {
+  return showModalBottomSheet(
+    context: MyNavigator.navigator.currentState!.context,
+    constraints: constraints,
+    isScrollControlled: isScrollControlled,
+    isDismissible: isDismissible,
+    enableDrag: enableDrag,
+    showDragHandle: true,
+    useSafeArea: useSafeArea,
+    routeSettings: routeSettings,
+    transitionAnimationController: animationCtrl,
+    anchorPoint: anchorPoint,
+    builder: (_) => MenuDialog(),
+  );
+}
+
+class MenuDialog extends StatelessWidget {
+  const MenuDialog({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        buildTitle(),
+        buildButton(),
+      ],
+    );
+  }
+
+  Widget buildTitle() {
+    return const Padding(
+      padding: EdgeInsets.only(left: 24, top: 16, bottom: 8),
+      child: Text(
+        '请选择：',
+        style: TextStyle(color: Color(0xFF333333), fontSize: 16, fontWeight: FontWeight.w500),
+      ),
+    );
+  }
+
+  // Widget buildList() {
+  //   return ListView.builder(
+  //     padding: EdgeInsets.zero,
+  //     itemBuilder: (_, index) => buildItem(index),
+  //   );
+  // }
+  //
+  // Widget buildItem(int index) {}
+
+  Widget buildButton() {
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 16, top: 8),
+      child: Row(
+        children: [
+          const Spacer(),
+          Expanded(flex: 2, child: MyButton('确认', onTap: () => MyNavigator.pop())),
+          const Spacer(),
+        ],
+      ),
+    );
+  }
+}

pubspec.lock

@@ -9,6 +9,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "64.0.0"
+  amap_flutter_location:
+    dependency: "direct main"
+    description:
+      name: amap_flutter_location
+      sha256: f35ff00e196d579608e0bc28ccbc1f6f53787644702f947de941f775769cc701
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
   analyzer:
     dependency: transitive
     description:

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.4+4
+version: 0.0.5+5
 
 environment:
   sdk: '>=3.1.5 <4.0.0'
@@ -78,6 +78,8 @@ dependencies:
   install_plugin: ^2.1.0
   # 权限管理
   permission_handler: ^11.3.0
+  # 高德定位
+  amap_flutter_location: ^3.0.0
 
 dev_dependencies:
   flutter_test: