|
|
|
@ -140,8 +140,10 @@ |
|
|
|
- (void)topViewShowAndHidden:(NSInteger)isShow |
|
|
|
- (void)topViewShowAndHidden:(NSInteger)isShow |
|
|
|
{ |
|
|
|
{ |
|
|
|
self.topView.hidden = isShow == 1 ? NO : YES; |
|
|
|
self.topView.hidden = isShow == 1 ? NO : YES; |
|
|
|
|
|
|
|
// CGFloat yy = iPhoneX_NavHeight+Adapted(50)+0.5; |
|
|
|
[UIView animateWithDuration:0.5 animations:^{ |
|
|
|
[UIView animateWithDuration:0.5 animations:^{ |
|
|
|
self.topView.frame = CGRectMake(0,isShow == 1 ? 0 : -Adapted(55), SCREEN_WIDTH, Adapted(55)); |
|
|
|
self.topView.frame = CGRectMake(0,isShow == 1 ? 0 : -Adapted(55), SCREEN_WIDTH, Adapted(55)); |
|
|
|
|
|
|
|
// self.mapView.frame = CGRectMake(0, self.topView.bottom, SCREEN_WIDTH, SCREEN_HEIGHT-yy-Adapted(55)); |
|
|
|
} completion:^(BOOL finished) { |
|
|
|
} completion:^(BOOL finished) { |
|
|
|
|
|
|
|
|
|
|
|
}]; |
|
|
|
}]; |
|
|
|
@ -177,11 +179,14 @@ |
|
|
|
- (void)loadWithInfoTrack:(NSMutableArray *)mapPoints |
|
|
|
- (void)loadWithInfoTrack:(NSMutableArray *)mapPoints |
|
|
|
{ |
|
|
|
{ |
|
|
|
// self.startAndStopBtn.selected = NO; |
|
|
|
// self.startAndStopBtn.selected = NO; |
|
|
|
|
|
|
|
// [self startAndStopBtnAction:self.startAndStopBtn]; |
|
|
|
|
|
|
|
|
|
|
|
mapPoints = (NSMutableArray *)[[mapPoints reverseObjectEnumerator] allObjects]; |
|
|
|
mapPoints = (NSMutableArray *)[[mapPoints reverseObjectEnumerator] allObjects]; |
|
|
|
[self startAndStopBtnAction:self.startAndStopBtn]; |
|
|
|
|
|
|
|
[self.mapView removeAnnotations:self.pointAnnotationArr]; |
|
|
|
[self.mapView removeAnnotations:self.pointAnnotationArr]; |
|
|
|
[self.mapView removeOverlay:self.routeLine]; |
|
|
|
[self.mapView removeOverlay:self.routeLine]; |
|
|
|
|
|
|
|
[self.trackView removeFromSuperview]; |
|
|
|
self.trackView = nil; |
|
|
|
self.trackView = nil; |
|
|
|
|
|
|
|
self.currentIndex = 0; |
|
|
|
self.routeLine = nil; |
|
|
|
self.routeLine = nil; |
|
|
|
self.routeLineView = nil; |
|
|
|
self.routeLineView = nil; |
|
|
|
self.pointAnnotationArr = nil; |
|
|
|
self.pointAnnotationArr = nil; |
|
|
|
@ -195,16 +200,18 @@ |
|
|
|
self.pathPoints = nil; |
|
|
|
self.pathPoints = nil; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
[self addLocate:mapPoints]; |
|
|
|
AfterDispatch(0.2, ^{ |
|
|
|
if(mapPoints.count > 1) |
|
|
|
[self addLocate:mapPoints]; |
|
|
|
{ |
|
|
|
if(mapPoints.count > 1) |
|
|
|
self.startAndStopBtn.selected = YES; |
|
|
|
{ |
|
|
|
[self startAndStopBtnAction:self.startAndStopBtn]; |
|
|
|
self.startAndStopBtn.selected = YES; |
|
|
|
} |
|
|
|
[self startAndStopBtnAction:self.startAndStopBtn]; |
|
|
|
//默认选中 起点 |
|
|
|
} |
|
|
|
CustomAnnotationView *tempView = [CustomAnnotationView new]; |
|
|
|
//默认选中 起点 |
|
|
|
tempView.annotation = self.pointAnnotationArr.lastObject; |
|
|
|
CustomAnnotationView *tempView = [CustomAnnotationView new]; |
|
|
|
[self mapView:self.mapView didSelectAnnotationView:tempView]; |
|
|
|
tempView.annotation = self.pointAnnotationArr.lastObject; |
|
|
|
|
|
|
|
[self mapView:self.mapView didSelectAnnotationView:tempView]; |
|
|
|
|
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -236,7 +243,7 @@ |
|
|
|
[self.mapView addAnnotations:self.pointAnnotationArr]; |
|
|
|
[self.mapView addAnnotations:self.pointAnnotationArr]; |
|
|
|
} |
|
|
|
} |
|
|
|
// [sender setSelected:!sender.isSelected]; |
|
|
|
// [sender setSelected:!sender.isSelected]; |
|
|
|
self.mapView.userInteractionEnabled = sender.isSelected; |
|
|
|
// self.mapView.userInteractionEnabled = sender.isSelected; |
|
|
|
} |
|
|
|
} |
|
|
|
#pragma mark - 构造shapeLayer |
|
|
|
#pragma mark - 构造shapeLayer |
|
|
|
- (void)initShapeLayerWithPath:(CGPathRef)path |
|
|
|
- (void)initShapeLayerWithPath:(CGPathRef)path |
|
|
|
@ -325,10 +332,10 @@ |
|
|
|
[self.headView.layer removeFromSuperlayer]; |
|
|
|
[self.headView.layer removeFromSuperlayer]; |
|
|
|
self.startAndStopBtn.selected = NO; |
|
|
|
self.startAndStopBtn.selected = NO; |
|
|
|
[self.startAndStopBtn setImage:ImageName_(@"icon_start") forState:UIControlStateNormal]; |
|
|
|
[self.startAndStopBtn setImage:ImageName_(@"icon_start") forState:UIControlStateNormal]; |
|
|
|
// if(!self.startAndStopBtn.isSelected) |
|
|
|
|
|
|
|
// { |
|
|
|
[self.trackView removeFromSuperview]; |
|
|
|
// [self startAndStopBtnAction:self.startAndStopBtn]; |
|
|
|
self.trackView = nil; |
|
|
|
// } |
|
|
|
[self.mapView addAnnotations:self.pointAnnotationArr]; |
|
|
|
} |
|
|
|
} |
|
|
|
return; |
|
|
|
return; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -337,17 +344,24 @@ |
|
|
|
nextAnim.delegate = self; |
|
|
|
nextAnim.delegate = self; |
|
|
|
// [self.headView addAnimation:nextAnim forKey:[NSString stringWithFormat:@"headPosition%d",currentIndex]]; |
|
|
|
// [self.headView addAnimation:nextAnim forKey:[NSString stringWithFormat:@"headPosition%d",currentIndex]]; |
|
|
|
[self.headView.layer addAnimation:nextAnim forKey:@"headPosition"]; |
|
|
|
[self.headView.layer addAnimation:nextAnim forKey:@"headPosition"]; |
|
|
|
if(self.pathPoints){ |
|
|
|
if(self.pathPoints) |
|
|
|
|
|
|
|
{ |
|
|
|
CGPoint currentPoint = self.pathPoints[self.currentIndex]; |
|
|
|
CGPoint currentPoint = self.pathPoints[self.currentIndex]; |
|
|
|
if (self.currentIndex == 0){ |
|
|
|
if (self.currentIndex == 0) |
|
|
|
|
|
|
|
{ |
|
|
|
//第一 |
|
|
|
//第一 |
|
|
|
[self addTrackViewPoint:currentPoint Type:0 Angle:0]; |
|
|
|
[self addTrackViewPoint:currentPoint Type:0 Angle:0]; |
|
|
|
double angle = self.angeleValues[self.angeleValues.count-1].doubleValue; |
|
|
|
double angle = self.angeleValues[self.angeleValues.count-1].doubleValue; |
|
|
|
self.headView.transform = CGAffineTransformMakeRotation(angle); |
|
|
|
self.headView.transform = CGAffineTransformMakeRotation(angle); |
|
|
|
}else if(self.currentIndex == self.pointAnnotationArr.count-1){ |
|
|
|
} |
|
|
|
|
|
|
|
else if(self.currentIndex == self.pointAnnotationArr.count-1) |
|
|
|
|
|
|
|
{ |
|
|
|
//最后一个 |
|
|
|
//最后一个 |
|
|
|
[self addTrackViewPoint:currentPoint Type:2 Angle:0]; |
|
|
|
[self addTrackViewPoint:currentPoint Type:2 Angle:0]; |
|
|
|
}else{ |
|
|
|
self.mapView.userInteractionEnabled = YES; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
{ |
|
|
|
NSInteger tempIndex = self.angeleValues.count-self.currentIndex-1; |
|
|
|
NSInteger tempIndex = self.angeleValues.count-self.currentIndex-1; |
|
|
|
if(tempIndex < 0){ |
|
|
|
if(tempIndex < 0){ |
|
|
|
tempIndex = 0; |
|
|
|
tempIndex = 0; |
|
|
|
@ -833,13 +847,13 @@ |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (!_mapView) |
|
|
|
if (!_mapView) |
|
|
|
{ |
|
|
|
{ |
|
|
|
CGFloat yy = iPhoneX_NavHeight+Adapted(50)+0.5; |
|
|
|
CGFloat yy = iPhoneX_NavHeight+Adapted(50)+0.5+Adapted(55); |
|
|
|
_mapView = [[MKMapView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-yy)]; |
|
|
|
_mapView = [[MKMapView alloc] initWithFrame:CGRectMake(0, Adapted(55), SCREEN_WIDTH, SCREEN_HEIGHT-yy)]; |
|
|
|
MKCoordinateSpan span = MKCoordinateSpanMake(0.021251, 0.016093); |
|
|
|
MKCoordinateSpan span = MKCoordinateSpanMake(0.021251, 0.016093); |
|
|
|
CLLocationCoordinate2D center = self.mapView.region.center; |
|
|
|
CLLocationCoordinate2D center = self.mapView.region.center; |
|
|
|
[_mapView setRegion:MKCoordinateRegionMake(center, span) animated:YES]; |
|
|
|
[_mapView setRegion:MKCoordinateRegionMake(center, span) animated:YES]; |
|
|
|
_mapView.rotateEnabled = NO; |
|
|
|
_mapView.rotateEnabled = NO; |
|
|
|
_mapView.userInteractionEnabled = NO; |
|
|
|
_mapView.userInteractionEnabled = YES; |
|
|
|
_mapView.delegate = self; |
|
|
|
_mapView.delegate = self; |
|
|
|
} |
|
|
|
} |
|
|
|
return _mapView; |
|
|
|
return _mapView; |
|
|
|
|
