优化了界面

lib/service/StreamH264Flv.py

@@ -278,7 +278,7 @@ if __name__ == "__main__":
     obj.setHost("10.100.11.125")
     # obj.setHost("video-test.vandyo.com")
     obj.setPort(1078)
-    obj.setVideoPath("../../flv/bbb3.flv")
+    obj.setVideoPath("../../flv/yyy.flv")
     obj.connectServer()
     obj.readFlvAndSend()
 

run.py

@@ -33,7 +33,7 @@ def getPressTestObj():
     test.setPort(1078)
     test.setMobileStart(10000000000)                  # 开始的设备号 （累加）
     test.setChannel(1)                                # 设置频道号
-    test.setTerNum(3)                                 # 要启动的推拉流线程
+    test.setTerNum(10)                                 # 要启动的推拉流线程
     test.setIsOpenPullStream(1)                       # 设置是否开启拉流
     test.setIsShowFrame(0)                            # 拉流是否显示预览画面     （压力测试都应该填：0）
     test.setSendDur(0.007)                            # 设置socket 发送数据间隔

ui/CameraArea.py

@@ -8,6 +8,13 @@ class CameraArea():
     def __init__(self,frame):
         self.frame = frame
         self.mainPanel = None
+        self.devId = "010000000000"
+        self.channel = 1
+
+    def setDevId(self,data):
+        self.devId = data
+    def setChannel(self,data):
+        self.channel = data
 
     #################################################
     #       创建一个pannel
@@ -23,20 +30,47 @@ class CameraArea():
         self.mainPanel.SetSizer(boxSizer)
 
         preView = wx.Panel(topPanel)
-        preView.SetBackgroundColour(wx.GREEN)
+        boxSizer_preView = wx.BoxSizer(wx.VERTICAL)
+        preView_staticText = wx.StaticText(preView, label='预览区域（未实现）：', pos=(10, 10))
+        preView_content = wx.Panel(topPanel, style=wx.BORDER_SIMPLE)
+        boxSizer_preView.Add(preView_staticText,1,flag=wx.EXPAND | wx.ALL)
+        boxSizer_preView.Add(preView_content,11, flag=wx.EXPAND | wx.ALL)
+        preView.SetSizer(boxSizer_preView)
 
-        controlView = wx.Panel(topPanel)
-        wx.StaticText(controlView, label='本地视频：', pos=(10, 10))
-        videoPathText = wx.TextCtrl(controlView,pos=(70,5),size=wx.Size(300,-1))
-        selectPathButton = wx.Button(controlView,label="选择视频文件",pos=(375,5))
+        paramView = wx.Panel(topPanel)
+        wx.StaticText(paramView, label='本地视频：', pos=(10, 10))
+        videoPathText = wx.TextCtrl(paramView,pos=(70,5),size=wx.Size(300,-1))                                                  # 要推流的视频地址
+        selectPathButton = wx.Button(paramView,label="选择视频文件",pos=(375,5))
         self.frame.Bind(wx.EVT_BUTTON, lambda evt,textCtr=videoPathText : self.selectVideoFile(evt,textCtr), selectPathButton)
+        wx.StaticText(paramView, label='推流地址：', pos=(10, 40))
+        pushHostText = wx.TextCtrl(paramView, pos=(70, 35), size=wx.Size(150, -1), value="10.100.11.125")                       # 推流地址
+        wx.StaticText(paramView, label='推流端口：', pos=(235, 40))
+        pushPortText = wx.TextCtrl(paramView, pos=(300, 35), size=wx.Size(80, -1), value="1078")                                # 推流端口
+        wx.StaticText(paramView, label='设 备号：', pos=(10, 70))
+        pushHostText = wx.TextCtrl(paramView, pos=(70, 65), size=wx.Size(150, -1), value=self.devId)                            # 设备号
+        wx.StaticText(paramView, label='频 道号：', pos=(235, 70))
+        pushPortText = wx.TextCtrl(paramView, pos=(300, 65), size=wx.Size(80, -1), value=str(self.channel))                     # 频道号
+        wx.StaticText(paramView, label='当前状态：', pos=(10, 100))
+        pushStatusText = wx.TextCtrl(paramView, pos=(70, 95), size=wx.Size(60, -1),value="未推流",style=wx.TE_READONLY)          # 推流状态显示
+        pushStatusText.SetForegroundColour(wx.RED)
+        wx.StaticText(paramView, label='消息发送间隔（毫秒）：', pos=(10, 130))
+        msgSendDurText = wx.TextCtrl(paramView, pos=(150, 125), size=wx.Size(40, -1), value="7")                                # 消息发送间隔
+        wx.StaticText(paramView, label='播放地址：', pos=(10, 190))
+        msgSendDurText = wx.TextCtrl(paramView, pos=(70, 185), size=wx.Size(400, -1))                                           # 视频播放地址
+
+
+
+        ctrView = wx.Panel(topPanel)
+        startPushButton = wx.Button(ctrView, label="开始推流", pos=(5, 5))
+        stopPushButton = wx.Button(ctrView, label="停止推流", pos=(90, 5))
+        ctrView.SetBackgroundColour(wx.RED)
 
         boxSizer_1 = wx.BoxSizer(wx.HORIZONTAL)
         boxSizer_1.Add(preView,1,flag=wx.EXPAND | wx.ALL)
-        boxSizer_1.Add(controlView, 3, flag=wx.EXPAND | wx.ALL)
+        boxSizer_1.Add(paramView, 2, flag=wx.EXPAND | wx.ALL)
+        boxSizer_1.Add(ctrView, 1, flag=wx.EXPAND | wx.ALL)
         topPanel.SetSizer(boxSizer_1)
 
-
         return self.mainPanel
 
 

ui/MainWindow.py

@@ -25,6 +25,8 @@ class MainWindow():
     #####################################################
     def show(self):
         self.frame.Show()
+        # import wx.lib.inspection
+        # wx.lib.inspection.InspectionTool().Show()
         self.app.MainLoop()
 
     #####################################################
@@ -35,11 +37,18 @@ class MainWindow():
         boxSizer = wx.BoxSizer(wx.VERTICAL)
 
         nodeBook = wx.Notebook(mainPanel)
-        page1 = CameraArea(nodeBook).create()
+        cameraArea1 = CameraArea(nodeBook)
+        page1 = cameraArea1.create()
         nodeBook.AddPage(page1,"摄像头1")
-        page2 = CameraArea(nodeBook).create()
+
+        cameraArea2 = CameraArea(nodeBook)
+        cameraArea2.setChannel(2)
+        page2 = cameraArea2.create()
         nodeBook.AddPage(page2, "摄像头2")
-        page3 = wx.Panel(nodeBook)
+
+        cameraArea3 = CameraArea(nodeBook)
+        cameraArea3.setChannel(3)
+        page3 = cameraArea3.create()
         nodeBook.AddPage(page3, "摄像头3")
         page4 = wx.Panel(nodeBook)
         nodeBook.AddPage(page4, "转码工具")