Merge branch '3-marker-icon-view' into 'wangqb_dev'

修复问题marker坐标不在屏幕内的时候全部集中在左上角的问题

See merge request !3

lib/ios/AMap3D/maps/AMapMarker.m

@@ -135,7 +135,7 @@
         _annotationView.draggable = _draggable;
         _annotationView.customCalloutView = _calloutView;
         //设置中心点
-        if(_centerOffset.x == 0 && _centerOffset.y == 0)
+        if(_centerOffset.x == 0 && _centerOffset.y == 0 && _customView)
         {
             CGPoint point = CGPointMake(0, -_customView.bounds.size.height/2);
             _annotationView.centerOffset = point;
@@ -161,7 +161,12 @@
         _annotationView.customCalloutView = _calloutView;
     } else {
         _customView = subview;
-        _customView.hidden = YES;
+        _annotationView = [[MAAnnotationView alloc] initWithAnnotation:_annotation reuseIdentifier:nil];
+        _annotationView.bounds = _customView.bounds;
+        [_annotationView addSubview:_customView];
+        [_annotationView addGestureRecognizer:[
+                                               [UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_handleTap:)]];
+        //_customView.hidden = YES;
     }
 }