Merge branch 'feature-1007488' into 'release'

修改WIFI判断02

See merge request !63

CameraHandle.cpp

@@ -1019,7 +1019,8 @@ void CameraHandle::printWifi(XSDK_HANDLE hDevice,XSDK_CFG::NetWork_Wifi &cfg){
  */
 int CameraHandle::resetGb28181(){
     NonConnectedCameraHandle *connectedCameraHandle =NonConnectedCameraHandle::getInstance();
-    int old=hDevice;
+    int old=this->hDevice;
+    qInfo()<<QString("SN(%1): resetGb28181老句柄%2").arg(sSn).arg(old);
 
     MainWindow::sp_this->setIsResetting(true);
     bool is_wifi=false;
@@ -1048,6 +1049,8 @@ int CameraHandle::resetGb28181(){
     bool result= connectedCameraHandle->changeCameraIp(device);
     int newHandle=-1;
     if(!result ){
+        qInfo()<<QString("SN(%1): WIFI修改的前的句柄%2").arg(sSn).arg(old);
+
         result=connectedCameraHandle->wifiChangeIp(reachableIp,old,sSn);
         is_wifi=true;
         if(result){

CameraHandle.h

@@ -211,8 +211,7 @@ private :
     std::atomic<uint64> faceCount;
     
     std::atomic<bool> isOperateGb28181{false};
-    
-    
+        
     uint64 face_frequency;
     
     __uint8_t algorithmPermissions;