Fixed ios's bugs

Author: lovebing

ios/RCTBaiduMap/BaiduMapModule.m

@@ -17,40 +17,4 @@ @implementation BaiduMapModule {
 
 RCT_EXPORT_MODULE();
 
-RCT_EXPORT_METHOD(setMarker:(double)lat lng:(double)lng) {
-    if(_annotation == nil) {
-      _annotation = [[BMKPointAnnotation alloc]init];
-    }
-    else {
-        [[self getBaiduMapView] removeAnnotation:_annotation];
-    }
-
-    CLLocationCoordinate2D coor;
-    coor.latitude = lat;
-    coor.longitude = lng;
-    _annotation.coordinate = coor;
-    [[self getBaiduMapView] addAnnotation:_annotation];
-}
-
-RCT_EXPORT_METHOD(setMapType:(int)type) {
-    [[self getBaiduMapView] setMapType:type];
-}
-
-RCT_EXPORT_METHOD(setZoom:(float)zoom) {
-    [[self getBaiduMapView] setZoomLevel:zoom];
-}
-
-RCT_EXPORT_METHOD(moveToCenter:(double)lat lng:(double)lng zoom:(float)zoom) {
-    NSDictionary* center = @{
-                             @"lat": @(lat),
-                             @"lng": @(lng)
-                             };
-    [[self getBaiduMapView] setCenterLatLng:center];
-    [[self getBaiduMapView] setZoomLevel:zoom];
-}
-
--(RCTBaiduMapView *) getBaiduMapView {
-    return [RCTBaiduMapViewManager getBaiduMapView];
-}
-
 @end

ios/RCTBaiduMap/GeolocationModule.m

@@ -186,8 +186,5 @@ -(CLLocationCoordinate2D)getBaiduCoor:(double)lat lng:(double)lng {
     return baiduCoor;
 }
 
--(RCTBaiduMapView *) getBaiduMapView {
-    return [RCTBaiduMapViewManager getBaiduMapView];
-}
 
 @end

ios/RCTBaiduMap/RCTBaiduMapViewManager.h

@@ -15,9 +15,7 @@
 
 +(void)initSDK:(NSString *)key;
 
--(void)sendEvent:(NSDictionary *) params;
-
-+(RCTBaiduMapView *) getBaiduMapView;
+-(void)sendEvent:(RCTBaiduMapView *) mapView params:(NSDictionary *) params;
 
 @end
 

ios/RCTBaiduMap/RCTBaiduMapViewManager.m

@@ -8,8 +8,6 @@
 
 #import "RCTBaiduMapViewManager.h"
 
-static RCTBaiduMapView* _mapView;
-
 @implementation RCTBaiduMapViewManager;
 
 RCT_EXPORT_MODULE(RCTBaiduMapView)
@@ -38,13 +36,9 @@ +(void)initSDK:(NSString*)key {
 }
 
 - (UIView *)view {
-    NSLog(@"RCTBaiduMapView");
-    if(_mapView != nil) {
-        [_mapView removeFromSuperview];
-    }
-    _mapView = [[RCTBaiduMapView alloc] init];
-    _mapView.delegate = self;
-    return _mapView;
+    RCTBaiduMapView* mapView = [[RCTBaiduMapView alloc] init];
+    mapView.delegate = self;
+    return mapView;
 }
 
 -(void)mapview:(BMKMapView *)mapView
@@ -57,7 +51,7 @@ -(void)mapview:(BMKMapView *)mapView
                                     @"longitude": @(coordinate.longitude)
                                     }
                             };
-    [self sendEvent:event];
+    [self sendEvent:mapView params:event];
 }
 
 -(void)mapView:(BMKMapView *)mapView
@@ -70,15 +64,15 @@ -(void)mapView:(BMKMapView *)mapView
                                     @"longitude": @(coordinate.longitude)
                                     }
                             };
-    [self sendEvent:event];
+    [self sendEvent:mapView params:event];
 }
 
 -(void)mapViewDidFinishLoading:(BMKMapView *)mapView {
     NSDictionary* event = @{
                             @"type": @"onMapLoaded",
                             @"params": @{}
                             };
-    [self sendEvent:event];
+    [self sendEvent:mapView params:event];
 }
 
 -(void)mapView:(BMKMapView *)mapView
@@ -93,7 +87,7 @@ -(void)mapView:(BMKMapView *)mapView
                                             }
                                     }
                             };
-    [self sendEvent:event];
+    [self sendEvent:mapView params:event];
 }
 
 - (void) mapView:(BMKMapView *)mapView
@@ -108,7 +102,7 @@ - (void) mapView:(BMKMapView *)mapView
                                     @"longitude": @(mapPoi.pt.longitude)
                                     }
                             };
-    [self sendEvent:event];
+    [self sendEvent:mapView params:event];
 }
 
 - (BMKAnnotationView *)mapView:(BMKMapView *)mapView viewForAnnotation:(id <BMKAnnotation>)annotation {
@@ -135,19 +129,14 @@ -(void)mapStatusDidChanged: (BMKMapView *)mapView	 {
                                     @"overlook": @""
                                     }
                             };
-    [self sendEvent:event];
-    
+    [self sendEvent:mapView params:event];
 }
 
--(void)sendEvent:(NSDictionary *) params {
-    if (!_mapView.onChange) {
+-(void)sendEvent:(RCTBaiduMapView *) mapView params:(NSDictionary *) params {
+    if (!mapView.onChange) {
         return;
     }
-    _mapView.onChange(params);
-}
-
-+(RCTBaiduMapView *) getBaiduMapView {
-    return _mapView;
+    mapView.onChange(params);
 }
 
 @end