Merge branch 'feature-1007583' into 'release'

Feature 1007583

See merge request !96

mainwindow.cpp

@@ -30,23 +30,9 @@ MainWindow::MainWindow():isResetting(false)
     }else{
     }else{
         httpurl=qSetting->value("cloudservice/pro_http").toString();
         httpurl=qSetting->value("cloudservice/pro_http").toString();
     }
     }
-    Common & instace= Common::getInstance();
 
 
     QString serialNumber;
     QString serialNumber;
-    findLocalSerialNumber(serialNumber);
-    bool configFetched = false;
-    while (!configFetched) {
-        HttpService httpService(httpurl);
-        vides_data::response *res = httpService.httpDeviceConfig(serialNumber, config);
-        if (res->code != 0) {
-            qInfo() << "请求远程商户配置失败，重试中...";
-            instace.deleteObj(res);
-            QThread::sleep(5); // 等待5秒后重试
-        } else {
-            instace.deleteObj(res);
-            configFetched = true;
-        }
-    }
+    realTimeUpdateDivConfig(httpurl,serialNumber);
     
     
     initCommon();
     initCommon();
     
     
@@ -143,6 +129,26 @@ MainWindow::MainWindow():isResetting(false)
     this->mqttConfig= config.mqttConfig;
     this->mqttConfig= config.mqttConfig;
     runOrRebootMqtt(mqttConfig,httpurl,serialNumber);
     runOrRebootMqtt(mqttConfig,httpurl,serialNumber);
 }
 }
+
+void MainWindow::realTimeUpdateDivConfig(QString &httpurl,QString &serialNumber){
+    Common & instace= Common::getInstance();
+    findLocalSerialNumber(serialNumber);
+    bool configFetched = false;
+    while (!configFetched) {
+        HttpService httpService(httpurl);
+        vides_data::response *res = httpService.httpDeviceConfig(serialNumber, config);
+        if (res->code != 0) {
+            qInfo() << "请求远程商户配置失败，重试中...";
+            instace.deleteObj(res);
+            QThread::sleep(5); // 等待5秒后重试
+        } else {
+            instace.deleteObj(res);
+            configFetched = true;
+        }
+    }
+
+}
+
 void MainWindow::runOrRebootMqtt(vides_data::MqttConfig &mqtt_config,QString &httpUrl,QString &serialNumber){
 void MainWindow::runOrRebootMqtt(vides_data::MqttConfig &mqtt_config,QString &httpUrl,QString &serialNumber){
     MqttSubscriber* subscriber = MqttSubscriber::getInstance(this);
     MqttSubscriber* subscriber = MqttSubscriber::getInstance(this);
     subscriber->init(mqtt_config,httpUrl,serialNumber);
     subscriber->init(mqtt_config,httpUrl,serialNumber);
@@ -189,6 +195,7 @@ bool MainWindow::getDeviceStatus(int UserId) {
     }
     }
     return devStatus;
     return devStatus;
 }
 }
+
 void MainWindow::divParameterUpdate(vides_data::responseConfig &cloudConfig,QString &httpUrl,QString &serialNumber ){
 void MainWindow::divParameterUpdate(vides_data::responseConfig &cloudConfig,QString &httpUrl,QString &serialNumber ){
     bool faceAlgorithm = false, licensePlateAlgorithm = false, uniformAlgorithm = false, timeChange = false;
     bool faceAlgorithm = false, licensePlateAlgorithm = false, uniformAlgorithm = false, timeChange = false;
     AlgorithmTaskManage &algorithmTaskManage= AlgorithmTaskManage::getInstance();
     AlgorithmTaskManage &algorithmTaskManage= AlgorithmTaskManage::getInstance();
@@ -582,16 +589,6 @@ void MainWindow::startCamera(const QString &httpurl){
     HttpService httpService(httpurl);
     HttpService httpService(httpurl);
     vides_data::response *re= httpService.httpFindCameras(serialNumber,devices);
     vides_data::response *re= httpService.httpFindCameras(serialNumber,devices);
 
 
-    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 ){
-             nvr_status =false;
-        }else{
-            nvr_status =true;
-        }
-    }else if(!config.nvrConfig.isOn){
-        nvr_status = false;
-    }
 
 
     if(re->code==0 || re->code==20004){
     if(re->code==0 || re->code==20004){
         //本次搜索到设备列表
         //本次搜索到设备列表
@@ -616,6 +613,20 @@ void MainWindow::startCamera(const QString &httpurl){
             instace.deleteObj(res_config);
             instace.deleteObj(res_config);
             return ;
             return ;
         }
         }
+
+        config.nvrConfig=cloudConfig.nvrConfig;
+        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 ){
+                 nvr_status =false;
+            }else{
+                nvr_status =true;
+            }
+        }else if(!config.nvrConfig.isOn){
+            nvr_status = false;
+        }
+
+
         instace.deleteObj(res_config);
         instace.deleteObj(res_config);
         divParameterUpdate(cloudConfig,nonConstHttpUrl,serialNumber);
         divParameterUpdate(cloudConfig,nonConstHttpUrl,serialNumber);
         
         

mainwindow.h

@@ -53,6 +53,8 @@ public:
     
     
     CameraHandle* findHandle(QString sn);
     CameraHandle* findHandle(QString sn);
 
 
+    void realTimeUpdateDivConfig(QString &httpurl,QString &serialNumber);
+
     bool getDeviceStatus(int UserId);
     bool getDeviceStatus(int UserId);
 
 
     void modifySnMapIp(QString &sn,QString &ip);
     void modifySnMapIp(QString &sn,QString &ip);