fix MyLocationPage&LimitMapBoundsPage mis-match

kuloud · Jun 27, 2024 · 2c3e525 · 2c3e525
1 parent 61202ad
commit 2c3e525
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/example/lib/data/demos.dart b/example/lib/data/demos.dart
@@ -37,15 +37,15 @@ List<Demo> mapDemos() {
         subtitle: '定位蓝点指的是进入地图后显示当前位置点的功能',
         slug: 'my-location',
         configurations: [
-          DemoConfiguration(buildRoute: (context) => LimitMapBoundsPage())
+          DemoConfiguration(buildRoute: (context) => MyLocationPage())
         ]),
     Demo(
         title: '限制地图显示范围',
         category: DemoCategory.basic,
         subtitle: '演示限定手机屏幕显示地图的范围',
         slug: 'limit-map-bounds',
         configurations: [
-          DemoConfiguration(buildRoute: (context) => MyLocationPage())
+          DemoConfiguration(buildRoute: (context) => LimitMapBoundsPage())
         ]),
   ];
 }

diff --git a/example/lib/pages/map/map_my_location.dart b/example/lib/pages/map/map_my_location.dart
@@ -9,6 +9,8 @@ class MyLocationPage extends StatefulWidget {
 }
 
 class _BodyState extends State<MyLocationPage> {
+  AMapController? _mapController;
+
   @override
   void initState() {
     super.initState();
@@ -35,6 +37,15 @@ class _BodyState extends State<MyLocationPage> {
         circleStrokeColor: Colors.blue,
         circleStrokeWidth: 1,
       ),
+      onLocationChanged: (loc) {
+        if (isLocationValid(loc)) {
+          print(loc);
+          _mapController?.moveCamera(CameraUpdate.newLatLng(loc.latLng));
+        }
+      },
+      onMapCreated: (controller) {
+        _mapController = controller;
+      },
     );
 
     return Container(

diff --git a/example/lib/routes.dart b/example/lib/routes.dart
@@ -43,5 +43,6 @@ class RouteConfig {
         );
       }
     }
+    return null;
   }
 }
diff --git a/lib/amap_map.dart b/lib/amap_map.dart
@@ -31,3 +31,4 @@ part 'src/amap_initializer.dart';
 part 'src/amap_controller.dart';
 part 'src/amap_widget.dart';
 part 'src/amap_loader.dart';
+part 'src/utils/location_utils.dart';
diff --git a/lib/src/utils/location_utils.dart b/lib/src/utils/location_utils.dart
@@ -0,0 +1,17 @@
+part of amap_map;
+
+bool isLocationValid(AMapLocation location) {
+  final LatLng latLng = location.latLng;
+
+  if (latLng.latitude < -90 ||
+      latLng.latitude > 90 ||
+      latLng.longitude < -180 ||
+      latLng.longitude > 180) {
+    return false;
+  }
+  if (location.accuracy < 0) {
+    return false;
+  }
+
+  return true;
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,5 +43,6 @@ class RouteConfig { @@
             );
           }
         }
+        return null;
       }
     }