Merge branch 'feature-1007488' into 'release'

新增WIFI配置返回状态

See merge request !57

CameraHandle.cpp

@@ -1129,12 +1129,11 @@ bool CameraHandle::sdkWifi(QString &pwd,QString &ssid){
     char szOutBuffer[512] = { 0 };
     char szOutBuffer[512] = { 0 };
     int nLen = sizeof(szOutBuffer);
     int nLen = sizeof(szOutBuffer);
     int res =XSDK_DevSetSysConfigSyn(hDevice, JK_NetWork_Wifi, wipCfg, strlen(wipCfg), szOutBuffer, &nLen, 3000, EXCMD_CONFIG_SET);
     int res =XSDK_DevSetSysConfigSyn(hDevice, JK_NetWork_Wifi, wipCfg, strlen(wipCfg), szOutBuffer, &nLen, 3000, EXCMD_CONFIG_SET);
+    qInfo()<<QString("SN(%1): 修改WIFI结果:%2").arg(sSn).arg(res);
     if(res<0){
     if(res<0){
         qInfo()<<QString("SN(%1): 修改wifi失败:%2").arg(sSn).arg(res);
         qInfo()<<QString("SN(%1): 修改wifi失败:%2").arg(sSn).arg(res);
         return false;
         return false;
     }
     }
-
-    deviceReboot();
     return true;
     return true;
 }
 }