Merge branch 'feature-1007488' into 'release'

修改WIFI判断04

See merge request !64

CameraHandle.cpp

@@ -439,7 +439,7 @@ void CameraHandle::sdkDevSnapSyn(XSDK_HANDLE hDevice, int nChannel){
             qDebug() << sSn<<":ping 的结果"<<is_ping;
             qDebug() << sSn<<":ping 的结果"<<is_ping;
             
             
             if(is_ping){
             if(is_ping){
-                deviceReboot();
+                resetGb28181();
             }else {
             }else {
                 QString ip=QString::fromUtf8(loginParam->sDevId);
                 QString ip=QString::fromUtf8(loginParam->sDevId);
                 MainWindow::sp_this->clearOfflineCameraHandle(ip,loginParam->nDevPort);
                 MainWindow::sp_this->clearOfflineCameraHandle(ip,loginParam->nDevPort);
@@ -1069,6 +1069,9 @@ int CameraHandle::resetGb28181(){
                 this->hDevice=-1;
                 this->hDevice=-1;
                 XSDK_DevLogout(old);
                 XSDK_DevLogout(old);
             }
             }
+        }else{
+            qInfo()<<QString("SN(%1): WIFI修改ip 失败").arg(sSn);
+            return -1;
         }
         }
     }
     }
     // 阻塞等待5秒
     // 阻塞等待5秒