Skip to content

M
mirrorSimulator
Commit c5d7ae00 authored by liyuanhong's avatar liyuanhong
Browse files
Options

修改了相对路劲问题

parent 7b3f823b
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 17 deletions
ui/CameraArea.py
View file @ c5d7ae00
......@@ -26,9 +26,16 @@ class CameraArea():
data = yaml.load(fi_data,Loader=yaml.FullLoader)
self.getGetPlayUrl = data["globalCon"]["getPlayUrl"]
self.videoPathText = None # 推流路劲text
self.pushHostText = None # host 文本框
self.pushPortText = None # port 文本框
self.devIdText = None # 设备Id文本框
self.channelText = None # 频道文本框
self.pushStatusText = None # 状态显示区域
self.logTextCtr = None # 日志显示区域
self.msgSendDurText = None # 发送间隔文本框
self.audioCombox = None # 音频开关按钮
self.videoPlayText = None # 获取播放地址文本框
def setDevId(self,data):
self.devId = data
......@@ -64,38 +71,36 @@ class CameraArea():
paramView = wx.Panel(topPanel)
wx.StaticText(paramView, label='本地视频：', pos=(10, 10))
fiPath = os.getcwd() + "\\flv\\aaa3.flv"
videoPathText = wx.TextCtrl(paramView, pos=(70, 5), size=wx.Size(300, -1),value=fiPath) # 要推流的视频地址
self.videoPathText = wx.TextCtrl(paramView, pos=(70, 5), size=wx.Size(300, -1),value=fiPath) # 要推流的视频地址
selectPathButton = wx.Button(paramView, label="选择视频文件", pos=(375, 5))
self.frame.Bind(wx.EVT_BUTTON, lambda evt, textCtr=videoPathText: self.selectVideoFile(evt, textCtr),
self.frame.Bind(wx.EVT_BUTTON, lambda evt, textCtr=self.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") # 推流地址
self.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") # 推流端口
self.pushPortText = wx.TextCtrl(paramView, pos=(300, 35), size=wx.Size(80, -1), value="1078") # 推流端口
wx.StaticText(paramView, label='设 备号：', pos=(10, 70))
devIdText = wx.TextCtrl(paramView, pos=(70, 65), size=wx.Size(150, -1), value=self.devId) # 设备号
self.devIdText = wx.TextCtrl(paramView, pos=(70, 65), size=wx.Size(150, -1), value=self.devId) # 设备号
wx.StaticText(paramView, label='频 道号：', pos=(235, 70))
channelText = wx.TextCtrl(paramView, pos=(300, 65), size=wx.Size(80, -1), value=str(self.channel)) # 频道号
self.channelText = wx.TextCtrl(paramView, pos=(300, 65), size=wx.Size(80, -1), value=str(self.channel)) # 频道号
wx.StaticText(paramView, label='当前状态：', pos=(10, 100))
self.pushStatusText = wx.TextCtrl(paramView, pos=(70, 95), size=wx.Size(80, -1), value="未连网",
style=wx.TE_READONLY) # 推流状态显示
self.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") # 消息发送间隔
self.msgSendDurText = wx.TextCtrl(paramView, pos=(150, 125), size=wx.Size(40, -1), value="7") # 消息发送间隔
wx.StaticText(paramView, label='音频：', pos=(200, 130))
self.audioCombox = wx.ComboBox(paramView, pos=(240,125), choices=['开', '关'],value="开",size=wx.Size(50,-1))
wx.StaticText(paramView, label='播放地址：', pos=(10, 190))
videoPlayText = wx.TextCtrl(paramView, pos=(70, 185), size=wx.Size(350, -1)) # 视频播放地址
getPlayUrlButton = wx.Button(paramView, label="获取播放地址", pos=(425, 185))
self.frame.Bind(wx.EVT_BUTTON, lambda evt, textCtr=videoPlayText: self.getPlayUrl(evt, textCtr),
getPlayUrlButton)
self.videoPlayText = wx.TextCtrl(paramView, pos=(70, 185), size=wx.Size(350, -1)) # 视频播放地址
self.getPlayUrlButton = wx.Button(paramView, label="获取播放地址", pos=(425, 185))
self.frame.Bind(wx.EVT_BUTTON, lambda evt, textCtr=self.videoPlayText: self.getPlayUrl(evt, textCtr),
self.getPlayUrlButton)
ctrView = wx.Panel(topPanel, style=wx.BORDER_SIMPLE)
connectButton = wx.Button(ctrView, label="1、连网", pos=(5, 5))
self.frame.Bind(wx.EVT_BUTTON, lambda evt, host=pushHostText.GetValue(),port=pushPortText.GetValue() \
,devId=devIdText.GetValue(),channel=channelText.GetValue(),sendDur=msgSendDurText.GetValue() \
,isSendAudio=1,flvPath=videoPathText.GetValue(): self.connect(evt, host,port,devId,channel,sendDur,isSendAudio,flvPath),
self.frame.Bind(wx.EVT_BUTTON, lambda evt: self.connect(evt),
connectButton)
startPushButton = wx.Button(ctrView, label="2、开始推流", pos=(120, 5))
self.frame.Bind(wx.EVT_BUTTON, lambda evt: self.startPush(evt),
......@@ -198,18 +203,25 @@ class CameraArea():
####################################################
# 连网
####################################################
def connect(self,evt,host,port,devId,channel,sendDur,isSendAudio,flvPath):
def connect(self,evt):
sys.stdout = self.logTextCtr
sys.stderr = self.logTextCtr
isSendAudio = self.getAudioStatus()
if self.pushObj == None:
threadObj = threading.Thread(target=self.doConnect,args=(host,port,devId,channel,sendDur,isSendAudio,flvPath,))
threadObj = threading.Thread(target=self.doConnect,args=())
threadObj.start()
else:
timeCur = self.getCurTime()
self.logTextCtr.WriteText(timeCur + "已连网！\n")
def doConnect(self,host,port,devId,channel,sendDur,isSendAudio,flvPath):
def doConnect(self):
host = self.pushHostText.GetValue()
port = self.pushPortText.GetValue()
devId = self.devIdText.GetValue()
channel = self.channelText.GetValue()
sendDur = self.msgSendDurText.GetValue()
isSendAudio = self.getAudioStatus()
flvPath = self.videoPathText.GetValue()
sys.stdout = self.logTextCtr
sys.stderr = self.logTextCtr
obj = StreamH264Flv()
......
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