|
@@ -209,6 +209,14 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
[self.view layoutIfNeeded];
|
|
[self.view layoutIfNeeded];
|
|
|
|
|
+ } else {
|
|
|
|
|
+ self.shipMap.showCurrent = YES;
|
|
|
|
|
+ self.shipMap.showPoe = YES;
|
|
|
|
|
+ self.shipMap.showPol = YES;
|
|
|
|
|
+ self.shipMap.showPod = YES;
|
|
|
|
|
+ self.shipMap.showPor = YES;
|
|
|
|
|
+ self.shipMap.showOrigin = YES;
|
|
|
|
|
+ self.shipMap.showDestination = YES;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -265,7 +273,9 @@
|
|
|
|
|
|
|
|
[UIView commitAnimations];
|
|
[UIView commitAnimations];
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+ if (self.showMap) {
|
|
|
|
|
+ [self.params setObject:@(YES) forKey:@"request_location"];
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
|
|
|
|
|
|
@@ -1190,8 +1200,7 @@
|
|
|
NSString* type =[segment valueForKey:@"_type"];
|
|
NSString* type =[segment valueForKey:@"_type"];
|
|
|
|
|
|
|
|
if([type isEqualToString:@"tracking"]) {
|
|
if([type isEqualToString:@"tracking"]) {
|
|
|
- NSDictionary* item = [self.content get_item_seg:indexPath.section row:indexPath.row];
|
|
|
|
|
- NSDictionary *location = [item objectForKey:@"location"];
|
|
|
|
|
|
|
+ NSDictionary *location = [segment objectForKey:@"location"];
|
|
|
[self.shipMap showShipAnnotaion:location];
|
|
[self.shipMap showShipAnnotaion:location];
|
|
|
}
|
|
}
|
|
|
|
|
|