Commit ff4bbac1 by guof

Merge branch 'feature-1007583' into 'release'

修改实时更新远程配置新增日志

See merge request !97
parents c5b71a6e 2bcbe1f9
......@@ -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 ){
......
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