优化了日志输出

lib/service/StreamH264Flv.py

@@ -44,6 +44,7 @@ class StreamH264Flv():
         self.isOpenVideoLog = 0                             # 是否开启视频日志 0：不开启   1：开启
         self.isOpenAudioLog = 0                             # 是否开启音频日志 0：不开启   1：开启
         self.protocal_1078 = Protocal_1078()
+        self.autoClose = 0                                  # 视频推流完是否自动关闭连接  0：否    1：是
 
 
     def setMobile(self,data):
@@ -76,6 +77,9 @@ class StreamH264Flv():
         self.isOpenVideoLog = data
     def setIsOpenAudioLog(self,data):
         self.isOpenAudioLog = data
+    def setAutoClose(self,data):
+        self.autoClose = data
+
 
 
     ####################################################
@@ -95,6 +99,7 @@ class StreamH264Flv():
     ####################################################
     def disConnectServer(self):
         self.client.close()
+        self.client = None
 
     ####################################################
     #     读取flv文件，并发送 （h264编码，并且音频为aac编码格式）
@@ -161,8 +166,13 @@ class StreamH264Flv():
         timeCur = self.getCurTime()
         self.multiPushStatus = self.multiPushStatus + 1
         self.timeStampSeek = timeStamp + 1000
-        self.logTextCtr.WriteText(timeCur + "视频推流完，自动结束推流！\n")
-        # self.client.close()
+        self.logTextCtr.WriteText(timeCur + "视频推流结束，自动结束推流！\n")
+        if self.autoClose == 1:
+            self.client.close()
+            self.client = None
+            curTime = self.getCurTime()
+            msgTxt = curTime + "视频推流结束，自动结束推流！(同时断开了连接)"
+            wx.CallAfter(pub.sendMessage, "closeMsg" + str(self.channel), msg=msgTxt)
 
     ####################################################
     #     停止发送消息
@@ -178,7 +188,8 @@ class StreamH264Flv():
         res = json.loads(res)
         url = res["data"]["url"]
         # url = self.replaceHost(res["data"]["url"],"video-test.vandyo.com:")
-        print("播放地址：" + url)
+        wx.CallAfter(pub.sendMessage, "showLog" + str(self.channel), msg="播放地址：" + url + "\n")
+        # print("播放地址：" + url)
 
     ####################################################
     #      替换url的host
@@ -217,7 +228,7 @@ class StreamH264Flv():
             if self.isOpenVideoLog != 0:
                 # print("发送视频消息：" + msg)
                 msgTxt = "发送视频消息：" + msg
-                wx.CallAfter(pub.sendMessage, "showLog", msg=msgTxt)
+                wx.CallAfter(pub.sendMessage, "showLog" + str(self.channel), msg=msgTxt)
             try:
                 self.client.send(binascii.a2b_hex(msg))
             except:
@@ -241,7 +252,7 @@ class StreamH264Flv():
             if self.isOpenAudioLog != 0:
                 # print("发送音频消息：" + msg)
                 msgTxt = "发送音频消息：" + msg
-                wx.CallAfter(pub.sendMessage, "showLog", msg=msgTxt)
+                wx.CallAfter(pub.sendMessage, "showLog" + str(self.channel), msg=msgTxt)
             self.client.send(binascii.a2b_hex(msg))
             time.sleep(self.sendDur)
 
@@ -311,7 +322,6 @@ class StreamH264Flv():
             frameData["frames"] = frames
         elif frameData["AVCPkgType"] == 2:
             frameData["frames"] = []
-            # print("2222222----------" + AVTag)
         else:
             frameData["frames"] = []
         return frameData

lib/socket/ClientWebSocket.py

@@ -2,7 +2,8 @@
 import ssl
 import time
 
-from gevent import thread
+import wx
+from pubsub import pub
 import websocket
 
 
@@ -33,15 +34,18 @@ class ClientWebSocket():
 
     def on_message(self, message):
         print("收到消息：" + message)
+        wx.CallAfter(pub.sendMessage, "msgRev", msg=message)
 
     def on_error(self, error):
         print(error)
 
     def on_close(self):
-        print("websocket 已经断开！！！")
+        curTime = self.getCurTime()
+        print(curTime + "websocket 已经断开！！！")
 
     def on_open(self):
-        print("websocket 已连接......")
+        curTime = self.getCurTime()
+        print(curTime + "websocket 已连接......")
         print(self.wsUrl + self.wsCode)
 
     ##################################################
@@ -56,6 +60,16 @@ class ClientWebSocket():
     def close(self):
         self.ws.close()
 
+    ####################################################
+    #      获取当前时间
+    ####################################################
+    def getCurTime(self):
+        timeCur = int(time.time() * 1000)
+        timeArray = time.localtime(timeCur / 1000)
+        timeCur = time.strftime("%Y-%m-%d %H:%M:%S", timeArray)
+        timeCur = "[" + timeCur + "]  "
+        return timeCur
+
 if __name__ == "__main__":
     ClientWebSocket().connect()
 

ui/MainWindow.py

@@ -6,6 +6,7 @@ from ui.CameraArea import CameraArea
 from ui.CodecArea import CodecArea
 from ui.EventAndOtherArea import EventAndOtherArea
 from ui.HomeArea import HomeArea
+from ui import globalParams
 
 '''
 定义主窗体
@@ -45,15 +46,18 @@ class MainWindow():
         nodeBook.AddPage(page0, "云镜首页")
 
         cameraArea1 = CameraArea(nodeBook)
+        globalParams.camera_1 = cameraArea1
         page1 = cameraArea1.create()
         nodeBook.AddPage(page1,"摄像头1")
 
         cameraArea2 = CameraArea(nodeBook)
+        globalParams.camera_2 = cameraArea2
         cameraArea2.setChannel(2)
         page2 = cameraArea2.create()
         nodeBook.AddPage(page2, "摄像头2")
 
         cameraArea3 = CameraArea(nodeBook)
+        globalParams.camera_3 = cameraArea3
         cameraArea3.setChannel(3)
         page3 = cameraArea3.create()
         nodeBook.AddPage(page3, "摄像头3")

ui/globalParams.py

+# coding:utf-8
+
+camera_1 = None                # 相机1
+camera_2 = None                # 相机2
+camera_3 = None                # 相机3
+
+isLogRedirect = 0              # 日志是否重定向到日志文本框 0： 不重定向 (用于调试)   1：重定向   (用于给别人用)