Skip to content

N
new-socketemulator
Commit 6061e9cc authored by liyuanhong's avatar liyuanhong
Browse files
Options

增加了控制反向行驶的字段

parent 0f68835d
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 4 deletions
data/protocolTools/GPSLines/6_先涛的车轨迹(短).txt
View file @ 6061e9cc
{"name": "gpsLine", "GPSLine": [{"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.287903", "lat": "29.586623\n"}, {"lng": "106.289041", "lat": "29.586608\n"}, {"lng": "106.293958", "lat": "29.586631\n"}, {"lng": "106.296643", "lat": "29.586603\n"}, {"lng": "106.29702", "lat": "29.586588\n"}, {"lng": "106.297076", "lat": "29.586625\n"}, {"lng": "106.297116", "lat": "29.586675\n"}, {"lng": "106.297148", "lat": "29.58674\n"}, {"lng": "106.297161", "lat": "29.586818\n"}, {"lng": "106.297168", "lat": "29.586906\n"}, {"lng": "106.297275", "lat": "29.58793\n"}, {"lng": "106.297461", "lat": "29.588408\n"}, {"lng": "106.297783", "lat": "29.588835\n"}, {"lng": "106.298863", "lat": "29.589848\n"}, {"lng": "106.299571", "lat": "29.59043\n"}, {"lng": "106.30007", "lat": "29.590666\n"}, {"lng": "106.300655", "lat": "29.59083\n"}, {"lng": "106.301408", "lat": "29.59091\n"}, {"lng": "106.301695", "lat": "29.590925\n"}, {"lng": "106.303111", "lat": "29.590928\n"}, {"lng": "106.30319", "lat": "29.590958\n"}, {"lng": "106.30325", "lat": "29.591001\n"}, {"lng": "106.303288", "lat": "29.59106\n"}, {"lng": "106.303306", "lat": "29.591125\n"}, {"lng": "106.303311", "lat": "29.591196\n"}, {"lng": "106.303321", "lat": "29.59202\n"}, {"lng": "106.303418", "lat": "29.594665\n"}, {"lng": "106.303493", "lat": "29.596323\n"}, {"lng": "106.30351", "lat": "29.597693\n"}]} {"name": "gpsLine", "GPSLine": [{"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.279711", "lat": "29.585448\n"}, {"lng": "106.287903", "lat": "29.586623\n"}, {"lng": "106.289041", "lat": "29.586608\n"}, {"lng": "106.293958", "lat": "29.586631\n"}, {"lng": "106.296643", "lat": "29.586603\n"}, {"lng": "106.29702", "lat": "29.586588\n"}, {"lng": "106.297076", "lat": "29.586625\n"}, {"lng": "106.297116", "lat": "29.586675\n"}, {"lng": "106.297148", "lat": "29.58674\n"}, {"lng": "106.297161", "lat": "29.586818\n"}, {"lng": "106.297168", "lat": "29.586906\n"}, {"lng": "106.297275", "lat": "29.58793\n"}, {"lng": "106.297461", "lat": "29.588408\n"}, {"lng": "106.297783", "lat": "29.588835\n"}, {"lng": "106.298863", "lat": "29.589848\n"}, {"lng": "106.299571", "lat": "29.59043\n"}, {"lng": "106.30007", "lat": "29.590666\n"}, {"lng": "106.300655", "lat": "29.59083\n"}, {"lng": "106.301408", "lat": "29.59091\n"}, {"lng": "106.301695", "lat": "29.590925\n"}, {"lng": "106.303111", "lat": "29.590928\n"}, {"lng": "106.30319", "lat": "29.590958\n"}, {"lng": "106.30325", "lat": "29.591001\n"}, {"lng": "106.303288", "lat": "29.59106\n"}, {"lng": "106.303306", "lat": "29.591125\n"}, {"lng": "106.303311", "lat": "29.591196\n"}, {"lng": "106.303321", "lat": "29.59202\n"}, {"lng": "106.303418", "lat": "29.594665\n"}, {"lng": "106.303493", "lat": "29.596323\n"}, {"lng": "106.30351", "lat": "29.597693\n"},{"lng":"104.071983","lat":"30.660290"}]}
\ No newline at end of file \ No newline at end of file
data/protocolTools/carData/M202003060520.json
View file @ 6061e9cc
{"time": {"dateTime": "2020-07-29 12:19:19", "date": "2020-07-29", "time": "12:19:19"}, "curDayTravel": {"todayTotalMilleage": 1635, "todayTotalOil": 105, "todayTotalTime": 102, "theMilleage": 1635, "theOil": 105, "theTime": 102}, "travelData": {"totalMilleage": 624079, "totalOil": 55294, "totalTime": 37575}, "event": {"threeRapid": {"totalRapidlyAccelerate": 53, "totalSharpSlowdown": 42, "totalSharpTurn": 44}}} {"time": {"dateTime": "2020-07-29 12:19:19", "date": "2020-07-29", "time": "12:19:19"}, "curDayTravel": {"todayTotalMilleage": 7938, "todayTotalOil": 513, "todayTotalTime": 495, "theMilleage": 656, "theOil": 41, "theTime": 41}, "travelData": {"totalMilleage": 630382, "totalOil": 55702, "totalTime": 37968}, "event": {"threeRapid": {"totalRapidlyAccelerate": 53, "totalSharpSlowdown": 42, "totalSharpTurn": 44}}}
\ No newline at end of file \ No newline at end of file
lib/socket/service/ProtocolSimulaterService.py
View file @ 6061e9cc
...@@ -346,7 +346,10 @@ class ProtocolSimulaterService(): ...@@ -346,7 +346,10 @@ class ProtocolSimulaterService():
with open("data/protocolTools/GPSLines/" + fileName,"r",encoding="utf-8") as fi: with open("data/protocolTools/GPSLines/" + fileName,"r",encoding="utf-8") as fi:
content = fi.read() content = fi.read()
conJson = json.loads(content) conJson = json.loads(content)
if(int(self.data["travelData"]["travelDirection"]) == 0):
self.gpsLine = conJson["GPSLine"] self.gpsLine = conJson["GPSLine"]
else:
self.gpsLine = conJson["GPSLine"][::-1] #反转gps数组
#点火，发送点火事件 #点火，发送点火事件
def fireOn(self): def fireOn(self):
......
templates/protocolTools/report/M_carSimulater_page.html
View file @ 6061e9cc
...@@ -122,6 +122,10 @@ ...@@ -122,6 +122,10 @@
<button id="clear_B" type="button" class="btn btn-warning" onclick="clearlog()">清空日志</button> <button id="clear_B" type="button" class="btn btn-warning" onclick="clearlog()">清空日志</button>
<span style="margin-left:20px;"><label>当前状态：</label><input id="curStatus" value="断网" disabled="disabled" class="form-control" style="font-weight: bold;width:85px;color:red;border-width: 1px; border-style: solid; border-color: darkgray; border-radius: 10px;"></span> <span style="margin-left:20px;"><label>当前状态：</label><input id="curStatus" value="断网" disabled="disabled" class="form-control" style="font-weight: bold;width:85px;color:red;border-width: 1px; border-style: solid; border-color: darkgray; border-radius: 10px;"></span>
<span style="width:80px;padding-left:10px;"><label style="width:70px"><input type="checkbox" id="ignition" onclick="isLogShow(this)"/>隐藏日志</label> </span> <span style="width:80px;padding-left:10px;"><label style="width:70px"><input type="checkbox" id="ignition" onclick="isLogShow(this)"/>隐藏日志</label> </span>
<span style="border-width:1px;border-style:solid;border-color:darkgray;border-radius:10px;padding:1px 10px;">
<label><input name="travelDirection" type="radio" value="0" checked="checked"/>正向</label>
<label style="margin-left:10px;"><input name="travelDirection" type="radio" value="1"/>反向</label>
</span>
</div> </div>
<div style="display: block; width: 100%; border-width: 1px; border-style: solid; border-color: darkgray; border-radius: 10px; padding: 2px; margin-top: 5px;"> <div style="display: block; width: 100%; border-width: 1px; border-style: solid; border-color: darkgray; border-radius: 10px; padding: 2px; margin-top: 5px;">
<h5><b>事件发送：</b> <h5><b>事件发送：</b>
...@@ -287,9 +291,11 @@ function getPageData(){ ...@@ -287,9 +291,11 @@ function getPageData(){
var carSpeed = $("#carSpeed").val() var carSpeed = $("#carSpeed").val()
var oilExpend = $("#oilExpend").val() var oilExpend = $("#oilExpend").val()
var travelLoop = $("#travelLoop").val() var travelLoop = $("#travelLoop").val()
var travelDirection = $("input[name='travelDirection']:checked").val()
data["travelData"]["carSpeed"] = carSpeed data["travelData"]["carSpeed"] = carSpeed
data["travelData"]["oilExpend"] = oilExpend data["travelData"]["oilExpend"] = oilExpend
data["travelData"]["travelLoop"] = travelLoop data["travelData"]["travelLoop"] = travelLoop
data["travelData"]["travelDirection"] = travelDirection
//其他默认数据 //其他默认数据
data["other"] = {} data["other"] = {}
var valtage = 1.2 * 10 var valtage = 1.2 * 10
......
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