Merge branch 'feature-1007488' into 'release'

修改WIFI判断01

See merge request !62

CameraHandle.cpp

@@ -1076,6 +1076,7 @@ int CameraHandle::resetGb28181(){
     if(old_ip.length()>0){
     if(old_ip.length()>0){
         if(is_wifi){
         if(is_wifi){
             result=connectedCameraHandle->wifiChangeIp(old_ip,newHandle,sSn);
             result=connectedCameraHandle->wifiChangeIp(old_ip,newHandle,sSn);
+            QThread::sleep(1);
             int sdk_handle=this->sdkDevLoginSyn(old_ip,loginParam->nDevPort,loginParam->sUserName,loginParam->sPassword,3000);
             int sdk_handle=this->sdkDevLoginSyn(old_ip,loginParam->nDevPort,loginParam->sUserName,loginParam->sPassword,3000);
             if(sdk_handle<0){
             if(sdk_handle<0){
                 qInfo()<<QString("SN(%1): WIFI新句柄生成失败").arg(sSn);
                 qInfo()<<QString("SN(%1): WIFI新句柄生成失败").arg(sSn);