M500模拟器修改了轨迹跑完熄火失败的bug3

data/protocolTools/carData/M202003060520.json

-{"time": {"dateTime": "2020-06-19 13:56:33", "date": "2020-06-19", "time": "13:56:33"}, "curDayTravel": {"todayTotalMilleage": 11869, "todayTotalOil": 1144, "todayTotalTime": 715, "theMilleage": 11039, "theOil": 1064, "theTime": 665}, "travelData": {"totalMilleage": 464971, "totalOil": 43441, "totalTime": 27758}, "event": {"threeRapid": {"totalRapidlyAccelerate": 33, "totalSharpSlowdown": 23, "totalSharpTurn": 26}}}
\ No newline at end of file
+{"time": {"dateTime": "2020-06-19 13:56:33", "date": "2020-06-19", "time": "13:56:33"}, "curDayTravel": {"todayTotalMilleage": 12533, "todayTotalOil": 1208, "todayTotalTime": 755, "theMilleage": 664, "theOil": 64, "theTime": 40}, "travelData": {"totalMilleage": 465635, "totalOil": 43505, "totalTime": 27798}, "event": {"threeRapid": {"totalRapidlyAccelerate": 33, "totalSharpSlowdown": 23, "totalSharpTurn": 26}}}
\ No newline at end of file

lib/socket/service/ProtocolSimulaterService.py

@@ -447,6 +447,8 @@ class ProtocolSimulaterService():
         OBDMsg = self.genOBDMsg(self.OBDdata["fireStatus"], self.OBDdata["ACCStatus"], self.OBDdata["engineSpeed"], \
                                 self.OBDdata["speed"], self.OBDdata["meterMileage"], self.OBDdata["totailMileage"], \
                                 self.OBDdata["totalOilExpen"], self.OBDdata["totalRunTime"])
+        if gpsLineIndex >= len(self.gpsLine):
+            gpsLineIndex = gpsLineIndex - 1
         latitude = self.gpsLine[gpsLineIndex]["lat"]
         longitude = self.gpsLine[gpsLineIndex]["lng"]
         gpsMsg = self.genGPSMsg(latitude, longitude)
@@ -461,7 +463,7 @@ class ProtocolSimulaterService():
             type = self.getMsgFunId(gpsMsg)
             info = type + ">>>>：" + gpsMsg
             self.websocket.sendMsgToClient(info, self.websocketId)
-        sleep(1)
+        sleep(0.2)
         jdata = {"WATER_CODE": "0003", "DEV_ID": "M121501010001",
                  "gpsInfo": {"UTCTime": "2020-04-30 14:59:33", "latitude": "40.22077", "longitude": "116.23128",
                              "speed": "80.8", "directionAngle": "80.8", "elevation": "2999.9", "positionStar": "3",
@@ -499,6 +501,8 @@ class ProtocolSimulaterService():
         gpsObj = GPSReport_protocol(DEV_ID=self.carId,WATER_CODE=self.sn)
         gpsObj.setLatitude(latitude)
         gpsObj.setLongitude(longtitude)
+        gpsObj.setSpeed(int(self.data["travelData"]["carSpeed"]))
+        gpsObj.setOBDSpeed(int(self.data["travelData"]["carSpeed"]))
         if self.lngLatIsOk == 0:
             gpsObj.setLatitude(0)
             gpsObj.setLongitude(0)
@@ -519,6 +523,8 @@ class ProtocolSimulaterService():
         gpsObj = GPSReport_protocol(DEV_ID=self.carId,WATER_CODE=self.sn)
         gpsObj.setLatitude(latitude)
         gpsObj.setLongitude(longtitude)
+        gpsObj.setSpeed(int(self.data["travelData"]["carSpeed"]))
+        gpsObj.setOBDSpeed(int(self.data["travelData"]["carSpeed"]))
         if self.lngLatIsOk == 0:
             gpsObj.setLatitude(0)
             gpsObj.setLongitude(0)
@@ -544,6 +550,8 @@ class ProtocolSimulaterService():
         # gpsObj.setLongitude(self.gpsLine[self.gpsLineIndex]["lng"])
         gpsObj.setLatitude(self.gpsLine[gpsLineIndex]["lat"])
         gpsObj.setLongitude(self.gpsLine[gpsLineIndex]["lng"])
+        gpsObj.setSpeed(int(self.data["travelData"]["carSpeed"]))
+        gpsObj.setOBDSpeed(int(self.data["travelData"]["carSpeed"]))
         if self.lngLatIsOk == 0:
             gpsObj.setLatitude(0)
             gpsObj.setLongitude(0)