Commit 6f33a0ec authored by liyuanhong's avatar liyuanhong

M500模拟器修改了熄火后速度和转速为0

parent bd947340
{"time": {"dateTime": "2020-06-19 13:56:33", "date": "2020-06-19", "time": "13:56:33"}, "curDayTravel": {"todayTotalMilleage": 747, "todayTotalOil": 72, "todayTotalTime": 45, "theMilleage": 83, "theOil": 8, "theTime": 5}, "travelData": {"totalMilleage": 453849, "totalOil": 42369, "totalTime": 27088}, "event": {"threeRapid": {"totalRapidlyAccelerate": 33, "totalSharpSlowdown": 23, "totalSharpTurn": 26}}} {"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 \ No newline at end of file
...@@ -434,7 +434,34 @@ class ProtocolSimulaterService(): ...@@ -434,7 +434,34 @@ class ProtocolSimulaterService():
gpsLineIndex = self.gpsLineIndex gpsLineIndex = self.gpsLineIndex
if gpsLineIndex >= len(self.gpsLine): if gpsLineIndex >= len(self.gpsLine):
gpsLineIndex = gpsLineIndex - 1 gpsLineIndex = gpsLineIndex - 1
self.OBDdata["engineSpeed"] = 0
self.OBDdata["speed"] = 0
self.OBDdata["meterMileage"] = self.OBDdata["meterMileage"] + int(
self.sendDur * (self.OBDdata["speed"] * 1000 / 3600))
self.OBDdata["totailMileage"] = self.OBDdata["totailMileage"] + int(
self.sendDur * (self.OBDdata["speed"] * 1000 / 3600))
oilExpend = int(self.data["travelData"]["oilExpend"])
self.OBDdata["totalOilExpen"] = self.OBDdata["totalOilExpen"] + int(
(self.sendDur * (self.OBDdata["speed"] * 1000 / 3600)) * (1000 / (oilExpend * 1000)))
self.OBDdata["totalRunTime"] = self.OBDdata["totalRunTime"] + self.sendDur
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"])
latitude = self.gpsLine[self.gpsLineIndex]["lat"]
longitude = self.gpsLine[self.gpsLineIndex]["lng"]
gpsMsg = self.genGPSMsg(latitude, longitude)
if OBDMsg != "":
self.sendMsg(OBDMsg)
type = self.getMsgFunId(OBDMsg)
info = type + ">>>>:" + OBDMsg
self.websocket.sendMsgToClient(info, self.websocketId)
sleep(0.1)
if gpsMsg != "":
self.sendMsg(gpsMsg)
type = self.getMsgFunId(gpsMsg)
info = type + ">>>>:" + gpsMsg
self.websocket.sendMsgToClient(info, self.websocketId)
sleep(1)
jdata = {"WATER_CODE": "0003", "DEV_ID": "M121501010001", jdata = {"WATER_CODE": "0003", "DEV_ID": "M121501010001",
"gpsInfo": {"UTCTime": "2020-04-30 14:59:33", "latitude": "40.22077", "longitude": "116.23128", "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", "speed": "80.8", "directionAngle": "80.8", "elevation": "2999.9", "positionStar": "3",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment