Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mirrorSimulator
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李远洪
mirrorSimulator
Commits
3c893d79
Commit
3c893d79
authored
Jan 14, 2021
by
liyuanhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化了日志输出
parent
41e4b06a
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
234 additions
and
54 deletions
+234
-54
lib/service/StreamH264Flv.py
lib/service/StreamH264Flv.py
+16
-6
lib/socket/ClientWebSocket.py
lib/socket/ClientWebSocket.py
+17
-3
ui/CameraArea.py
ui/CameraArea.py
+44
-32
ui/HomeArea.py
ui/HomeArea.py
+146
-13
ui/MainWindow.py
ui/MainWindow.py
+4
-0
ui/globalParams.py
ui/globalParams.py
+7
-0
No files found.
lib/service/StreamH264Flv.py
View file @
3c893d79
...
@@ -44,6 +44,7 @@ class StreamH264Flv():
...
@@ -44,6 +44,7 @@ class StreamH264Flv():
self
.
isOpenVideoLog
=
0
# 是否开启视频日志 0:不开启 1:开启
self
.
isOpenVideoLog
=
0
# 是否开启视频日志 0:不开启 1:开启
self
.
isOpenAudioLog
=
0
# 是否开启音频日志 0:不开启 1:开启
self
.
isOpenAudioLog
=
0
# 是否开启音频日志 0:不开启 1:开启
self
.
protocal_1078
=
Protocal_1078
()
self
.
protocal_1078
=
Protocal_1078
()
self
.
autoClose
=
0
# 视频推流完是否自动关闭连接 0:否 1:是
def
setMobile
(
self
,
data
):
def
setMobile
(
self
,
data
):
...
@@ -76,6 +77,9 @@ class StreamH264Flv():
...
@@ -76,6 +77,9 @@ class StreamH264Flv():
self
.
isOpenVideoLog
=
data
self
.
isOpenVideoLog
=
data
def
setIsOpenAudioLog
(
self
,
data
):
def
setIsOpenAudioLog
(
self
,
data
):
self
.
isOpenAudioLog
=
data
self
.
isOpenAudioLog
=
data
def
setAutoClose
(
self
,
data
):
self
.
autoClose
=
data
####################################################
####################################################
...
@@ -95,6 +99,7 @@ class StreamH264Flv():
...
@@ -95,6 +99,7 @@ class StreamH264Flv():
####################################################
####################################################
def
disConnectServer
(
self
):
def
disConnectServer
(
self
):
self
.
client
.
close
()
self
.
client
.
close
()
self
.
client
=
None
####################################################
####################################################
# 读取flv文件,并发送 (h264编码,并且音频为aac编码格式)
# 读取flv文件,并发送 (h264编码,并且音频为aac编码格式)
...
@@ -161,8 +166,13 @@ class StreamH264Flv():
...
@@ -161,8 +166,13 @@ class StreamH264Flv():
timeCur
=
self
.
getCurTime
()
timeCur
=
self
.
getCurTime
()
self
.
multiPushStatus
=
self
.
multiPushStatus
+
1
self
.
multiPushStatus
=
self
.
multiPushStatus
+
1
self
.
timeStampSeek
=
timeStamp
+
1000
self
.
timeStampSeek
=
timeStamp
+
1000
self
.
logTextCtr
.
WriteText
(
timeCur
+
"视频推流完,自动结束推流!
\n
"
)
self
.
logTextCtr
.
WriteText
(
timeCur
+
"视频推流结束,自动结束推流!
\n
"
)
# self.client.close()
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():
...
@@ -178,7 +188,8 @@ class StreamH264Flv():
res
=
json
.
loads
(
res
)
res
=
json
.
loads
(
res
)
url
=
res
[
"data"
][
"url"
]
url
=
res
[
"data"
][
"url"
]
# url = self.replaceHost(res["data"]["url"],"video-test.vandyo.com:")
# 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
# 替换url的host
...
@@ -217,7 +228,7 @@ class StreamH264Flv():
...
@@ -217,7 +228,7 @@ class StreamH264Flv():
if
self
.
isOpenVideoLog
!=
0
:
if
self
.
isOpenVideoLog
!=
0
:
# print("发送视频消息:" + msg)
# print("发送视频消息:" + msg)
msgTxt
=
"发送视频消息:"
+
msg
msgTxt
=
"发送视频消息:"
+
msg
wx
.
CallAfter
(
pub
.
sendMessage
,
"showLog"
,
msg
=
msgTxt
)
wx
.
CallAfter
(
pub
.
sendMessage
,
"showLog"
+
str
(
self
.
channel
)
,
msg
=
msgTxt
)
try
:
try
:
self
.
client
.
send
(
binascii
.
a2b_hex
(
msg
))
self
.
client
.
send
(
binascii
.
a2b_hex
(
msg
))
except
:
except
:
...
@@ -241,7 +252,7 @@ class StreamH264Flv():
...
@@ -241,7 +252,7 @@ class StreamH264Flv():
if
self
.
isOpenAudioLog
!=
0
:
if
self
.
isOpenAudioLog
!=
0
:
# print("发送音频消息:" + msg)
# print("发送音频消息:" + msg)
msgTxt
=
"发送音频消息:"
+
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
))
self
.
client
.
send
(
binascii
.
a2b_hex
(
msg
))
time
.
sleep
(
self
.
sendDur
)
time
.
sleep
(
self
.
sendDur
)
...
@@ -311,7 +322,6 @@ class StreamH264Flv():
...
@@ -311,7 +322,6 @@ class StreamH264Flv():
frameData
[
"frames"
]
=
frames
frameData
[
"frames"
]
=
frames
elif
frameData
[
"AVCPkgType"
]
==
2
:
elif
frameData
[
"AVCPkgType"
]
==
2
:
frameData
[
"frames"
]
=
[]
frameData
[
"frames"
]
=
[]
# print("2222222----------" + AVTag)
else
:
else
:
frameData
[
"frames"
]
=
[]
frameData
[
"frames"
]
=
[]
return
frameData
return
frameData
...
...
lib/socket/ClientWebSocket.py
View file @
3c893d79
...
@@ -2,7 +2,8 @@
...
@@ -2,7 +2,8 @@
import
ssl
import
ssl
import
time
import
time
from
gevent
import
thread
import
wx
from
pubsub
import
pub
import
websocket
import
websocket
...
@@ -33,15 +34,18 @@ class ClientWebSocket():
...
@@ -33,15 +34,18 @@ class ClientWebSocket():
def
on_message
(
self
,
message
):
def
on_message
(
self
,
message
):
print
(
"收到消息:"
+
message
)
print
(
"收到消息:"
+
message
)
wx
.
CallAfter
(
pub
.
sendMessage
,
"msgRev"
,
msg
=
message
)
def
on_error
(
self
,
error
):
def
on_error
(
self
,
error
):
print
(
error
)
print
(
error
)
def
on_close
(
self
):
def
on_close
(
self
):
print
(
"websocket 已经断开!!!"
)
curTime
=
self
.
getCurTime
()
print
(
curTime
+
"websocket 已经断开!!!"
)
def
on_open
(
self
):
def
on_open
(
self
):
print
(
"websocket 已连接......"
)
curTime
=
self
.
getCurTime
()
print
(
curTime
+
"websocket 已连接......"
)
print
(
self
.
wsUrl
+
self
.
wsCode
)
print
(
self
.
wsUrl
+
self
.
wsCode
)
##################################################
##################################################
...
@@ -56,6 +60,16 @@ class ClientWebSocket():
...
@@ -56,6 +60,16 @@ class ClientWebSocket():
def
close
(
self
):
def
close
(
self
):
self
.
ws
.
close
()
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__"
:
if
__name__
==
"__main__"
:
ClientWebSocket
()
.
connect
()
ClientWebSocket
()
.
connect
()
ui/CameraArea.py
View file @
3c893d79
This diff is collapsed.
Click to expand it.
ui/HomeArea.py
View file @
3c893d79
This diff is collapsed.
Click to expand it.
ui/MainWindow.py
View file @
3c893d79
...
@@ -6,6 +6,7 @@ from ui.CameraArea import CameraArea
...
@@ -6,6 +6,7 @@ from ui.CameraArea import CameraArea
from
ui.CodecArea
import
CodecArea
from
ui.CodecArea
import
CodecArea
from
ui.EventAndOtherArea
import
EventAndOtherArea
from
ui.EventAndOtherArea
import
EventAndOtherArea
from
ui.HomeArea
import
HomeArea
from
ui.HomeArea
import
HomeArea
from
ui
import
globalParams
'''
'''
定义主窗体
定义主窗体
...
@@ -45,15 +46,18 @@ class MainWindow():
...
@@ -45,15 +46,18 @@ class MainWindow():
nodeBook
.
AddPage
(
page0
,
"云镜首页"
)
nodeBook
.
AddPage
(
page0
,
"云镜首页"
)
cameraArea1
=
CameraArea
(
nodeBook
)
cameraArea1
=
CameraArea
(
nodeBook
)
globalParams
.
camera_1
=
cameraArea1
page1
=
cameraArea1
.
create
()
page1
=
cameraArea1
.
create
()
nodeBook
.
AddPage
(
page1
,
"摄像头1"
)
nodeBook
.
AddPage
(
page1
,
"摄像头1"
)
cameraArea2
=
CameraArea
(
nodeBook
)
cameraArea2
=
CameraArea
(
nodeBook
)
globalParams
.
camera_2
=
cameraArea2
cameraArea2
.
setChannel
(
2
)
cameraArea2
.
setChannel
(
2
)
page2
=
cameraArea2
.
create
()
page2
=
cameraArea2
.
create
()
nodeBook
.
AddPage
(
page2
,
"摄像头2"
)
nodeBook
.
AddPage
(
page2
,
"摄像头2"
)
cameraArea3
=
CameraArea
(
nodeBook
)
cameraArea3
=
CameraArea
(
nodeBook
)
globalParams
.
camera_3
=
cameraArea3
cameraArea3
.
setChannel
(
3
)
cameraArea3
.
setChannel
(
3
)
page3
=
cameraArea3
.
create
()
page3
=
cameraArea3
.
create
()
nodeBook
.
AddPage
(
page3
,
"摄像头3"
)
nodeBook
.
AddPage
(
page3
,
"摄像头3"
)
...
...
ui/globalParams.py
0 → 100644
View file @
3c893d79
# coding:utf-8
camera_1
=
None
# 相机1
camera_2
=
None
# 相机2
camera_3
=
None
# 相机3
isLogRedirect
=
0
# 日志是否重定向到日志文本框 0: 不重定向 (用于调试) 1:重定向 (用于给别人用)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment