Merge branch 'feature-1007488' into 'release'

修改一建配置ip bug

See merge request !34

NonConnectedCameraHandle.cpp

@@ -236,6 +236,7 @@ int NonConnectedCameraHandle::sdkDevLoginSyn(QString sDevId, int nDevPort,
 bool NonConnectedCameraHandle::distributionNetwork(QString &ip,QString &sSn,int hDevice ){
 bool NonConnectedCameraHandle::distributionNetwork(QString &ip,QString &sSn,int hDevice ){
     if(vides_data::pingAddress(ip)){
     if(vides_data::pingAddress(ip)){
         qInfo()<<QString("SN(%1): 当前ip已被使用%2").arg(sSn).arg(ip);
         qInfo()<<QString("SN(%1): 当前ip已被使用%2").arg(sSn).arg(ip);
+        return false;
     }
     }
     int old=hDevice;
     int old=hDevice;