Commit b6c6afdc authored by liyuanhong's avatar liyuanhong

M500模拟器设置应答消息功能完成

parent 11cac106
...@@ -43,12 +43,6 @@ class ProtocolSimulaterService(): ...@@ -43,12 +43,6 @@ class ProtocolSimulaterService():
self.sendMsg(msg) self.sendMsg(msg)
type = self.getMsgFunId(msg) type = self.getMsgFunId(msg)
self.websocket.send(">>>>" + type + ":" + 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): def serviceSend(self):
while self.serviceStatus == 1: while self.serviceStatus == 1:
...@@ -72,7 +66,7 @@ class ProtocolSimulaterService(): ...@@ -72,7 +66,7 @@ class ProtocolSimulaterService():
#停止与页面交互的websockt服务 #停止与页面交互的websockt服务
def websocketService(self): def websocketService(self):
self.websocket = Websocket_service() self.websocket = Websocket_service()
self.websocket.setHost("127.0.0.1") self.websocket.setHost("0.0.0.0")
self.websocket.setPort(5005) self.websocket.setPort(5005)
self.websocket.startWebsocketServer() self.websocket.startWebsocketServer()
...@@ -80,8 +74,6 @@ class ProtocolSimulaterService(): ...@@ -80,8 +74,6 @@ class ProtocolSimulaterService():
def startService(self): def startService(self):
self.serviceStatus = 1 self.serviceStatus = 1
t1 = threading.Thread(target=self.serviceSend,args=()) t1 = threading.Thread(target=self.serviceSend,args=())
# t2 = threading.Thread(target=self.serviceRev, args=())
# t2.start()
t1.start() t1.start()
#启动与页面交互的websocket服务 #启动与页面交互的websocket服务
......
...@@ -9,7 +9,7 @@ from lib.socket.SocketBase import SocketBase ...@@ -9,7 +9,7 @@ from lib.socket.SocketBase import SocketBase
from lib.socket.websocket_server import WebsocketServer from lib.socket.websocket_server import WebsocketServer
class Websocket_service(SocketBase): 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.host = host
self.port = port self.port = port
self.server = None self.server = None
......
wxPython==4.0.7.post2 #wxPython==4.0.7.post2
Flask==1.0.2 Flask==1.0.2
crcmod==1.7 crcmod==1.7
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</div> </div>
<div style="width:100%;padding-bottom:60px;border-bottom: 1px solid #eee;"> <div style="width:100%;padding-bottom:60px;border-bottom: 1px solid #eee;">
<h3>日志:</h3> <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>
</div> </div>
...@@ -239,7 +239,8 @@ i = 1; ...@@ -239,7 +239,8 @@ i = 1;
function WebSocketTest(){ function WebSocketTest(){
if ("WebSocket" in window){ if ("WebSocket" in window){
console.log("您的浏览器支持 WebSocket!"); 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(){ ws.onopen = function(){
console.log("socket 已经连接上!") console.log("socket 已经连接上!")
}; };
......
...@@ -8,7 +8,6 @@ from lib.protocol.report.VersionReport_protocol import VersionReport_protocol ...@@ -8,7 +8,6 @@ from lib.protocol.report.VersionReport_protocol import VersionReport_protocol
from lib.socket.ClientSocket import ClientSocket from lib.socket.ClientSocket import ClientSocket
import json import json
import traceback import traceback
from lib.socket.service.ProtocolSimulaterService import ProtocolSimulaterService from lib.socket.service.ProtocolSimulaterService import ProtocolSimulaterService
M_carSimulater_process = Blueprint('M_carSimulater_process', __name__) M_carSimulater_process = Blueprint('M_carSimulater_process', __name__)
...@@ -121,8 +120,6 @@ def fire(): ...@@ -121,8 +120,6 @@ def fire():
data = {} data = {}
try: try:
service = connects[0]["service"] service = connects[0]["service"]
# clientSocket = connects[0]["obj"]
# service.setSocket(clientSocket)
service.setSendDur(durTime) #设置车机多久循环发送一次消息 service.setSendDur(durTime) #设置车机多久循环发送一次消息
service.startService() service.startService()
connects[0]["service"] = service connects[0]["service"] = service
......
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