1、导航和地图冲突问题解决

ios/Classes/AMapFlutterFactory.m

@@ -6,7 +6,7 @@
 //
 
 #import "AMapFlutterFactory.h"
-#import <MAMapKit/MAMapKit.h>
+#include <AMapNaviKit/MAMapKit.h>
 #import "AMapViewController.h"
 
 @implementation AMapFlutterFactory {

ios/Classes/AMapViewController.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 #import <Flutter/Flutter.h>
-#import <MAMapKit/MAMapKit.h>
+#include <AMapNaviKit/MAMapKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

ios/Classes/Category/MAAnnotationView+Flutter.h

@@ -5,7 +5,7 @@
 //  Created by lly on 2020/11/5.
 //
 
-#import <MAMapKit/MAMapKit.h>
+#include <AMapNaviKit/MAMapKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

ios/Classes/Category/MAMapView+Flutter.h

@@ -5,7 +5,7 @@
 //  Created by lly on 2020/10/30.
 //
 
-#import <MAMapKit/MAMapKit.h>
+#include <AMapNaviKit/MAMapKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

ios/Classes/Category/MAPointAnnotation+Flutter.h

@@ -5,7 +5,7 @@
 //  Created by lly on 2020/11/9.
 //
 
-#import <MAMapKit/MAMapKit.h>
+#include <AMapNaviKit/MAMapKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

ios/Classes/Category/MAPolygon+Flutter.h

@@ -5,7 +5,7 @@
 //  Created by lly on 2020/11/12.
 //
 
-#import <MAMapKit/MAMapKit.h>
+#include <AMapNaviKit/MAMapKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

ios/Classes/Category/MAPolygonRenderer+Flutter.h

@@ -5,7 +5,7 @@
 //  Created by lly on 2020/11/12.
 //
 
-#import <MAMapKit/MAMapKit.h>
+#include <AMapNaviKit/MAMapKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

ios/Classes/Category/MAPolyline+Flutter.h

@@ -5,7 +5,7 @@
 //  Created by lly on 2020/11/9.
 //
 
-#import <MAMapKit/MAMapKit.h>
+#include <AMapNaviKit/MAMapKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

ios/Classes/Category/MAPolylineRenderer+Flutter.h

@@ -5,7 +5,7 @@
 //  Created by lly on 2020/11/7.
 //
 
-#import <MAMapKit/MAMapKit.h>
+#include <AMapNaviKit/MAMapKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

ios/Classes/Model/AMapMarker.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 #import <CoreLocation/CoreLocation.h>
-#import <MAMapKit/MAMapKit.h>
+#include <AMapNaviKit/MAMapKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

ios/Classes/Model/AMapPolygon.h

@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <MAMapKit/MAMapKit.h>
+#include <AMapNaviKit/MAMapKit.h>
 #import <CoreLocation/CoreLocation.h>
 
 NS_ASSUME_NONNULL_BEGIN

ios/Classes/Model/AMapPolyline.h

@@ -6,7 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <MAMapKit/MAMapKit.h>
+#include <AMapNaviKit/MAMapKit.h>
 #import <CoreLocation/CoreLocation.h>
 
 NS_ASSUME_NONNULL_BEGIN

ios/Classes/OverlayController/AMapMarkerController.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 #import <Flutter/Flutter.h>
-#import <MAMapKit/MAMapKit.h>
+#include <AMapNaviKit/MAMapKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

ios/Classes/OverlayController/AMapPolygonController.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 #import <Flutter/Flutter.h>
-#import <MAMapKit/MAMapKit.h>
+#include <AMapNaviKit/MAMapKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

ios/Classes/OverlayController/AMapPolygonController.m

@@ -12,6 +12,7 @@
 #import "MAPolygonRenderer+Flutter.h"
 #import "FlutterMethodChannel+MethodCallDispatch.h"
 
+
 @interface AMapPolygonController ()
 
 @property (nonatomic,strong) NSMutableDictionary<NSString*,AMapPolygon*> *polygonDict;
@@ -50,10 +51,31 @@
             }
             result(nil);
         }];
+        
+        [_methodChannel addMethodName:@"polygon#containsPoint" withHandler:^(FlutterMethodCall * _Nonnull call, FlutterResult  _Nonnull result) {
+            id point = call.arguments[@"point"];
+            if (![point isKindOfClass:[NSArray class]]) {
+                result(false);
+                return;
+            }
+            NSArray *locationArray = (NSArray *)point;
+            if (locationArray.count < 2) {
+                result(false);
+                return;
+            }
+            CLLocationDegrees latitude = [locationArray[0] doubleValue];
+            CLLocationDegrees longitude = [locationArray[1] doubleValue];
+            CLLocationCoordinate2D coordinate = CLLocationCoordinate2DMake(latitude, longitude);
+            MAMapPoint mapPoint = MAMapPointForCoordinate(coordinate);
+            NSString *_id = call.arguments[@"id"];
+            AMapPolygon* polygon = [weakSelf polygonForId:_id];
+            result(@(MAPolygonContainsPoint(mapPoint,polygon.polygon.points, polygon.polygon.pointCount)));
+        }];
     }
     return self;
 }
 
+
 - (nullable AMapPolygon *)polygonForId:(NSString *)polygonId {
     return _polygonDict[polygonId];
 }

ios/Classes/OverlayController/AMapPolylineController.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 #import <Flutter/Flutter.h>
-#import <MAMapKit/MAMapKit.h>
+#include <AMapNaviKit/MAMapKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

ios/Classes/Util/AMapConvertUtil.h

@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
 #import <CoreLocation/CoreLocation.h>
 #import <Flutter/Flutter.h>
-#import <MAMapKit/MAMapKit.h>
+#include <AMapNaviKit/MAMapKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

ios/amap_flutter_map.podspec

@@ -16,7 +16,7 @@ A new Flutter plugin.
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
-  s.dependency 'AMap3DMap'
+  s.dependency 'AMapNavi'
   s.dependency 'AMapSearch'
   s.static_framework = true
   s.platform = :ios, '8.0'