增加了实时控制模拟器

lib/socket/ClientWebSocket.py

@@ -33,8 +33,9 @@ class ClientWebSocket():
         self.ws.run_forever()
 
     def on_message(self, message):
-        print("收到消息：" + message)
-        wx.CallAfter(pub.sendMessage, "msgRev", msg=message)
+        # print("收到消息：" + message)
+        curTime = self.getCurTime()
+        wx.CallAfter(pub.sendMessage, "msgRev", msg=curTime + message)
 
     def on_error(self, error):
         print(error)

ui/HomeArea.py

@@ -218,29 +218,62 @@ class HomeArea():
         self.setLogRedirect()
         msgJson = json.loads(msg)
         msgType = msgJson["type"]
+        rSkey = msgJson["skey"]
+        replyMsg = {}
+        replyMsg["skey"] = rSkey
         if msgType == "1":
             cam = msgJson["data"]["cam"]
             if cam == 1:
                 if globalParams.camera_1.getPushObj() == None :
                     globalParams.camera_1.doConnect()
                     globalParams.camera_1.startPush(None)
+                    replyMsg["type"] = "0"
+                    replyMsg = json.dumps(replyMsg)
+                    self.ws.sendMsg(replyMsg)
+                    curTime = self.getCurTime()
+                    self.logTextCtr.WriteText(curTime + "回复消息：" + replyMsg + "\n")
                 else:
                     curTime = self.getCurTime()
                     self.logTextCtr.WriteText(curTime + "消息： 摄像头1连接中！！！\n")
+                    replyMsg["type"] = "0"
+                    replyMsg = json.dumps(replyMsg)
+                    self.ws.sendMsg(replyMsg)
+                    curTime = self.getCurTime()
+                    self.logTextCtr.WriteText(curTime + "回复消息：" + replyMsg + "\n")
             elif cam == 2:
                 if globalParams.camera_2.getPushObj() == None:
                     globalParams.camera_2.doConnect()
                     globalParams.camera_2.startPush(None)
+                    replyMsg["type"] = "0"
+                    replyMsg = json.dumps(replyMsg)
+                    self.ws.sendMsg(replyMsg)
+                    curTime = self.getCurTime()
+                    self.logTextCtr.WriteText(curTime + "回复消息：" + replyMsg + "\n")
                 else:
                     curTime = self.getCurTime()
                     self.logTextCtr.WriteText(curTime + "消息： 摄像头2连接中！！！\n")
+                    replyMsg["type"] = "0"
+                    replyMsg = json.dumps(replyMsg)
+                    self.ws.sendMsg(replyMsg)
+                    curTime = self.getCurTime()
+                    self.logTextCtr.WriteText(curTime + "回复消息：" + replyMsg + "\n")
             elif cam == 3:
                 if globalParams.camera_3.getPushObj() == None:
                     globalParams.camera_3.doConnect()
                     globalParams.camera_3.startPush(None)
+                    replyMsg["type"] = "0"
+                    replyMsg = json.dumps(replyMsg)
+                    self.ws.sendMsg(replyMsg)
+                    curTime = self.getCurTime()
+                    self.logTextCtr.WriteText(curTime + "回复消息：" + replyMsg + "\n")
                 else:
                     curTime = self.getCurTime()
                     self.logTextCtr.WriteText(curTime + "消息： 摄像头3连接中！！！\n")
+                    replyMsg["type"] = "0"
+                    replyMsg = json.dumps(replyMsg)
+                    self.ws.sendMsg(replyMsg)
+                    curTime = self.getCurTime()
+                    self.logTextCtr.WriteText(curTime + "回复消息：" + replyMsg + "\n")
 
     ####################################################
     #      日志重定向到日志框