no message

ZhiJi.xcodeproj/xcshareddata/xcschemes/ZhiJi.xcscheme

@@ -39,7 +39,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
+      allowLocationSimulation = "NO">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
          <BuildableReference

ZhiJi/Classes/Map/Controller/ZJBaseMapViewController.m

@@ -33,19 +33,7 @@
 @property (nonatomic, strong) GMSCircle * selfCircle;
 @property (nonatomic, strong) GMSMarker * selfMarker;
 @property (nonatomic, assign) float __block zoom;
-@property (nonatomic, assign) float __block animationZoom;
-@property (nonatomic, assign) NSTimer * ttt;
-@property (nonatomic, assign) NSInteger tttCount;
-
-@property (nonatomic, strong) GMSPolyline * initialPolyline;
-@property (nonatomic, strong) GMSPolyline * actionPolyline;
-@property (nonatomic, strong) GMSMutablePath * initiallinepath;
-@property (nonatomic, strong) GMSMutablePath * actionlinepath;
-
-@property (nonatomic, strong) GMSMarker * startMarker;
-@property (nonatomic, strong) GMSMarker * endMarker;
-@property (nonatomic, strong) GMSMarker * actionMarker;
-
+@property (nonatomic, assign) BOOL referCamera;
 
 @end
 
@@ -66,6 +54,15 @@
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [self getFriendList];
     });
+    
+    [[ZJLocationManager shared] initWithLocationUpdateInfo:^(ZJLocationModel * model, CLLocation * location, ZJMapType mapType) {
+
+        if(!model){
+            return;
+        }
+        
+        self.mapType = mapType;
+    }];
 }
 
 - (void)viewWillAppear:(BOOL)animated{
@@ -78,6 +75,13 @@
     if (_mapType == ZJ_GMSMapType) {
         _GGMapView.hidden = NO;
         _GDMapView.hidden = YES;
+        
+        if (_referCamera) {
+            GMSCameraPosition *camera = [GMSCameraPosition cameraWithLatitude:[[[self.data Read] objectForKey:@"latitude"] doubleValue] longitude:[[[self.data Read] objectForKey:@"longitude"] doubleValue] zoom:_zoom];
+            self.GGMapView.camera = camera;
+            _referCamera = NO;
+        }
+        
     }else{
         _GGMapView.hidden = YES;
         _GDMapView.hidden = NO;
@@ -87,6 +91,9 @@
 - (void)setupUI{
     _zoom = 18;
     GMSCameraPosition *camera = [GMSCameraPosition cameraWithLatitude:[[[self.data Read] objectForKey:@"latitude"] doubleValue] longitude:[[[self.data Read] objectForKey:@"longitude"] doubleValue] zoom:_zoom];
+    if (![[self.data Read] objectForKey:@"latitude"]) {
+        _referCamera = YES;
+    }
     ///初始化地图
     self.GGMapView = [GMSMapView mapWithFrame:self.view.bounds camera:camera];
     _GGMapView.delegate = self;
@@ -95,6 +102,8 @@
     _GGMapView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     _GGMapView.hidden = YES;
     
+    [self setPoint:camera.target target:1];
+    
     
     self.GDMapView = [[MAMapView alloc] initWithFrame:self.view.bounds];
     _GDMapView.delegate = self;
@@ -224,7 +233,7 @@
             
             if (self.mapType == ZJ_GMSMapType){
                 CLLocationCoordinate2D coord = CLLocationCoordinate2DMake([[[self.data Read] objectForKey:@"latitude"] doubleValue], [[[self.data Read] objectForKey:@"longitude"] doubleValue]);
-                [self setPoint:coord target:1];
+                [self setPoint:coord target:2];
             }else{
                 ///如果您需要进入地图就显示定位小蓝点，则需要下面两行代码
                 self.GDMapView.showsUserLocation = YES;
@@ -274,11 +283,19 @@
             
             double lat = [response[@"result"][@"data"][@"lat"] doubleValue];
             double lon = [response[@"result"][@"data"][@"lon"] doubleValue];
+            
+            if (self.mapType == ZJ_GMSMapType){
+                CLLocationCoordinate2D coord = CLLocationCoordinate2DMake(lat, lon);
+                self.GGMapView.camera = [GMSCameraPosition cameraWithTarget:coord zoom:self.zoom];
+                [self setPoint:coord target:1];
+                [_self.GGMapView animateToLocation:coord];
+            }else{
                 MAPointAnnotation *pointAnnotation = [[MAPointAnnotation alloc] init];
                 pointAnnotation.coordinate = CLLocationCoordinate2DMake(lat, lon);
                 pointAnnotation.title = @"latestLocation";
-            [self.GDMapView addAnnotation:pointAnnotation];
-            [self.GDMapView setCenterCoordinate:pointAnnotation.coordinate animated:false];
+                [_self.GDMapView addAnnotation:pointAnnotation];
+                [_self.GDMapView setCenterCoordinate:pointAnnotation.coordinate animated:false];
+            }
             
         }else if ([[response objectForKey:@"status"] integerValue] == 105) {
             [MBProgressHUD showError:[response objectForKey:@"msg"] toView:self.view];
@@ -309,7 +326,7 @@
 
 #pragma mark - GMSMap Function google
 - (void)setPoint:(CLLocationCoordinate2D)point target:(NSInteger)target{
-    if (target == 1) {
+    
     CLLocationCoordinate2D position = point;
     _selfMarker.map = nil;
     _selfMarker = [GMSMarker markerWithPosition:position];
@@ -317,11 +334,14 @@
 //        _selfMarker.icon = [GMSMarker markerImageWithColor:[UIColor blackColor]];
     _selfMarker.icon = [UIImage imageNamed:@"userPosition"];
     _selfMarker.tracksInfoWindowChanges = YES;
-        _selfMarker.title = @"Me";
-        _selfMarker.snippet = @"WTF";
     _selfMarker.infoWindowAnchor = CGPointMake(0.5, 0.25);
     _selfMarker.map = _GGMapView;
     
+    if (target == 1) {
+
+        _selfMarker.title = @"Me";
+        _selfMarker.snippet = @"WTF";
+
         CLLocationDistance distance = 50;
         _selfCircle.map = nil;
         _selfCircle = [GMSCircle circleWithPosition:position radius:distance];
@@ -331,12 +351,14 @@
         _selfCircle.map = _GGMapView;
         
     }else{
-        CLLocationCoordinate2D position = point;
-        GMSMarker *marker = [GMSMarker markerWithPosition:position];
-        marker.title = @"Hello World";
-        marker.map = _GGMapView;
+        _selfMarker.title = @"Friend";
+        _selfMarker.snippet = @"WTF";
     }
 }
 
+#pragma mark - GMSMap Delegate google
+-(void)mapView:(GMSMapView*)mapView idleAtCameraPosition:(GMSCameraPosition*)position{
+    _zoom = position.zoom;
+}
 
 @end