Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
new-socketemulator
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
李远洪
new-socketemulator
Commits
bd947340
Commit
bd947340
authored
Jun 19, 2020
by
liyuanhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
M500模拟器修改了疲劳驾驶和超速报警错误的问题
parent
4cf9b118
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
data/protocolTools/carData/M202003060520.json
data/protocolTools/carData/M202003060520.json
+1
-1
lib/protocol/report/EventReport_protocol.py
lib/protocol/report/EventReport_protocol.py
+2
-2
No files found.
data/protocolTools/carData/M202003060520.json
View file @
bd947340
{
"time"
:
{
"dateTime"
:
"2020-06-18 09:52:18"
,
"date"
:
"2020-06-18"
,
"time"
:
"09:52:18"
},
"curDayTravel"
:
{
"todayTotalMilleage"
:
25532
,
"todayTotalOil"
:
2282
,
"todayTotalTime"
:
1550
,
"theMilleage"
:
1162
,
"theOil"
:
112
,
"theTime"
:
70
},
"travelData"
:
{
"totalMilleage"
:
453102
,
"totalOil"
:
42297
,
"totalTime"
:
27043
},
"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"
:
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
}}}
\ No newline at end of file
\ No newline at end of file
lib/protocol/report/EventReport_protocol.py
View file @
bd947340
...
@@ -296,12 +296,12 @@ class EventReport_protocol(ProtocolBase):
...
@@ -296,12 +296,12 @@ class EventReport_protocol(ProtocolBase):
if
(
"0027"
in
eventData
.
keys
()):
#超速告警
if
(
"0027"
in
eventData
.
keys
()):
#超速告警
eventObj
=
EventClass
()
eventObj
=
EventClass
()
theData
=
eventObj
.
overSpeedAlarm
(
int
(
eventData
[
"0027"
][
"alarmType"
]),
theData
=
eventObj
.
overSpeedAlarm
(
int
(
eventData
[
"0027"
][
"alarmType"
]),
int
(
eventData
[
"0027"
][
"durTime"
]))
int
(
eventData
[
"0027"
][
"dur
ation
Time"
]))
data
=
data
+
"0027"
+
self
.
int2hexStringByBytes
(
int
((
len
(
theData
)
/
2
)),
2
)
+
theData
data
=
data
+
"0027"
+
self
.
int2hexStringByBytes
(
int
((
len
(
theData
)
/
2
)),
2
)
+
theData
if
(
"0028"
in
eventData
.
keys
()):
#疲劳驾驶告警
if
(
"0028"
in
eventData
.
keys
()):
#疲劳驾驶告警
eventObj
=
EventClass
()
eventObj
=
EventClass
()
theData
=
eventObj
.
tiredDrivingAlarm
(
int
(
eventData
[
"0028"
][
"alarmType"
]),
theData
=
eventObj
.
tiredDrivingAlarm
(
int
(
eventData
[
"0028"
][
"alarmType"
]),
int
(
eventData
[
"0028"
][
"durTime"
]),)
int
(
eventData
[
"0028"
][
"dur
ation
Time"
]),)
data
=
data
+
"0028"
+
self
.
int2hexStringByBytes
(
int
((
len
(
theData
)
/
2
)),
2
)
+
theData
data
=
data
+
"0028"
+
self
.
int2hexStringByBytes
(
int
((
len
(
theData
)
/
2
)),
2
)
+
theData
if
(
"0032"
in
eventData
.
keys
()):
#怠速时间过长报警
if
(
"0032"
in
eventData
.
keys
()):
#怠速时间过长报警
eventObj
=
EventClass
()
eventObj
=
EventClass
()
...
...
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