Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gamera_videos_no_ui
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liusq
gamera_videos_no_ui
Commits
66647a37
Commit
66647a37
authored
Oct 16, 2024
by
郭峰
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-1007494' into 'release'
修改抓图失败ping结果 See merge request
!76
parents
b1eac755
dafbf01d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
CameraHandle.cpp
+2
-1
No files found.
CameraHandle.cpp
View file @
66647a37
...
@@ -436,7 +436,7 @@ void CameraHandle::sdkDevSnapSyn(XSDK_HANDLE hDevice, int nChannel){
...
@@ -436,7 +436,7 @@ void CameraHandle::sdkDevSnapSyn(XSDK_HANDLE hDevice, int nChannel){
qInfo
()
<<
QString
(
"SN(%1): 设备离线"
).
arg
(
sSn
);
qInfo
()
<<
QString
(
"SN(%1): 设备离线"
).
arg
(
sSn
);
QString
ip
=
QString
::
fromUtf8
(
loginParam
->
sDevId
);
QString
ip
=
QString
::
fromUtf8
(
loginParam
->
sDevId
);
bool
is_ping
=
instace
.
pingAddress
(
ip
);
bool
is_ping
=
instace
.
pingAddress
(
ip
);
q
Debug
()
<<
sSn
<<
":ping 的结果"
<<
is_ping
;
q
Info
()
<<
sSn
<<
":ping 的结果"
<<
is_ping
;
if
(
is_ping
){
if
(
is_ping
){
deviceReboot
();
deviceReboot
();
...
@@ -1395,6 +1395,7 @@ int CameraHandle::deviceReboot(){
...
@@ -1395,6 +1395,7 @@ int CameraHandle::deviceReboot(){
qInfo
()
<<
sSn
<<
":重启相机失败"
<<
nRet
;
qInfo
()
<<
sSn
<<
":重启相机失败"
<<
nRet
;
return
0
;
return
0
;
}
}
qInfo
()
<<
QString
(
"SN(%1): 重启相机成功"
).
arg
(
sSn
);
QString
ip
=
QString
::
fromUtf8
(
loginParam
->
sDevId
);
QString
ip
=
QString
::
fromUtf8
(
loginParam
->
sDevId
);
MainWindow
::
sp_this
->
clearOfflineCameraHandle
(
ip
,
loginParam
->
nDevPort
);
MainWindow
::
sp_this
->
clearOfflineCameraHandle
(
ip
,
loginParam
->
nDevPort
);
return
nRet
;
return
nRet
;
...
...
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