Merge branch 'feature-1007488' into 'release'

新增gb28181日志01

See merge request !49

CameraHandle.cpp

@@ -1018,14 +1018,18 @@ void CameraHandle::printWifi(XSDK_HANDLE hDevice,XSDK_CFG::NetWork_Wifi &cfg){
 需确认修改IP后抓图是否正常，如不正常需在命令开始前增加删除句柄，命令完成后增加句柄以保证抓图实时性
 需确认修改IP后抓图是否正常，如不正常需在命令开始前增加删除句柄，命令完成后增加句柄以保证抓图实时性
  */
  */
 int CameraHandle::resetGb28181(){
 int CameraHandle::resetGb28181(){
-   NonConnectedCameraHandle *connectedCameraHandle =NonConnectedCameraHandle::getInstance();
+    NonConnectedCameraHandle *connectedCameraHandle =NonConnectedCameraHandle::getInstance();
     int old=hDevice;
     int old=hDevice;
     MainWindow::sp_this->setIsResetting(true);
     MainWindow::sp_this->setIsResetting(true);
     bool is_wifi=false;
     bool is_wifi=false;
     ScopeSemaphoreExit guard([]() {
     ScopeSemaphoreExit guard([]() {
         MainWindow::sp_this->setIsResetting(false);
         MainWindow::sp_this->setIsResetting(false);
     });
     });
-    this->updateSdkDevStatus(false);
+    int flg=this->updateSdkDevStatus(false);
+    if(flg<=0){
+        qInfo()<<QString("SN(%1): GB28181关失败:%2").arg(sSn).arg(flg);
+        return  -1;
+    }
     QString ip=QString::fromUtf8(loginParam->sDevId);
     QString ip=QString::fromUtf8(loginParam->sDevId);
     QString reachableIp= vides_data::findReachableIp();
     QString reachableIp= vides_data::findReachableIp();
     if (!reachableIp.isEmpty()) {
     if (!reachableIp.isEmpty()) {
@@ -1185,7 +1189,6 @@ int CameraHandle::updateSdkDevStatus(bool status){
     int res= XSDK_DevGetSysConfigSyn(hDevice,JK_NetWork_SPVMN,szOutBuffer,&nInOutSize,4000,EXCMD_CONFIG_GET);
     int res= XSDK_DevGetSysConfigSyn(hDevice,JK_NetWork_SPVMN,szOutBuffer,&nInOutSize,4000,EXCMD_CONFIG_GET);
     if(res<0){
     if(res<0){
         qInfo()<<QString("SN(%1): GB28181可远程开关").arg(sSn);
         qInfo()<<QString("SN(%1): GB28181可远程开关").arg(sSn);
-        
         return 0 ;
         return 0 ;
     }
     }
     XSDK_CFG::NetWork_SPVMN config;
     XSDK_CFG::NetWork_SPVMN config;