feats

android/app/build.gradle

@@ -57,18 +57,21 @@ android {
     dependencies {
 //        implementation 'com.google.android.material:material:1.5.0'
         implementation('com.amap.api:3dmap:9.1.0')
-//        implementation('com.amap.api:location:6.1.0')
+        implementation('com.amap.api:location:6.1.0')
     }
 
     buildTypes {
+        debug {
+            minifyEnabled true
+        }
         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 //删除无用资源
+            minifyEnabled true //删除无用代码
+//            shrinkResources false //删除无用资源
         }
     }
 }

android/app/proguard-rules.pro

@@ -6,13 +6,22 @@
 #-keep class io.flutter.**  { *; }
 #-keep class io.flutter.plugins.**  { *; }
 
-#高德地图SDK配置
--keep   class com.amap.api.maps.**{*;}
--keep   class com.autonavi.**{*;}
--keep   class com.amap.api.trace.**{*;}
-
-#高德等位SDK配置
+-keep class com.amap.api.**{*;}
+#3D 地图 V5.0.0之后
+-keep class com.amap.api.maps.**{*;}
+-keep class com.autonavi.**{*;}
+-keep class com.amap.api.trace.**{*;}
+#定位
 -keep class com.amap.api.location.**{*;}
 -keep class com.amap.api.fence.**{*;}
 -keep class com.loc.**{*;}
--keep class com.autonavi.aps.amapapi.model.**{*;}
+-keep class com.autonavi.aps.amapapi.model.**{*;}
+
+##搜索
+#-keep class com.amap.api.services.**{*;}
+##2D地图
+#-keep class com.amap.api.maps2d.**{*;}
+#-keep class com.amap.api.mapcore2d.**{*;}
+##导航
+#-keep class com.amap.api.navi.**{*;}
+#-keep class com.autonavi.**{*;}

lib/models/Store.dart

@@ -1 +0,0 @@
-// TODO Implement this library.

lib/models/User.dart

@@ -1,15 +0,0 @@
-
-import 'package:farmer_client/models/entities/person.dart';
-import 'package:get/get.dart';
-
-class User extends GetxController {
-  Person? _person;
-  Person? get person => _person;
-  set person (Person? p) {
-    _person = p;
-    update();
-  }
-
-  bool get isLogin => _person != null;
-
-}

lib/models/app.dart

@@ -1,10 +1,11 @@
 
+import 'dart:async';
 import 'dart:io';
 
+import 'package:amap_flutter_location/amap_flutter_location.dart';
 import 'package:farmer_client/models/entities/person.dart';
+import 'package:farmer_client/widgets/Modal.dart';
 import 'package:get/get.dart';
-import 'package:location/location.dart';
-import '../services/user.dart';
 import '../utils/location.dart';
 
 class AppController extends GetxController {
@@ -12,12 +13,19 @@ class AppController extends GetxController {
   static AppController t = Get.find();
 
   final user = Rx<Person>(Person());
-  final location = Rxn<LocationData>();
+  final location = Rxn<Map<String, Object>>();
   final testInt = 1.obs;
 
+  AMapFlutterLocation? _location;
+  StreamSubscription<Map<String, Object>>? _locationListener;
+
   get locationStr {
     if (null == location.value) return null;
-    return location.value!.longitude.toString() + "," + location.value!.latitude.toString();
+
+    double longitude = location.value!['longitude'] as double;
+    double latitude = location.value!['latitude'] as double;
+
+    return longitude.toString() + "," + latitude.toString();
   }
 
   @override
@@ -26,28 +34,21 @@ class AppController extends GetxController {
 
     // 尝试获取 location
     requireLocation().then((loc) async {
-      var _data = await loc.getLocation();
-      location(_data);
+      _location = loc;
 
       // 监听位置变化
-      loc.onLocationChanged.listen((LocationData currentLocation) {
-        location(currentLocation);
+      _locationListener = loc.onLocationChanged().listen((Map<String, Object> result) {
+        location(result);
       });
+      loc.startLocation();
     }).catchError((e) {
       print(e);
 
-      var message = e.message.toString().contains('CANCELED')
-          ? '您取消了, 确定后将退出程序'
-          : e.message;
-
-      // Get.dialog();
-      // Get.defaultDialog(
-      //   title: '提示',
-      //   middleText: message,
-      //   radius: 8,
-      //   textConfirm: '确定',
-      //   onConfirm: () => exit(1),
-      // );
+      showAlert(
+        title: '获取定位失败',
+        message: e.message,
+        onConfirm: () => exit(1),
+      );
     });
 
     // // 尝试获取一次人员信息
@@ -58,4 +59,15 @@ class AppController extends GetxController {
     // });
   }
 
+  @override
+  void onClose() {
+    if (null != _locationListener) {
+      _locationListener?.cancel();
+    }
+
+    if (null != _location) {
+      _location?.destroy();
+    }
+  }
+
 }

lib/pages/home/index.dart

@@ -20,7 +20,7 @@ class Home extends BasicPage {
       //   return Modal(type: 'dialog', title: '测试', message: '这是一段 message ！', onConfirm: () => print('hahahaha'),);
       // } );
       // Get.dialog(Modal(type: 'dialog', title: '测试', message: '这是一段 message ！', onConfirm: () => print('hahahaha'),));
-      modal.showDialog(title: '测试', content: SizedBox(width: 300, height: 300,), onConfirm: () => false);
+      modal.showDialog(title: '测试', content: SizedBox(width: 400, height: 300,), onConfirm: () => false);
     }, 2000);
     
     return const HomePage();

lib/utils/location.dart

@@ -1,25 +1,48 @@
-import 'package:location/location.dart';
+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';
 
 Future requireLocation() async {
-  Location location = Location();
-  bool _serviceEnabled;
-  PermissionStatus _permissionGranted;
-
-  _serviceEnabled = await location.serviceEnabled();
-  if (!_serviceEnabled) {
-    _serviceEnabled = await location.requestService();
-    if (!_serviceEnabled) {
-      throw Exception("请开启系统定位功能");
-    }
-  }
+  AMapLocationOption locationOption = AMapLocationOption();
+  final AMapFlutterLocation location = AMapFlutterLocation();
+  location.setLocationOption(locationOption);
 
-  _permissionGranted = await location.hasPermission();
+  /// 设置是否已经包含高德隐私政策并弹窗展示显示用户查看，如果未包含或者没有弹窗展示，高德定位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);
+
+  // 判断定位权限
+  PermissionStatus _permissionGranted = await Permission.location.status;
   if (_permissionGranted == PermissionStatus.denied) {
-    _permissionGranted = await location.requestPermission();
+    // 如果未允许, 尝试申请一次
+    _permissionGranted = await Permission.location.request();
     if (_permissionGranted != PermissionStatus.granted) {
       throw Exception("请设置允许当前程序定位功能");
     }
   }
 
+  AMapFlutterLocation.setApiKey(ConstConfig.amapApiKeys.androidKey!, ConstConfig.amapApiKeys.iosKey!);
+
   return location;
-}
+}

lib/widgets/amap/amap.dart

@@ -2,7 +2,7 @@ import 'package:amap_flutter_map/amap_flutter_map.dart';
 import 'package:amap_flutter_base/amap_flutter_base.dart';
 import 'package:flutter/widgets.dart';
 
-import 'const_config.dart';
+import 'package:farmer_client/utils/amap/const_config.dart';
 
 // https://developer.amap.com/api/flutter/guide/map-flutter-plug-in/map-flutter-info
 class AMap extends StatelessWidget {

pubspec.lock

@@ -15,6 +15,13 @@ packages:
       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:
@@ -70,7 +77,7 @@ packages:
       name: carousel_slider
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.0.0"
+    version: "4.1.1"
   characters:
     dependency: transitive
     description:
@@ -273,27 +280,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.1"
-  location:
-    dependency: "direct main"
-    description:
-      name: location
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "4.3.0"
-  location_platform_interface:
-    dependency: transitive
-    description:
-      name: location_platform_interface
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.3.0"
-  location_web:
-    dependency: transitive
-    description:
-      name: location_web
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "3.1.1"
   logging:
     dependency: transitive
     description:
@@ -385,6 +371,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:

pubspec.yaml

@@ -44,10 +44,11 @@ dependencies:
   flutter_screenutil: ^5.3.1
   get_storage: ^2.0.3
   fluttertoast: ^8.0.9
-  location: ^4.3.0
+#  location: ^4.3.0
   amap_flutter_map: ^3.0.0
-  #  amap_flutter_location: ^3.0.0
+  amap_flutter_location: ^3.0.0
   carousel_slider: ^4.0.0
+  permission_handler: ^9.2.0