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
ff4bbac1
Commit
ff4bbac1
authored
Feb 20, 2025
by
guof
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-1007583' into 'release'
修改实时更新远程配置新增日志 See merge request
!97
parents
c5b71a6e
2bcbe1f9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
mainwindow.cpp
+6
-5
No files found.
mainwindow.cpp
View file @
ff4bbac1
...
...
@@ -6,9 +6,7 @@ MainWindow* MainWindow::sp_this=nullptr;
MainWindow
::
MainWindow
()
:
isResetting
(
false
)
{
sp_this
=
this
;
LogHandler
::
Get
().
installMessageHandler
();
QString
inifile
=
QCoreApplication
::
applicationDirPath
()
+
"/gameras.ini"
;
...
...
@@ -613,8 +611,11 @@ void MainWindow::startCamera(const QString &httpurl){
instace
.
deleteObj
(
res_config
);
return
;
}
config
.
nvrConfig
=
cloudConfig
.
nvrConfig
;
qInfo
()
<<
"云端的nvr配置 isOn"
<<
cloudConfig
.
nvrConfig
.
isOn
<<
"ip"
<<
cloudConfig
.
nvrConfig
.
ip
<<
"username"
<<
cloudConfig
.
nvrConfig
.
username
<<
"pwd"
<<
cloudConfig
.
nvrConfig
.
password
;
config
.
nvrConfig
=
cloudConfig
.
nvrConfig
;
qInfo
()
<<
"修改过后nvr配置 isOn"
<<
config
.
nvrConfig
.
isOn
<<
"ip"
<<
config
.
nvrConfig
.
ip
<<
"username"
<<
config
.
nvrConfig
.
username
<<
"pwd"
<<
config
.
nvrConfig
.
password
;
if
(
config
.
nvrConfig
.
isOn
&&
!
getDeviceStatus
(
hk_Device
)
){
int
res
=
loginNetDvr
(
config
.
nvrConfig
.
ip
,
config
.
nvrConfig
.
username
,
config
.
nvrConfig
.
password
,
config
.
nvrConfig
.
port
);
if
(
res
<
0
){
...
...
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