Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
autoCar
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李远洪
autoCar
Commits
2df27cb9
Commit
2df27cb9
authored
Apr 17, 2020
by
liyuanhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
尝试修复了一下里程有油耗累加的bug
parent
a776cb38
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
76 additions
and
150 deletions
+76
-150
data/protocolTools/2_大坪到南滨路钟楼.json
data/protocolTools/2_大坪到南滨路钟楼.json
+0
-0
data/protocolTools/carData/M202003060520.json
data/protocolTools/carData/M202003060520.json
+1
-1
lib/socket/service/AutoCarService.py
lib/socket/service/AutoCarService.py
+15
-9
result.txt
result.txt
+59
-139
start.py
start.py
+1
-1
No files found.
data/protocolTools/
GPSLines/
2_大坪到南滨路钟楼.json
→
data/protocolTools/2_大坪到南滨路钟楼.json
View file @
2df27cb9
File moved
data/protocolTools/carData/M202003060520.json
View file @
2df27cb9
{
"time"
:
{
"dateTime"
:
"2020-04-16 13:47:50"
,
"date"
:
"2020-04-16"
,
"time"
:
"13:47:50"
},
"curDayTravel"
:
{
"todayTotalMilleage"
:
84048
,
"todayTotalOil"
:
102
,
"todayTotalTime"
:
102
,
"theMilleage"
:
1632
,
"theOil"
:
1
,
"theTime"
:
1
},
"travelData"
:
{
"totalMilleage"
:
103664
,
"totalOil"
:
151
,
"totalTime"
:
151
}}
{
"time"
:
{
"dateTime"
:
"2020-04-17 17:53:51"
,
"date"
:
"2020-04-17"
,
"time"
:
"17:53:51"
},
"curDayTravel"
:
{
"todayTotalMilleage"
:
139860
,
"todayTotalOil"
:
770
,
"todayTotalTime"
:
350
,
"theMilleage"
:
73815
,
"theOil"
:
396
,
"theTime"
:
180
},
"travelData"
:
{
"totalMilleage"
:
243524
,
"totalOil"
:
921
,
"totalTime"
:
501
}}
\ No newline at end of file
\ No newline at end of file
lib/socket/service/AutoCarService.py
View file @
2df27cb9
...
@@ -209,9 +209,9 @@ class AutoCarService():
...
@@ -209,9 +209,9 @@ class AutoCarService():
with
open
(
"data/protocolTools/carData/"
+
self
.
carId
+
".json"
,
"r"
,
encoding
=
"utf-8"
)
as
fi
:
with
open
(
"data/protocolTools/carData/"
+
self
.
carId
+
".json"
,
"r"
,
encoding
=
"utf-8"
)
as
fi
:
content
=
fi
.
read
()
content
=
fi
.
read
()
conJson
=
json
.
loads
(
content
)
conJson
=
json
.
loads
(
content
)
conJson
[
"curDayTravel"
][
"theMilleage"
]
=
0
# 今日行驶总里程
#
conJson["curDayTravel"]["theMilleage"] = 0 # 今日行驶总里程
conJson
[
"curDayTravel"
][
"theOil"
]
=
0
# 今日行驶总油耗
#
conJson["curDayTravel"]["theOil"] = 0 # 今日行驶总油耗
conJson
[
"curDayTravel"
][
"theTime"
]
=
0
# 今日行驶总时间
#
conJson["curDayTravel"]["theTime"] = 0 # 今日行驶总时间
timeStamp
=
time
.
time
()
timeStamp
=
time
.
time
()
timeArray
=
time
.
localtime
(
timeStamp
)
timeArray
=
time
.
localtime
(
timeStamp
)
dateTimeM
=
time
.
strftime
(
"
%
Y-
%
m-
%
d
%
H:
%
M:
%
S"
,
timeArray
)
dateTimeM
=
time
.
strftime
(
"
%
Y-
%
m-
%
d
%
H:
%
M:
%
S"
,
timeArray
)
...
@@ -223,18 +223,24 @@ class AutoCarService():
...
@@ -223,18 +223,24 @@ class AutoCarService():
if
dateM
==
conJson
[
"time"
][
"date"
]:
if
dateM
==
conJson
[
"time"
][
"date"
]:
pass
pass
else
:
#如果不是当天日期,则将日期设置为当天,并写入车辆数据文件
else
:
#如果不是当天日期,则将日期设置为当天,并写入车辆数据文件
conJson
[
"time"
][
"dateTime"
]
=
dateTimeM
#
conJson["time"]["dateTime"] = dateTimeM
conJson
[
"time"
][
"date"
]
=
dateM
#
conJson["time"]["date"] = dateM
conJson
[
"time"
][
"time"
]
=
timeM
#
conJson["time"]["time"] = timeM
conJson
[
"curDayTravel"
][
"todayTotalMilleage"
]
=
0
# 今日行驶总里程
#
conJson["curDayTravel"]["todayTotalMilleage"] = 0 # 今日行驶总里程
conJson
[
"curDayTravel"
][
"todayTotalOil"
]
=
0
# 今日行驶总油耗
#
conJson["curDayTravel"]["todayTotalOil"] = 0 # 今日行驶总油耗
conJson
[
"curDayTravel"
][
"todayTotalTime"
]
=
0
# 今日行驶总时间
#
conJson["curDayTravel"]["todayTotalTime"] = 0 # 今日行驶总时间
self
.
carDataObj
.
setTodayTotalMilleage
(
0
)
self
.
carDataObj
.
setTodayTotalMilleage
(
0
)
self
.
carDataObj
.
setTodayTodayTotalOil
(
0
)
self
.
carDataObj
.
setTodayTodayTotalOil
(
0
)
self
.
carDataObj
.
setTodayTodayTotalTime
(
0
)
self
.
carDataObj
.
setTodayTodayTotalTime
(
0
)
self
.
carDataObj
.
setDateTime2file
(
dateTimeM
)
self
.
carDataObj
.
setDateTime2file
(
dateTimeM
)
self
.
carDataObj
.
setData2file
(
dateM
)
self
.
carDataObj
.
setData2file
(
dateM
)
self
.
carDataObj
.
setTime2file
(
timeM
)
self
.
carDataObj
.
setTime2file
(
timeM
)
self
.
OBDdata
[
"totailMileage"
]
=
self
.
carDataObj
[
"travelData"
][
"totalMilleage"
]
self
.
OBDdataOri
[
"totailMileage"
]
=
self
.
carDataObj
[
"travelData"
][
"totalMilleage"
]
self
.
OBDdata
[
"totalOilExpen"
]
=
self
.
carDataObj
[
"travelData"
][
"totalOil"
]
self
.
OBDdataOri
[
"totalOilExpen"
]
=
self
.
carDataObj
[
"travelData"
][
"totalOil"
]
self
.
OBDdata
[
"totalRunTime"
]
=
self
.
carDataObj
[
"travelData"
][
"totalTime"
]
self
.
OBDdataOri
[
"totalRunTime"
]
=
self
.
carDataObj
[
"travelData"
][
"totalTime"
]
self
.
carData
=
conJson
self
.
carData
=
conJson
fireOnEventObj
=
EventReport_protocol
(
DEV_ID
=
self
.
carId
,
WATER_CODE
=
self
.
sn
)
fireOnEventObj
=
EventReport_protocol
(
DEV_ID
=
self
.
carId
,
WATER_CODE
=
self
.
sn
)
gpsData
=
self
.
genGPSData
(
self
.
gpsLine
[
0
][
"lat"
],
self
.
gpsLine
[
0
][
"lng"
])
gpsData
=
self
.
genGPSData
(
self
.
gpsLine
[
0
][
"lat"
],
self
.
gpsLine
[
0
][
"lng"
])
...
...
result.txt
View file @
2df27cb9
This diff is collapsed.
Click to expand it.
start.py
View file @
2df27cb9
...
@@ -14,7 +14,7 @@ def startSimulaterService():
...
@@ -14,7 +14,7 @@ def startSimulaterService():
autoCarObj
.
setServiceTime
(
1
*
10
*
60
)
# 设置整个服务的持续时间
autoCarObj
.
setServiceTime
(
1
*
10
*
60
)
# 设置整个服务的持续时间
autoCarObj
.
setOilExpend
(
10
)
# 设置1L 油跑多少公里
autoCarObj
.
setOilExpend
(
10
)
# 设置1L 油跑多少公里
autoCarObj
.
setSpeed
(
6
0
)
#设置车速,每小时多少公里
autoCarObj
.
setSpeed
(
8
0
)
#设置车速,每小时多少公里
autoCarObj
.
startService
()
autoCarObj
.
startService
()
if
__name__
==
"__main__"
:
if
__name__
==
"__main__"
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment