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
b6c6afdc
Commit
b6c6afdc
authored
Mar 26, 2020
by
liyuanhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
M500模拟器设置应答消息功能完成
parent
11cac106
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
16 deletions
+6
-16
lib/socket/service/ProtocolSimulaterService.py
lib/socket/service/ProtocolSimulaterService.py
+1
-9
lib/socket/service/websocket_service.py
lib/socket/service/websocket_service.py
+1
-1
requirements.txt
requirements.txt
+1
-1
templates/protocolTools/report/M_carSimulater_page.html
templates/protocolTools/report/M_carSimulater_page.html
+3
-2
views/protocolTools/M_carSimulater_process.py
views/protocolTools/M_carSimulater_process.py
+0
-3
No files found.
lib/socket/service/ProtocolSimulaterService.py
View file @
b6c6afdc
...
...
@@ -43,12 +43,6 @@ class ProtocolSimulaterService():
self
.
sendMsg
(
msg
)
type
=
self
.
getMsgFunId
(
msg
)
self
.
websocket
.
send
(
">>>>"
+
type
+
":"
+
msg
)
# d = self.revMsg()
# d = str(binascii.b2a_hex(d))[2:][:-1]
# self.websocket.send("<<<<" + type +":" + d)
# info = "\n车机发送了" + type + "消息:" + msg + "\n车机收到了消息:" + d
# self.websocket.send(info)
def
serviceSend
(
self
):
while
self
.
serviceStatus
==
1
:
...
...
@@ -72,7 +66,7 @@ class ProtocolSimulaterService():
#停止与页面交互的websockt服务
def
websocketService
(
self
):
self
.
websocket
=
Websocket_service
()
self
.
websocket
.
setHost
(
"
127.0.0.1
"
)
self
.
websocket
.
setHost
(
"
0.0.0.0
"
)
self
.
websocket
.
setPort
(
5005
)
self
.
websocket
.
startWebsocketServer
()
...
...
@@ -80,8 +74,6 @@ class ProtocolSimulaterService():
def
startService
(
self
):
self
.
serviceStatus
=
1
t1
=
threading
.
Thread
(
target
=
self
.
serviceSend
,
args
=
())
# t2 = threading.Thread(target=self.serviceRev, args=())
# t2.start()
t1
.
start
()
#启动与页面交互的websocket服务
...
...
lib/socket/service/websocket_service.py
View file @
b6c6afdc
...
...
@@ -9,7 +9,7 @@ from lib.socket.SocketBase import SocketBase
from
lib.socket.websocket_server
import
WebsocketServer
class
Websocket_service
(
SocketBase
):
def
__init__
(
self
,
host
=
"
127.0.0.1
"
,
port
=
5005
):
def
__init__
(
self
,
host
=
"
0.0.0.0
"
,
port
=
5005
):
self
.
host
=
host
self
.
port
=
port
self
.
server
=
None
...
...
requirements.txt
View file @
b6c6afdc
wxPython
==4.0.7.post2
#
wxPython==4.0.7.post2
Flask
==1.0.2
crcmod
==1.7
templates/protocolTools/report/M_carSimulater_page.html
View file @
b6c6afdc
...
...
@@ -76,7 +76,7 @@
</div>
<div
style=
"width:100%;padding-bottom:60px;border-bottom: 1px solid #eee;"
>
<h3>
日志:
</h3>
<textarea
id=
"showFeedback"
style=
"width:100%;padding:5px;padding-bottom:60px;"
rows=
"
6
"
></textarea>
<textarea
id=
"showFeedback"
style=
"width:100%;padding:5px;padding-bottom:60px;"
rows=
"
10
"
></textarea>
</div>
</div>
...
...
@@ -239,7 +239,8 @@ i = 1;
function
WebSocketTest
(){
if
(
"
WebSocket
"
in
window
){
console
.
log
(
"
您的浏览器支持 WebSocket!
"
);
ws
=
new
WebSocket
(
"
ws://127.0.0.1:5005
"
);
var
domain
=
document
.
domain
;
ws
=
new
WebSocket
(
"
ws://
"
+
domain
+
"
:5005
"
);
ws
.
onopen
=
function
(){
console
.
log
(
"
socket 已经连接上!
"
)
};
...
...
views/protocolTools/M_carSimulater_process.py
View file @
b6c6afdc
...
...
@@ -8,7 +8,6 @@ from lib.protocol.report.VersionReport_protocol import VersionReport_protocol
from
lib.socket.ClientSocket
import
ClientSocket
import
json
import
traceback
from
lib.socket.service.ProtocolSimulaterService
import
ProtocolSimulaterService
M_carSimulater_process
=
Blueprint
(
'M_carSimulater_process'
,
__name__
)
...
...
@@ -121,8 +120,6 @@ def fire():
data
=
{}
try
:
service
=
connects
[
0
][
"service"
]
# clientSocket = connects[0]["obj"]
# service.setSocket(clientSocket)
service
.
setSendDur
(
durTime
)
#设置车机多久循环发送一次消息
service
.
startService
()
connects
[
0
][
"service"
]
=
service
...
...
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