优化轨迹回放

潘钊
1 parent 8aefd9d3
Showing 23 changed files with 407 additions and 170 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/Test.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/filter/AccessLogFilter.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/vehicle/UpstreamEntrance.java
src/main/java/com/bsth/vehicle/common/CommonMapped.java
src/main/java/com/bsth/vehicle/common/CommonRefreshThread.java
src/main/java/com/bsth/vehicle/directive/service/DirectiveService.java
src/main/java/com/bsth/vehicle/directive/service/DirectiveServiceImpl.java
src/main/java/com/bsth/vehicle/gpsdata/arrival/match/ScheduleRealMatcher.java
src/main/java/com/bsth/vehicle/gpsdata/buffer/GpsRealDataBuffer.java
src/main/resources/static/pages/control/line/child_pages/historyDirective.html
src/main/resources/static/pages/control/line/index.html
src/main/resources/static/pages/control/lineallot/allot.html
src/main/resources/static/pages/mapmonitor/real/css/real.css
src/main/resources/static/pages/mapmonitor/real/js/map_platform.js
src/main/resources/static/pages/mapmonitor/real/js/playBack.js
src/main/resources/static/pages/mapmonitor/real/js/vehicle.js
@@ -21,6 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
  
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -133,22 +135,26 @@ public class StartCommand implements CommandLineRunner{
 			 */
 			scheduler.scheduleWithFixedDelay(firstScheduleIssuedThread, 60 , 60 * 2, TimeUnit.SECONDS);
  
-			//延迟一会
+			
 /*			new Timer().schedule(new TimerTask() {
  
 				@Override
 				public void run() {
-					//临时全量刷车辆线路
 					List<CarConfigInfo> ccis = carConfigInfoRepository.findAll();
 					Cars car;
 					Line line;
 					String lineCode;
-					int code;
+					System.out.println("ccis size: " + ccis.size());
 					for(CarConfigInfo cci : ccis){
 						car = cci.getCl();
 						line = cci.getXl();
 						lineCode = line.getLineCode();
-						System.out.println("车辆：" + car.getInsideCode() + "切换线路：" + line.getLineCode());
+						
+						String data = directiveService.createDeviceRefreshData(CommonMapped.vehicDeviceBiMap.inverse().get(car.getInsideCode())
+								, Integer.parseInt(lineCode));
+						System.out.println(data);
+						int code = HttpUtils.postJson(data);
+						System.out.println("车辆：" + car.getInsideCode() + "刷新线路：" + line.getLineCode());
 						code = directiveService.lineChange(car.getInsideCode(), Integer.parseInt(lineCode));
 						//directiveService.send60Phrase(car.getInsideCode(), "");
 						System.out.println("返回值：" + code);
+//package com.bsth;
+//
+//import java.io.ByteArrayOutputStream;
+//import java.io.IOException;
+//import java.io.InputStream;
+//import java.io.OutputStream;
+//import java.net.HttpURLConnection;
+//import java.net.URL;
+//import java.util.HashMap;
+//import java.util.Map;
+//
+//import org.apache.commons.io.IOUtils;
+//
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//
+//public class Test {
+//	
+//	public static void main(String[] args) {
+//		Map<String, Object> map = new HashMap<>();
+//		map.put("timestamp", 1469764939000L);
+//		map.put("operCode", 128);
+//		map.put("deviceId", "66ML0007");
+//		
+//		Map<String , Object> dataMap = new HashMap<>();
+//		dataMap.put("requestCode", 161);
+//		dataMap.put("lineId", 1025);
+//		dataMap.put("operCode2", 38);
+//		
+//		map.put("data", dataMap);
+//		request(map, "http://192.168.168.171:9088/control/upstream");
+//		
+//	}
+//	
+//	private static Map<String, Object> request(Map<String, Object> map, String url) {
+//		InputStream in = null;
+//		OutputStream out = null;
+//		HttpURLConnection con = null;
+//		try {
+//			con = (HttpURLConnection)new URL(url).openConnection();
+//			con.setRequestMethod("POST");
+//			con.setRequestProperty("keep-alive", "true");
+//			con.setRequestProperty("accept", "*/*");
+//			con.setDoInput(true);
+//			con.setDoOutput(true);
+//			con.setReadTimeout(2500);
+//			con.setConnectTimeout(2500);
+//			out = con.getOutputStream();
+//			out.write("json=".getBytes());
+//			out.write(new ObjectMapper().writeValueAsBytes(map));
+//			out.flush();
+//			System.out.println("con.getResponseCode(): " + con.getResponseCode());
+//			if (con.getResponseCode() == 200) {
+//				in = con.getInputStream();
+//				ByteArrayOutputStream bout = new ByteArrayOutputStream();
+//				IOUtils.copy(in, bout); bout.close();
+//				System.out.println("Message:" + new String(bout.toByteArray()));
+//				return new ObjectMapper().readValue(bout.toByteArray(), Map.class);
+//			}
+//		} catch (IOException e) {
+//			e.printStackTrace();
+//		} finally {
+//			con.disconnect();
+//			try {
+//				if (in != null) in.close();
+//				if (out != null) out.close();
+//			} catch (IOException e) {
+//				e.printStackTrace();
+//			}
+//		}
+//		return null;
+//	}
+//}
@@ -255,8 +255,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * @throws
 	 */
 	@RequestMapping(value = "/findRouteByLine")
-	public Map<String, Object> findRouteByLine(@RequestParam Integer lineId){
-		return scheduleRealInfoService.findRouteByLine(lineId);
+	public Map<String, Object> findRouteByLine(@RequestParam Integer lineCode){
+		return scheduleRealInfoService.findRouteByLine(lineCode);
 	}
  
 	@RequestMapping(value = "/test/getSch")
@@ -38,7 +38,7 @@ public class AccessLogFilter extends BaseFilter {
 			HttpServletResponse response, FilterChain chain)
 			throws IOException, ServletException {
  
-		String username = SecurityUtils.getCurrentUser().getName(); //等集成shiro之后再取
+		String username = /*SecurityUtils.getCurrentUser().getName()*/"test"; //等集成shiro之后再取
 		String jsessionId = request.getRequestedSessionId();
 		String ip = IpUtils.getIpAddr(request);
 		String userAgent = request.getHeader("User-Agent");
@@ -80,7 +80,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
  
 	Map<String, Object>  outgoAdjustAll(String params);
  
-	Map<String, Object> findRouteByLine(Integer lineId);
+	Map<String, Object> findRouteByLine(Integer lineCode);
  
 	List<Map<String,String>> findLine(String line);
  
@@ -757,9 +757,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	}
  
 	@Override
-	public Map<String, Object> findRouteByLine(Integer lineId) {
+	public Map<String, Object> findRouteByLine(Integer lineCode) {
 		Map<String, Object> map = new HashMap<>();
 		//上行
+		Integer lineId = CommonMapped.lineIdToCode.inverse().get(lineCode);
 		map.put("line.id_eq", lineId);
 		map.put("directions_eq", 0);
 		List<Map<String, Object>>  upList = sectionRouteService.getSectionRoute(map);
@@ -32,7 +32,7 @@ public class UpstreamEntrance {
 	DirectiveBuffer directiveBuffer;
  
 	@RequestMapping(value = "/upstream", method = RequestMethod.POST)
-	public int main(@RequestParam String json) {
+	public String main(@RequestParam String json) {
 		logger.info("upstream: " + json);
 		try {
 			JSONObject jsonParam = JSONObject.parseObject(json);
@@ -66,6 +66,6 @@ public class UpstreamEntrance {
 		} catch (Exception e) {
 			logger.error("", e);
 		}
-		return 0;
+		return "{\"errCode\":0}";
 	}
 }
@@ -5,7 +5,6 @@ import java.util.Map;
  
 import com.bsth.entity.Line;
 import com.bsth.entity.StationRoute;
-import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.TreeMultimap;
  
@@ -54,12 +53,17 @@ public class CommonMapped {
 	 * 线路站点路由对照
 	 * （K：线路编码， V：站点路由）
 	 */
-	public static Map<Integer, List<StationRoute>> lineStationRouteMap;
+	//public static Map<Integer, List<StationRoute>> lineStationRouteMap;
  
 	/**
 	 * 线路和用户名对照
 	 * 用于webSocket定向推送消息
 	 */
 	public static TreeMultimap<Integer, String> lineUserMap = TreeMultimap.create();
+	
+	/**
+	 * 线路ID和code 对照
+	 */
+	public static BiMap<Integer, Integer> lineIdToCode;
  
 }
@@ -21,6 +21,7 @@ import com.bsth.entity.StationRoute;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.CarParkRepository;
 import com.bsth.repository.CarsRepository;
+import com.bsth.repository.LineRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.StationRouteRepository;
 import com.bsth.repository.schedule.CarConfigInfoRepository;
@@ -53,6 +54,9 @@ public class CommonRefreshThread extends Thread{
 	@Autowired
 	StationRouteRepository sRouteRepository;
  
+	@Autowired
+	LineRepository lineRepository;
+	
 	Logger logger = LoggerFactory.getLogger(this.getClass());
  
 	@Override
@@ -62,7 +66,9 @@ public class CommonRefreshThread extends Thread{
 			initStationCodeMap();
 			initVehicLineMap();
  
-			initLineStationRouteMap();
+			//initLineStationRouteMap();
+			
+			initLineIdToCode();
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error("", e);
@@ -75,7 +81,7 @@ public class CommonRefreshThread extends Thread{
 	 * @Description: TODO(加载线路站点路由信息) 
 	 * @throws
 	 */
-	private void initLineStationRouteMap() {
+/*	private void initLineStationRouteMap() {
 		List<StationRoute> routes = sRouteRepository.findAll2();
  
 		Map<Integer, List<StationRoute>> map = new HashMap<>();
@@ -97,6 +103,19 @@ public class CommonRefreshThread extends Thread{
 			temp = iterator.next();
 			Collections.sort(temp, sRouteComp);
 		}
+	}*/
+
+	private void initLineIdToCode() {
+		Iterator<Line> iterator = lineRepository.findAll().iterator();
+		
+		Line line;
+		BiMap<Integer, Integer> biMap = HashBiMap.create();
+		while(iterator.hasNext()){
+			line = iterator.next();
+			biMap.put(line.getId(), Integer.parseInt(line.getLineCode()));
+		}
+		
+		CommonMapped.lineIdToCode = biMap;
 	}
  
 	/**
@@ -77,4 +77,6 @@ public interface DirectiveService extends BaseService&lt;Directive60, Integer&gt;{
 	Map<String, Object> reply80(int id, int reply);
  
 	Map<String, Object> findDirective(String nbbm, int dType, int page, int size);
+	
+	String createDeviceRefreshData(String deviceId, Integer lineId);
 }
 package com.bsth.vehicle.directive.service;
  
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -307,7 +308,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive60, Integer&gt; 
 		param.put("operCode", 0Xc0);
  
 		Map<String, Object> data = new HashMap<String, Object>();
-		data.put("operCode", 0xa1);
+		data.put("operCode2", 0xa1);
 		data.put("cityCode", cityCode);
 		data.put("deviceId", deviceId);
 		data.put("timestamp", t);
@@ -409,8 +410,15 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive60, Integer&gt; 
 		// 时间倒序
 		Collections.sort(list, new DirectiveBuffer.DComparator());
 		if(StringUtils.isNotBlank(nbbm)){
+			String deviceId = CommonMapped.vehicDeviceBiMap.inverse().get(nbbm);
 			//按车辆过滤
-			
+			List<Directive> subList = new ArrayList<>();
+			for(Directive d : list){
+				if(d.getDeviceId().equals(deviceId)){
+					subList.add(d);
+				}
+			}
+			list = subList;
 		}
  
 		int count = list.size();
@@ -155,15 +155,16 @@ public class ScheduleRealMatcher implements ApplicationContextAware{
 				}
  
 				finish = ScheduleBuffer.getFinishSchNo(sch.getClZbh());
-				upDown = Integer.parseInt(sch.getXlDir());
+				
 				if(nextSch != null){
 					//发送下一班次的调度指令
 					directiveService.send60Dispatch(nextSch, finish);
+					upDown = Integer.parseInt(nextSch.getXlDir());
 					//切换下一个班次的走向
-					logger.info(sch.getClZbh() + " 切换下一班次走向");
 					directiveService.send60Operation(nextSch.getClZbh(), 0, upDown, nextSch);
 				}
 				else{
+					upDown = Integer.parseInt(sch.getXlDir());
 					//没有下一个班次了，切换为非营运状态
 					logger.info(sch.getClZbh() + " 完成所有班次，切换为非营运状态");
 					directiveService.send60Operation(sch.getClZbh(), 1, upDown, sch);
@@ -103,11 +103,9 @@ public class GpsRealDataBuffer {
  
 		//更新GPS点
 		for(GpsRealData newGps : upGpsList){
-			if(t - newGps.getTimestamp() < OFFLINE_TIME
-					&& !newGps.isOnline()){
-				logger.info("设备：" + newGps.getDeviceId() + " 上线");
+			
+			if(t - newGps.getTimestamp() < OFFLINE_TIME )
 				newGps.setOnline(true);
-			}
  
 			deviceGpsMap.put(newGps.getDeviceId(), newGps);
 		}
@@ -22,8 +22,8 @@
 		<table class="table table-hover" style="table-layout: fixed;">
 			<thead>
 				<tr>
-					<th width="9%">车辆</th>
 					<th width="7%">时间</th>
+					<th width="9%">车辆</th>
 					<th width="47%">内容</th> 
 					<th width="8%">发送人</th>
 					<th width="17%">状态</th>
@@ -40,8 +40,8 @@
 <script id="history_directive_list_temp" type="text/html">
 {{each list as item i}}
 <tr>
-	<td>{{item.nbbm}}</td>
 	<td>{{item.timeHHmm}}</td>
+	<td>{{item.nbbm}}</td>
 	<td>
 		<div class="text-furl">
 			{{item.data.txtContent}}
@@ -54,8 +54,7 @@
 		{{else}}
 			{{if item.reply46 != 0}}
 				<span class="label label-sm label-danger">设备无响应</span>
-			{{/if}}
-			{{if item.reply47 != 0}}
+			{{else if item.reply47 != 0}}
 				<span class="label label-sm label-warning">驾驶员未确认</span>
 			{{/if}}
  
@@ -290,5 +290,6 @@ function interceptPOST(e, xhr, t){
 		layer.msg('监控模式！',{offset: 'ct', shift : 6});
 	}
 }
+
 </script>
 <script src="/pages/control/line/js/webSocketHandle.js"></script>
 \ No newline at end of file
@@ -326,7 +326,7 @@ $(function(){
 			var f = arguments.callee
 				,item = lsData[i];
  
-			$.get('/realSchedule/findRouteByLine', {lineId: item.id}, function(rs){
+			$.get('/realSchedule/findRouteByLine', {lineCode: item.lineCode}, function(rs){
 				if(rs && rs.lineId){
 					cacheData[item.lineCode] = rs;
 					i ++;
@@ -93,7 +93,7 @@ label.BMapLabel{
 }
  
 .mapRightWrap.playBack{
-    min-height: 454px;
+    min-height: 374px;
     width: 390px;
     height: auto;
 }
@@ -710,8 +710,8 @@ display: none;
 }
  
 .play-back-btns .dropdown-menu{
-	min-width: 70px;
-    width: 70px;
+    min-width: 80px;
+    width: 80px;
 }
  
 .play-back-btns>i.playBtn{
@@ -803,3 +803,15 @@ display: none;
 	color: #5f5d5d;
     margin-left: 7px;
 } */
+
+.layui-layer-msg.layer-bg-green{
+	background: #1bbc9b;
+    border: 1px solid #1bbc9b;
+    color: white;
+}
+
+.layui-layer-msg.layer-bg-red{
+	background: red;
+    border: 1px solid red;
+    color: white;
+}
@@ -277,6 +277,10 @@ var realMap = (function() {
 			//居中marker
 			markerToCenter: function(marker){
 				currentMap.map.panTo(marker.getPosition());
+			},
+			//删除marker
+			removeMarker: function(marker){
+				currentMap.map.removeOverlay(marker);
 			}
 		},
 		//高德地图
@@ -3,6 +3,8 @@
  */
  
 var playBack = (function() {
+	//默认车辆
+	var defaultCar, defaultLine;
 	//css3动画结束事件
 	var animationend = 'webkitAnimationEnd animationend';
 	var prgTimer;
@@ -10,6 +12,13 @@ var playBack = (function() {
 	var sTime;
 	//结束时间戳
 	var eTime;
+	//当前时间戳
+	var cTime;
+	//每步走10秒
+	var step = 10;
+	//1个px多少秒
+	var secondPX;
+	
 	var tRange;
 	//进度条宽度
 	var pWidth;
@@ -20,11 +29,12 @@ var playBack = (function() {
 	//上层运动的进度条
 	var $pmk = $('.play-back-progress-mark');
 	//单元格
-	var cell/*, minCell = 5, cellSecond*/;
+	//var cell/*, minCell = 5, cellSecond*/;
 	//GPS轨迹点
 	var gpsArray;
 	//播放到的轨迹坐标点
 	var cIndex = 0;
+	//GPS点数量
 	var size;
 	//播放速度
 	var speed = parseInt($('#playSpeedText').text());
@@ -32,8 +42,10 @@ var playBack = (function() {
 	var markerMap = {};
 	//线路路由数据
 	var lineRoute;
-	//默认以第一辆车为焦点
+	//首辆车自编号
 	var firstCar;
+	//是否启用焦点跟踪
+	var isEnableFocus;
  
 	function getCurrMap(){
 		return realMap[realMap.getMap().fName];
@@ -61,7 +73,8 @@ var playBack = (function() {
 	}).mouseout(hideMarkTextMouse)
 	.on('click', function(e){
 		var w = e.clientX - 20;
-		goTo(w);
+		//goTo(w);
+		goToByTime(sTime + w * secondPX);
 		hideMarkTextMouse();
 	});
  
@@ -92,37 +105,12 @@ var playBack = (function() {
 	});
  
 	function showMarkText(w){
-		var t = showMark($presMark, w);
-		//时间戳找gps
-		var gps;
-		var marker;
-		for(;cIndex < size; cIndex ++){
-			gps = gpsArray[cIndex];
-			if(gps.ts <= t){
-				marker = markerMap[gps.nbbm];
-				if(marker)
-					getCurrMap().moveMarker(marker, gps);//移动marker
-				else{
-					markerMap[gps.nbbm] = getCurrMap().addHistoryMarker(gps);//添加marker
-					//定位到marker
-					//getCurrMap().markerToCenter(markerMap[gps.nbbm]);
-				}
-				
-				if(gps.inout_stop != -1){
-					//到离站信息
-					addInOutText(gps);
-				}
-			}
-			else{
-				break;
-			}
-		}
-		//定位焦点
-		/*if(markerMap[firstCar]){
-			getCurrMap().markerToCenter(markerMap[firstCar]);
-		}*/
+		var text = moment(cTime * 1000).format('HH:mm.ss');
+		
+		$presMark.text(text).css('left', w - $presMark.width() / 2).show();
 	}
  
+	//添加进出站日志
 	function addInOutText(gps){
 		var info = gps.inout_stop_info
 			,date = moment(gps.ts).format('HH:mm.ss');
@@ -149,22 +137,13 @@ var playBack = (function() {
 	}
  
 	function showMarkTextMouse(w){
-		showMark($presMarkMouse, w);
+		var text = moment((sTime + w * secondPX) * 1000).format('HH:mm.ss');
+		$presMarkMouse.text(text).css('left', w - $presMarkMouse.width() / 2).show();
 	}
 	function hideMarkTextMouse(){
 		$presMarkMouse.hide();
 	}
  
-	function showMark(mark, w, anim){
-		var t = parseInt((sTime + w / cell) * 1000)
-			,text = moment(t).format('HH:mm.ss');
-		
-		mark.text(text).css('left', w - mark.width() / 2)
-							.show();
-		
-		return t;
-	}
-	
 	//日志区域滚动条
 	$('.pback-logs').slimscroll({
 		height: '100%',
@@ -173,132 +152,243 @@ var playBack = (function() {
  
 	var exports = {
 		init : function() {
-			var htmlStr = template('play_back_panel_temp', {});
+			//清空地图
+			getCurrMap().clear();
+			
+			vehiclePanel.clear();
+			
+			var htmlStr = template('play_back_panel_temp', {})
+				,carSel = '.mapRightWrap select[name="nbbm[]"]';
 			$('.mapRightWrap').html(htmlStr);
+			//初始选中的车辆
+			if(defaultCar){
+				$(carSel).html('<option selected value="'+defaultCar+'">'+defaultCar+'</option>');
+				defaultCar = null;
+			}
 			//车辆搜索框
-			createVehSearch($('.mapRightWrap select[name="nbbm[]"]'));
-			//线路下拉框
-			var lineData = [{id:'-1', text: '请选择...'}];
-			$get('/line/all', null, function(array){
-				$.each(array, function(){
-					lineData.push({id: this.id, text: this.name});
+			createVehSearch($(carSel)).on('select2:select', function(e){
+					//获取对应线路
+					defaultLine = e.params.data.lineCode;
 				});
-				initPinYinSelect2('.mapRightWrap select[name=lineCode]', lineData);
-			});
  
 			//点击轨迹回放按钮
-			$('#playBackBtn').on('click', function(){
-				//表单校验
-				if(!customFormValidate('#playBackForm'))
+			$('#playBackBtn').on('click', playBackBtnClick);
+			
+			//默认值，当前时间前后各一个小时
+			var m = moment()
+				,rq='YYYY-MM-DD', sj='HH:mm';
+			$('input[name=sDate]').val(m.format(rq));
+			$('input[name=sTime]').val(m.subtract(1, 'hours').format(sj));
+			$('input[name=eDate]').val(m.add(2, 'hours').format(rq));
+			$('input[name=eTime]').val(m.format('HH:mm'));
+		}
+		,setDefaultCar: function(nbbm, lineCode){
+			defaultCar = nbbm;
+			defaultLine = lineCode;
+		}
+	};
+	
+	function playBackBtnClick(){
+		//表单校验
+		if(!customFormValidate('#playBackForm'))
+			return;
+		
+		var params = $('#playBackForm').serializeJSON();
+		//查询历史gps数据
+		var fs = 'YYYY-MM-DDHH:mm'
+			,st = moment(params.sDate + params.sTime, fs).format('X')
+			,et = moment(params.eDate + params.eTime, fs).format('X')
+			,nbbm = params.nbbm;
+		
+		console.log(params);
+		isEnableFocus = params.enableFocus;
+		layer.msg('查询历史GPS...', {icon: 16, time: 0,shade:0.3});
+		$.ajax({
+			url: '/gps/gpsHistory/multiple',
+			traditional: true,
+			data: {nbbmArray: params.nbbm, st: st, et: et},
+			success:function(rs){
+				if(!rs || rs.length == 0){
+					layer.alert('服务器没有返回数据，请检查你的输入参数！', {icon: 3});
 					return;
+				}
  
-				var params = $('#playBackForm').serializeJSON();
-				//查询历史gps数据
-				var fs = 'YYYY-MM-DDHH:mm'
-					,st = moment(params.sDate + params.sTime, fs).format('X')
-					,et = moment(params.eDate + params.eTime, fs).format('X')
-					,nbbm = params.nbbm;
+				gpsArray = rs;
+				size = gpsArray.length;
+				layer.closeAll();
+				//切出轨迹回放面板
+				$('.mapRightWrap,.mapTools,.leftUtilsWrap').fadeOut();
+				$('.play-back-list,.play-back-btns,.progress-wrap').show();
+				//初始化时间戳
+				sTime = parseInt(st);
+				eTime = parseInt(et);
+				tRange = et - st;
  
-				layer.msg('查询历史GPS...', {icon: 16, time: 0,shade:0.3});
-				$.ajax({
-					url: '/gps/gpsHistory/multiple',
-					traditional: true,
-					data: {nbbmArray: params.nbbm, st: st, et: et},
-					success:function(rs){
-						gpsArray = rs;
-						size = gpsArray.length;
-						layer.closeAll();
-						//切出轨迹回放面板
-						$('.mapRightWrap,.mapTools,.leftUtilsWrap').fadeOut();
-						$('.play-back-list,.play-back-btns,.progress-wrap').show();
-						//初始化时间戳
-						sTime = parseInt(st);
-						eTime = parseInt(et);
-						tRange = et - st;
-						
-						//获取进度条宽度
-						pWidth = $('.progress-body').width();
-						cell = pWidth / tRange;
-						//清理地图
-						getCurrMap().clear();
+				//获取进度条宽度
+				pWidth = $('.progress-body').width();
+				secondPX = tRange / pWidth;
+				//清理地图
+				getCurrMap().clear();
+				
+				firstCar = params.nbbm[0];
+				
+				if(defaultLine){
+					layer.msg('加载线路图层数据...', {icon: 16, time: 0,shade:0.3});
+					$.get('/realSchedule/findRouteByLine', {lineCode: defaultLine}
+					,function(route){
+						lineRoute = route;
+						getCurrMap().drawLine(lineRoute);
  
-						firstCar = params.nbbm[0];
+						cTime = sTime;
+						play();
  
-						var lineCode = $('.mapRightWrap select[name=lineCode]').val();
-						if(lineCode != -1){
-							layer.msg('加载线路图层数据...', {icon: 16, time: 0,shade:0.3});
-							$.get('/realSchedule/findRouteByLine', {lineId: lineCode}
-							,function(route){
-								lineRoute = route;
-								getCurrMap().drawLine(lineRoute);
-								layer.closeAll();
-								play();
-							});
+						//自动定位到第一辆车的第一个点
+						var nbbm = params.nbbm[0]
+							,firstTime = searchFirst(gpsArray, nbbm);
+						if(firstTime){
+							layer.msg('从该时区内 ' + nbbm + ' 的首个信号点，' + moment(firstTime).format('HH:mm') + '开始'
+									,{offset: 'ct', shift : 5, skin: 'layer-bg-green'});
+							
+							goToByTime(firstTime / 1000);
 						}
 						else
-							play();
-					}
-				});
-			});
-			
-			//默认值
-			/* $('input[name=sDate]').val('2016-04-24');
-			 $('input[name=sTime]').val('04:00');
-			 $('input[name=eDate]').val('2016-04-24');
-			 $('input[name=eTime]').val('05:40');*/
+							layer.closeAll();
+					});
+				}
+				else
+					play();
+			}
+		});
+	}
+	
+	//搜索时间范围内第一个gps点的时间
+	function searchFirst(list, nbbm){
+		var time;
+		for(var i = 0, gps; gps = list[i++];){
+			if(gps.nbbm == nbbm){
+				time = gps.ts;
+				break;
+			}
 		}
-	};
+		
+		return time;
+	}
  
 	function stop(){
+		_stopFocusTimer = 1;
+		clearInterval(focusTimer);
+		//停止播放
 		clearInterval(prgTimer);
 		$('.play-back-btns .playBtn').removeClass('fa-pause').addClass('fa-play').data('status', 0);
 		prgTimer = null;
 	}
  
 	function play(){
-		if(topW == pWidth){
-			//从头再来
-			reset();
-		}
 		$('#progress-mark-time').show();
 		$('.play-back-btns .playBtn').removeClass('fa-play').addClass('fa-pause').data('status', 1);
+		//开始播放
 		start();
+		
+		//启动焦点定位（单独用一个定时器做缓冲）
+		console.log('isEnableFocus', isEnableFocus);
+		if(isEnableFocus){
+			_stopFocusTimer = null;
+			startTrackFocus();
+		}
 	}
  
-	function reset(){
-		topW = 0;
-		$pmk.css('width', topW + 'px');
-		cIndex = 0;
-		$('.pback-logs').html('');
+	var _stopFocusTimer, focusTimer;
+	function startTrackFocus(){
+		trackFocus();
+		if(!_stopFocusTimer)
+			focusTimer = setTimeout(startTrackFocus, 1800);
+	}
+	
+	function trackFocus(){
+		//定位焦点
+		if(markerMap[firstCar])
+			getCurrMap().markerToCenter(markerMap[firstCar]);
 	}
  
-	var topW = 0;
 	function start(){
-		prgTimer = setTimeout(start, 1000);
+		prgTimer = setTimeout(start, 1000 / speed);
 		run();
 	}
  
+	var cw = 0;
 	function run(){
-		topW += (cell * speed);
-		showMarkText(topW);
-		if(topW >= pWidth){
+		cTime += step;
+		
+		cw = (cTime - sTime) / secondPX;
+		//显示时间标记
+		showMarkText(cw);
+		//移动GPS点
+		moveGpsByTime(cTime);
+		
+		if(cw >= pWidth){
 			stop();
 			$('#progress-mark-time').hide();
-			topW = pWidth;
+			cw = pWidth;
+			
+			layer.msg('本次轨迹回放已结束'
+					,{offset: 'ct', shift : 5 , skin: 'layer-bg-red'});
 		}
-		$pmk.css('width', topW + 'px');
+		$pmk.css('width', cw + 'px');
 	}
  
-	function goTo(w){
-		$('.pback-logs').html('');
+	//根据时间移动GPS
+	function moveGpsByTime(t){
+		t = t * 1000;
+		var rs = {}, gps;
+		for(;cIndex < size; cIndex ++){
+			gps = gpsArray[cIndex];
+			if(gps.ts <= t)
+				rs[gps.nbbm] = gps;
+			else
+				break;
+			
+			//到离站信息
+			if(gps.inout_stop != -1)
+				addInOutText(gps);
+		}
+		
+		//绘制到地图
+		var marker;
+		for(var nbbm in rs){
+			gps = rs[nbbm];
+			marker = markerMap[gps.nbbm];
+			
+			if(marker)
+				getCurrMap().moveMarker(marker, gps);//移动marker
+			else
+				markerMap[gps.nbbm] = getCurrMap().addHistoryMarker(gps);//添加marker
+		}
+		
+	}
+	
+	function goToByTime(time){
+		//停止播放
+		clearInterval(prgTimer);
+		prgTimer = null;
 		cIndex = 0;
-		stop();
-		topW = w;
-		showMarkText(w);
-		//$pmk.css('width', w);
+		
+		cTime = time;
+		//清空右侧日志信息
+		$('.pback-logs').html('');
+		//清除GPS点
+		removeAllGps();
 		play();
 	}
  
+	
+	//removeMarker
+	function removeAllGps(){
+		for(var nbbm in markerMap)
+			getCurrMap().removeMarker(markerMap[nbbm]);
+		
+		markerMap = {};
+	}
+	
 	/**
 	 * 自定义表单校验
 	 */
@@ -38,6 +38,12 @@ var vehiclePanel = (function() {
 		});
 	});
  
+	//跳转到轨迹回放
+	function toPlayBack(nbbm, lineCode){
+		playBack.setDefaultCar(nbbm, lineCode);
+		$('.mapTools .item[data-click=playBack]').click();
+	}
+	
 	//绘制线路和GPS
 	function drawLineAndGps(lineCode, callFun){
 		//过滤出该线路的GPS点
@@ -169,7 +175,11 @@ var vehiclePanel = (function() {
 			for(var deviceId in allGps)
 				array.push(allGps[deviceId]);
 			return array;
-		}
+		},
+		clear: function(){
+			cLineCode = null;
+		},
+		toPlayBack:toPlayBack 
 	};
  
 	return exports;
@@ -55,9 +55,12 @@
 			<i class="fa fa-close"></i><span id="playSpeedText">10</span><i class="fa fa-angle-up" ></i>
 	  </span>
 	  <ul class="dropdown-menu play-speed-select" >
-	    <li data-speed=10><a href="javascript:;">10秒 </a></li>
-	    <li data-speed=5><a href="javascript:;">5秒 </a></li>
-	    <li data-speed=1><a href="javascript:;">1秒</a></li>
+	  	<li data-speed=30><a href="javascript:;">1秒30帧 </a></li>
+	  	<li data-speed=20><a href="javascript:;">1秒20帧 </a></li>
+	  	<li data-speed=10><a href="javascript:;">1秒10帧 </a></li>
+	  	<li data-speed=7><a href="javascript:;">1秒7帧 </a></li>
+	  	<li data-speed=5><a href="javascript:;">1秒5帧 </a></li>
+	    <li data-speed=1><a href="javascript:;">1秒1帧 </a></li>
 	  </ul>
 	</div>
  
@@ -8,7 +8,8 @@
 		<div class="form-group">
 			<label class="col-md-3 control-label">车辆编码</label>
 			<div class="col-md-9">
-				<select class="form-control" name="nbbm[]" placeholder="车辆编码" multiple="multiple" required=1 style="width:100%;"></select>
+				<select class="form-control" name="nbbm[]" placeholder="车辆编码" multiple="multiple" required=1 style="width:100%;">
+				</select>
 			</div>
 		</div>
  
@@ -26,15 +27,21 @@
 				<input type="time" name="eTime" class="form-control" placeholder="时间" required=1>
 			</div>
 		</div>
-	</div>
-</form>
-<form class="form-horizontal" role="form" style="padding-top: 0px;">
+
 		<div class="form-group">
-			<label class="col-md-3 control-label">线路图层</label>
+			<label class="col-md-3 control-label"></label>
 			<div class="col-md-9">
-				<select class="form-control" name="lineCode" style="width:100%;"></select>
+    			<div class="checkbox-list" style="font-size: 13px;">
+        			<label>
+            			<div class="checker" style="display: inline-block;vertical-align: middle;">
+							<span>
+								<input type="checkbox" name="enableFocus">
+							</span>
+						</div> 当前选中的首辆车为焦点 </label>
+    			</div>
 			</div>
 		</div>
+	</div>
 </form>
 <hr>
 	<div class="form-actions">
@@ -44,4 +51,4 @@
 			</div>
 		</div>
 	</div>
-</script>
 \ No newline at end of file
+</script>
@@ -88,6 +88,6 @@
 	下一班{{nextSch.qdzName}} {{nextSch.fcsj}} 发车
 {{/if}}
 </p>
-<a href="javascript:void(0)" style="color:#006600;font-size:12px;">轨迹回放</a>
+<a href="javascript:vehiclePanel.toPlayBack('{{nbbm}}', '{{lineId}}')" class="link_to_pback" style="color:#006600;font-size:12px;">轨迹回放</a>
 </div>
 </script>
 \ No newline at end of file