Merge branch 'feature-1007494' into 'release'

最后一步改为强制写入gb28181

See merge request !77

CameraHandle.cpp

@@ -1109,7 +1109,7 @@ int CameraHandle::resetGb28181(){
             }
             }
         }
         }
     }
     }
-
+    forceWriteGb28181();
     //this->updateSdkDevStatus(true);
     //this->updateSdkDevStatus(true);
     return 1;
     return 1;
 }
 }
@@ -1188,7 +1188,8 @@ int CameraHandle::forceWriteGb28181(){
     }
     }
     QString stGb281;
     QString stGb281;
     vides_data::responseGb28181 *gb28181 = reinterpret_cast<vides_data::responseGb28181*>(res->data);
     vides_data::responseGb28181 *gb28181 = reinterpret_cast<vides_data::responseGb28181*>(res->data);
-    initWorkSpVMn(gb28181,stGb281);  QByteArray bGb =stGb281.toUtf8();
+    initWorkSpVMn(gb28181,stGb281);
+    QByteArray bGb =stGb281.toUtf8();
     const char* pCfg=bGb.data();
     const char* pCfg=bGb.data();
     qInfo()<<"forceWriteGb28181"<<pCfg;
     qInfo()<<"forceWriteGb28181"<<pCfg;