'.'

android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    compileSdkVersion 31
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -36,17 +36,41 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.worker_client"
-        minSdkVersion flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
+        minSdkVersion 21
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
+    signingConfigs {
+        debug {
+            //keystore中key的别名
+            keyAlias 'mykey'
+            //keystore中key的密码
+            keyPassword 'SJPrpy7yF8XdkXHY'
+            //keystore的文件路径，可以是绝对路径也可以是相对路径
+            storeFile file('../machinery.keystore')
+            //keystore的密码l
+            storePassword 'Op4CCmT20L0c0fLP'
+        }
+    }
+
+    dependencies {
+        implementation('com.amap.api:3dmap:9.1.0')
+        implementation('com.amap.api:location:6.1.0')
+    }
 
     buildTypes {
+        debug {
+            minifyEnabled false
+        }
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug
+
+            //关闭混淆, 否则在运行release包后可能出现运行崩溃， TODO后续进行混淆配置
+            minifyEnabled false //删除无用代码
+            shrinkResources false //删除无用资源
         }
     }
 }
@@ -54,3 +78,5 @@ android {
 flutter {
     source '../..'
 }
+
+

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,30 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.example.worker_client">
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <!--允许获取精确位置，精准定位必选-->
+    <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" tools:ignore="ProtectedPermissions" />
+    <!--允许写入扩展存储，用于写入缓存定位数据-->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!--允许读设备等信息，用于问题排查-->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
    <application
         android:label="worker_client"
         android:name="${applicationName}"
@@ -30,5 +55,10 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+       <meta-data
+           android:name="com.amap.api.v2.apikey"
+           android:value="b481b4187e24e625fa0056fd0530e663"/>
+       <service android:name="com.amap.api.location.APSService"
+           tools:ignore="MissingClass" />
     </application>
 </manifest>

android/app/src/main/java/com/example/worker_client/MainActivity.java

@@ -1,6 +0,0 @@
-package com.example.worker_client;
-
-import io.flutter.embedding.android.FlutterActivity;
-
-public class MainActivity extends FlutterActivity {
-}

android/app/src/main/kotlin/com/example/worker_client/MainActivity.kt

@@ -0,0 +1,6 @@
+package com.example.worker_client
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity() {
+}

android/app/src/main/res/values/styles.xml

@@ -4,7 +4,7 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
-        <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:windowBackground">@drawable/launch_image</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

lib/models/app.dart

@@ -1,11 +1,11 @@
 
 import 'dart:io';
 
-// import 'package:amap_flutter_location/amap_flutter_location.dart';
+import 'package:amap_flutter_location/amap_flutter_location.dart';
 import '/models/entities/person.dart';
-// import '/widgets/Modal.dart';
+import '/widgets/Modal.dart';
 import 'package:get/get.dart';
-// import '../utils/location.dart';
+import '../utils/location.dart';
 
 class AppController extends GetxController {
   // 有了这句, 可以直接 AppController.t 调用
@@ -15,37 +15,38 @@ class AppController extends GetxController {
   final location = Rxn<Map<String, Object>>();
   final testInt = 1.obs;
 
-  // AMapFlutterLocation? _location;
-  //
-  // get locationStr {
-  //   if (null == location.value) return null;
-  //
-  //   double longitude = location.value!['longitude'] as double;
-  //   double latitude = location.value!['latitude'] as double;
-  //
-  //   return longitude.toString() + "," + latitude.toString();
-  // }
-  //
-  // void onLocationChange (Map<String, Object> result) {
-  //   location(result);
-  // }
+  AMapFlutterLocation? _location;
+
+  get locationStr {
+    if (null == location.value) return null;
+
+    double longitude = location.value!['longitude'] as double;
+    double latitude = location.value!['latitude'] as double;
+
+    return longitude.toString() + "," + latitude.toString();
+  }
+
+  void onLocationChange (Map<String, Object> result) {
+
+    location(result);
+  }
 
   @override
   void onInit() {
     super.onInit();
 
-    // 尝试获取 location
-    // requireLocation(onLocationChange).then((loc) {
-    //   _location = loc;
-    // }).catchError((e) {
-    //   print(e);
-    //
-    //   showAlert(
-    //     title: '获取定位失败',
-    //     message: e.message,
-    //     onConfirm: () => exit(1),
-    //   );
-    // });
+    //尝试获取 location
+    requireLocation(onLocationChange).then((loc) {
+      _location = loc;
+    }).catchError((e) {
+      print(e);
+
+      showAlert(
+        title: '获取定位失败',
+        message: e.message,
+        onConfirm: () => exit(1),
+      );
+    });
 
     // // 尝试获取一次人员信息
     // getCurrent().then((person) {
@@ -55,11 +56,11 @@ class AppController extends GetxController {
     // });
   }
 
-  // @override
-  // void onClose() {
-  //   if (null != _location) {
-  //     _location?.destroy();
-  //   }
-  // }
+  @override
+  void onClose() {
+    if (null != _location) {
+      _location?.destroy();
+    }
+  }
 
 }

lib/pages/Login/index.dart

@@ -8,7 +8,6 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:worker_client/widgets/Cell.dart';
 import 'package:worker_client/widgets/GradientButton.dart';
-import 'package:worker_client/pages/home/index.dart';
 import 'package:worker_client/widgets/MyButton/index.dart';
 import '../../models/entities/person.dart';
 import '../../services/user.dart';
@@ -85,7 +84,7 @@ class _Login extends State<Login> {
           userLogin(phone, qCode).then((res) {
             userInfo(Person.fromJson(res['person']));
             Fluttertoast.showToast(msg: '登录成功！');
-            Get.off(Home());
+            Get.offNamed('/home');
           }).catchError((err) {
             Fluttertoast.showToast(msg: err);
           });

lib/pages/home/index.dart

@@ -115,14 +115,14 @@ class Home extends BasicPage {
                         required bool haveMore}) {
                       return RefreshBuilder(
                         fetch: (params) => getJobList(params),
-                        useState: (value) {jobList(GetList(value.records));},
+                        useState: (value) {
+                          jobList(GetList(value.records));
+                        },
                         builder: (
                             {required BuildContext context,
                             required Function toggle}) {
                           Refresh = toggle;
-                          return
-
-                                ListView.builder(
+                          return ListView.builder(
                               controller: scrollController,
                               itemCount: 1,
                               itemBuilder:
@@ -131,34 +131,33 @@ class Home extends BasicPage {
                                   ...jobList.value,
                                   ...GetList(data.records)
                                 ]);
-                                return Obx((){if (jobList.value != []) {
-                                  return Column(
-                                    children: jobList.value
-                                        .map(
-                                          (item) => MyCard(
-                                            item: item,
-                                            job: true,
-                                            detail: false,
-                                            onClick: () {
-                                              changeJob(item);
-                                            },
-                                            goDetail: () {
-                                              goDetail(item);
-                                            },
-                                            buttomText: item.status == 0
-                                                ? '开始作业'
-                                                : '完成作业',
-                                          ),
-                                        )
-                                        .toList(),
-                                  );
-                                } else {
-                                  return const Text('暂无数据');
-                                }
-                                }
+                                return Obx(() {
+                                  if (jobList.value != []) {
+                                    return Column(
+                                      children: jobList.value
+                                          .map(
+                                            (item) => MyCard(
+                                              item: item,
+                                              job: true,
+                                              detail: false,
+                                              onClick: () {
+                                                changeJob(item);
+                                              },
+                                              goDetail: () {
+                                                goDetail(item);
+                                              },
+                                              buttomText: item.status == 0
+                                                  ? '开始作业'
+                                                  : '完成作业',
+                                            ),
+                                          )
+                                          .toList(),
                                     );
-                              })
-                          ;
+                                  } else {
+                                    return const Text('暂无数据');
+                                  }
+                                });
+                              });
                         },
                         onError: () {},
                       );

lib/pages/jobDetail/index.dart

@@ -8,6 +8,7 @@ import 'package:worker_client/widgets/layout/BasicPage.dart';
 import '/widgets/MyDialog.dart' as modal;
 
 class JobDetail extends BasicPage {
+
   final job = Rx<Job>(Job());
   @override
   void beforeShow() {

lib/utils/amap/const_config.dart

@@ -0,0 +1,22 @@
+import 'package:amap_flutter_base/amap_flutter_base.dart';
+import 'package:amap_flutter_map/amap_flutter_map.dart';
+
+class ConstConfig {
+  ///配置您申请的apikey，在此处配置之后，可以在初始化[AMapWidget]时，通过`apiKey`属性设置
+  ///
+  ///注意：使用[AMapWidget]的`apiKey`属性设置的key的优先级高于通过Native配置key的优先级，
+  ///使用[AMapWidget]的`apiKey`属性配置后Native配置的key将失效，请根据实际情况选择使用
+  static const AMapApiKey amapApiKeys = AMapApiKey(
+      androidKey: 'b481b4187e24e625fa0056fd0530e663',
+      iosKey: '您申请的iOS平台的key');
+
+  ///高德隐私合规声明，这里只是示例，实际使用中请按照实际参数设置[AMapPrivacyStatement]的'hasContains''hasShow''hasAgree'这三个参数
+  ///
+  /// 注意：[AMapPrivacyStatement]的'hasContains''hasShow''hasAgree'这三个参数中有一个为false，高德SDK均不会工作，会造成地图白屏等现象
+  ///
+  /// 高德开发者合规指南请参考：https://lbs.amap.com/agreement/compliance
+  ///
+  /// 高德SDK合规使用方案请参考：https://lbs.amap.com/news/sdkhgsy
+  static const AMapPrivacyStatement amapPrivacyStatement =
+  AMapPrivacyStatement(hasContains: true, hasShow: true, hasAgree: true);
+}

lib/utils/location.dart

@@ -0,0 +1,134 @@
+import 'dart:async';
+
+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';
+
+import 'amap/const_config.dart';
+
+typedef AMAPListener = void Function (Map<String, Object>);
+
+void showPrivacy() {
+  /// 设置是否已经包含高德隐私政策并弹窗展示显示用户查看，如果未包含或者没有弹窗展示，高德定位SDK将不会工作
+  ///
+  /// 高德SDK合规使用方案请参考官网地址：https://lbs.amap.com/news/sdkhgsy
+  /// <b>必须保证在调用定位功能之前调用， 建议首次启动App时弹出《隐私政策》并取得用户同意</b>
+  ///
+  /// 高德SDK合规使用方案请参考官网地址：https://lbs.amap.com/news/sdkhgsy
+  ///
+  /// [hasContains] 隐私声明中是否包含高德隐私政策说明
+  ///
+  /// [hasShow] 隐私权政策是否弹窗展示告知用户
+  AMapFlutterLocation.updatePrivacyShow(true, true);
+
+  /// 设置是否已经取得用户同意，如果未取得用户同意，高德定位SDK将不会工作
+  ///
+  /// 高德SDK合规使用方案请参考官网地址：https://lbs.amap.com/news/sdkhgsy
+  ///
+  /// <b>必须保证在调用定位功能之前调用, 建议首次启动App时弹出《隐私政策》并取得用户同意</b>
+  ///
+  /// [hasAgree] 隐私权政策是否已经取得用户同意
+  AMapFlutterLocation.updatePrivacyAgree(true);
+}
+
+// 判断定位权限
+Future _requirePermission() async {
+  PermissionStatus _permissionGranted = await Permission.location.status;
+  if (_permissionGranted == PermissionStatus.denied) {
+    // 如果未允许, 尝试申请一次
+    _permissionGranted = await Permission.location.request();
+    if (_permissionGranted != PermissionStatus.granted) {
+      throw Exception("请设置允许当前程序定位功能");
+    }
+  }
+}
+
+Future requireLocation(AMAPListener listener) async {
+  AMapFlutterLocation.setApiKey(ConstConfig.amapApiKeys.androidKey!, ConstConfig.amapApiKeys.iosKey!);
+  showPrivacy();
+  await _requirePermission();
+  final AMapFlutterLocation location = AMapFlutterLocation();
+  location.onLocationChanged().listen(listener);
+  location.setLocationOption(_getAMapLocationOption());
+  location.startLocation();
+
+  return location;
+}
+
+_getAMapLocationOption() {
+  AMapLocationOption locationOption = new AMapLocationOption();
+
+  ///是否单次定位
+  locationOption.onceLocation = false;
+
+  ///是否需要返回逆地理信息
+  locationOption.needAddress = true;
+
+  ///逆地理信息的语言类型
+  locationOption.geoLanguage = GeoLanguage.DEFAULT;
+
+  locationOption.desiredLocationAccuracyAuthorizationMode =
+      AMapLocationAccuracyAuthorizationMode.ReduceAccuracy;
+
+  locationOption.fullAccuracyPurposeKey = "AMapLocationScene";
+
+  ///设置Android端连续定位的定位间隔
+  locationOption.locationInterval = 2000;
+
+  ///设置Android端的定位模式<br>
+  ///可选值：<br>
+  ///<li>[AMapLocationMode.Battery_Saving]</li>
+  ///<li>[AMapLocationMode.Device_Sensors]</li>
+  ///<li>[AMapLocationMode.Hight_Accuracy]</li>
+  locationOption.locationMode = AMapLocationMode.Hight_Accuracy;
+
+  ///设置iOS端的定位最小更新距离<br>
+  locationOption.distanceFilter = -1;
+
+  ///设置iOS端期望的定位精度
+  /// 可选值：<br>
+  /// <li>[DesiredAccuracy.Best] 最高精度</li>
+  /// <li>[DesiredAccuracy.BestForNavigation] 适用于导航场景的高精度 </li>
+  /// <li>[DesiredAccuracy.NearestTenMeters] 10米 </li>
+  /// <li>[DesiredAccuracy.Kilometer] 1000米</li>
+  /// <li>[DesiredAccuracy.ThreeKilometers] 3000米</li>
+  locationOption.desiredAccuracy = DesiredAccuracy.Best;
+
+  ///设置iOS端是否允许系统暂停定位
+  locationOption.pausesLocationUpdatesAutomatically = false;
+
+  return locationOption;
+}
+
+
+// import 'dart:io';
+//
+// import 'package:flutter_baidu_mapapi_base/flutter_baidu_mapapi_base.dart'
+//     show BMFMapSDK, BMF_COORD_TYPE;
+// import 'package:flutter_bmflocation/flutter_bmflocation.dart';
+// import 'package:permission_handler/permission_handler.dart';
+//
+// Future requireLocation() async {
+//   // 判断定位权限
+//   PermissionStatus _permissionGranted = await Permission.location.status;
+//   if (_permissionGranted == PermissionStatus.denied) {
+//     // 如果未允许, 尝试申请一次
+//     _permissionGranted = await Permission.location.request();
+//     if (_permissionGranted != PermissionStatus.granted) {
+//       throw Exception("请设置允许当前程序定位功能");
+//     }
+//   }
+//
+//   final LocationFlutterPlugin location = LocationFlutterPlugin();
+//
+//   // 设置是否隐私政策
+//   location.setAgreePrivacy(true);
+//   BMFMapSDK.setAgreePrivacy(true);
+//   if (Platform.isAndroid) {
+//     // Android 目前不支持接口设置Apikey,
+//     // 请在主工程的Manifest文件里设置，详细配置方法请参考官网(https://lbsyun.baidu.com/)demo
+//     BMFMapSDK.setCoordType(BMF_COORD_TYPE.COMMON);
+//   }
+//
+//   return location;
+// }

lib/widgets/MyCard/index.dart

@@ -244,16 +244,12 @@ class MyCard extends StatelessWidget {
                 Visibility(
                     child: CardCell(
                         lable: '作业时间',
-                        content: item is Job ? item.startDate.toString() : '',
+                        content: item.startDate.toString() +
+                            (item.endDate != null
+                                ? '\n' + item.endDate.toString()
+                                : ''),
                         size: 2),
                     visible: job),
-                Visibility(
-                    child: CardCell(
-                        lable: '',
-                        content:
-                            (item is Job ? item.endDate ?? '' : '').toString(),
-                        size: 2),
-                    visible: job&&item.endDate!=null),
                 CardCell(
                     lable: '订单费用',
                     content: ((item.charges ?? 0) / 100).toString(),

lib/widgets/amap/amap.dart

@@ -0,0 +1,42 @@
+import 'package:amap_flutter_map/amap_flutter_map.dart';
+import 'package:amap_flutter_base/amap_flutter_base.dart';
+import 'package:flutter/widgets.dart';
+
+import '/utils/amap/const_config.dart';
+
+// https://developer.amap.com/api/flutter/guide/map-flutter-plug-in/map-flutter-info
+class AMap extends StatelessWidget {
+  late AMapController _mapController;
+  final LatLng? position;
+  final Map<String, Marker> _markers = Map<String, Marker>();
+
+  AMap({Key? key,  this.position }): super(key: key);
+
+  void onMapCreated(AMapController controller) {
+    _mapController = controller;
+  }
+
+  void _initMarkers() {
+    if (null != position) {
+      Marker marker = Marker(
+        position: position!,
+        icon: BitmapDescriptor.fromIconPath("images/locationImage.png")
+      );
+      _markers[marker.id] = marker;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    _initMarkers();
+
+    return AMapWidget(
+      privacyStatement: ConstConfig.amapPrivacyStatement,
+      apiKey: ConstConfig.amapApiKeys,
+      markers: Set<Marker>.of(_markers.values),
+      // 默认是邓州市中心
+      initialCameraPosition: const CameraPosition(target: LatLng(32.687732, 112.08745)),
+    );
+  }
+
+}

lib/widgets/amap/const_config.dart

@@ -0,0 +1,22 @@
+import 'package:amap_flutter_base/amap_flutter_base.dart';
+import 'package:amap_flutter_map/amap_flutter_map.dart';
+
+class ConstConfig {
+  ///配置您申请的apikey，在此处配置之后，可以在初始化[AMapWidget]时，通过`apiKey`属性设置
+  ///
+  ///注意：使用[AMapWidget]的`apiKey`属性设置的key的优先级高于通过Native配置key的优先级，
+  ///使用[AMapWidget]的`apiKey`属性配置后Native配置的key将失效，请根据实际情况选择使用
+  static const AMapApiKey amapApiKeys = AMapApiKey(
+      androidKey: 'b481b4187e24e625fa0056fd0530e663',
+      iosKey: '您申请的iOS平台的key');
+
+  ///高德隐私合规声明，这里只是示例，实际使用中请按照实际参数设置[AMapPrivacyStatement]的'hasContains''hasShow''hasAgree'这三个参数
+  ///
+  /// 注意：[AMapPrivacyStatement]的'hasContains''hasShow''hasAgree'这三个参数中有一个为false，高德SDK均不会工作，会造成地图白屏等现象
+  ///
+  /// 高德开发者合规指南请参考：https://lbs.amap.com/agreement/compliance
+  ///
+  /// 高德SDK合规使用方案请参考：https://lbs.amap.com/news/sdkhgsy
+  static const AMapPrivacyStatement amapPrivacyStatement =
+  AMapPrivacyStatement(hasContains: true, hasShow: true, hasAgree: true);
+}

pubspec.lock

@@ -1,6 +1,48 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "39.0.0"
+  amap_flutter_base:
+    dependency: transitive
+    description:
+      name: amap_flutter_base
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.0"
+  amap_flutter_location:
+    dependency: "direct main"
+    description:
+      name: amap_flutter_location
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.0"
+  amap_flutter_map:
+    dependency: "direct main"
+    description:
+      name: amap_flutter_map
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.0"
+  analyzer:
+    dependency: transitive
+    description:
+      name: analyzer
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "4.0.0"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.3.0"
   async:
     dependency: transitive
     description:
@@ -15,6 +57,20 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
+  build:
+    dependency: transitive
+    description:
+      name: build
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.3.0"
+  build_config:
+    dependency: transitive
+    description:
+      name: build_config
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.0"
   carousel_slider:
     dependency: "direct main"
     description:
@@ -36,6 +92,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.1"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.1"
   clock:
     dependency: transitive
     description:
@@ -50,6 +113,20 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.15.0"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -57,6 +134,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
+  dart_style:
+    dependency: transitive
+    description:
+      name: dart_style
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.2.3"
   dio:
     dependency: "direct main"
     description:
@@ -97,6 +181,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
+  flutter_plugin_android_lifecycle:
+    dependency: transitive
+    description:
+      name: flutter_plugin_android_lifecycle
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.5"
   flutter_screenutil:
     dependency: "direct main"
     description:
@@ -135,6 +226,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.3"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.2"
   http_parser:
     dependency: transitive
     description:
@@ -149,6 +247,20 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.6.3"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "4.5.0"
+  json_serializable:
+    dependency: "direct main"
+    description:
+      name: json_serializable
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "6.2.0"
   lints:
     dependency: transitive
     description:
@@ -156,6 +268,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.1"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.2"
   matcher:
     dependency: transitive
     description:
@@ -177,6 +296,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.7.0"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.2"
   path:
     dependency: transitive
     description:
@@ -233,6 +359,41 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.5"
+  permission_handler:
+    dependency: "direct main"
+    description:
+      name: permission_handler
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "9.2.0"
+  permission_handler_android:
+    dependency: transitive
+    description:
+      name: permission_handler_android
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "9.0.2+1"
+  permission_handler_apple:
+    dependency: transitive
+    description:
+      name: permission_handler_apple
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "9.0.4"
+  permission_handler_platform_interface:
+    dependency: transitive
+    description:
+      name: permission_handler_platform_interface
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.7.0"
+  permission_handler_windows:
+    dependency: transitive
+    description:
+      name: permission_handler_windows
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.1.0"
   platform:
     dependency: transitive
     description:
@@ -254,11 +415,39 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.2.4"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.1.1"
+  pubspec_parse:
+    dependency: transitive
+    description:
+      name: pubspec_parse
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.2.0"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.99"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.2.2"
+  source_helper:
+    dependency: transitive
+    description:
+      name: source_helper
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.3.2"
   source_span:
     dependency: transitive
     description:
@@ -280,6 +469,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
@@ -315,6 +511,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.1"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "1.0.1"
   win32:
     dependency: transitive
     description:
@@ -329,6 +532,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.0+1"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.1.0"
 sdks:
   dart: ">=2.16.1 <3.0.0"
   flutter: ">=2.8.1"

pubspec.yaml

@@ -40,7 +40,11 @@ dependencies:
   get_storage: ^2.0.3
   fluttertoast: ^8.0.9
   carousel_slider: ^4.0.0
+  amap_flutter_map: ^3.0.0
+  amap_flutter_location: ^3.0.0
+  permission_handler: ^9.2.0
 
+  json_serializable: ^6.1.5
 
 dev_dependencies:
   flutter_test:
@@ -53,6 +57,9 @@ dev_dependencies:
   # rules and activating additional ones.
   flutter_lints: ^1.0.0
   fluttertoast: ^8.0.9
+
+  json_serializable: ^6.1.5
+  flutter_screenutil: ^5.3.1
 # For information on the generic Dart part of this file, see the
 # following pages: https://dart.dev/tools/pub/pubspec