ilabs-flir 2.3.11 → 2.3.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -202,8 +202,8 @@ public class FlirSdkManager {
|
|
|
202
202
|
// camera's WiFi Access Point before calling camera.connect().
|
|
203
203
|
if (identity.communicationInterface == CommunicationInterface.FLIR_ONE_WIRELESS) {
|
|
204
204
|
DiscoveredCamera dc = getDiscoveredCamera(identity.deviceId);
|
|
205
|
-
if (dc != null && dc.
|
|
206
|
-
String ssid = dc.
|
|
205
|
+
if (dc != null && dc.getCameraDetails() != null) {
|
|
206
|
+
String ssid = dc.getCameraDetails().ssid;
|
|
207
207
|
Log.d(TAG, "Establishing WiFi connection to: " + ssid);
|
|
208
208
|
|
|
209
209
|
if (!SdkWifiConnectionHelper.isConnectedToNetwork(context, ssid)) {
|
|
@@ -211,7 +211,7 @@ public class FlirSdkManager {
|
|
|
211
211
|
final AtomicBoolean wifiDone = new AtomicBoolean(false);
|
|
212
212
|
final AtomicBoolean wifiSuccess = new AtomicBoolean(false);
|
|
213
213
|
|
|
214
|
-
SdkWifiConnectionHelper.connectToWifiWithoutCode(context, dc.
|
|
214
|
+
SdkWifiConnectionHelper.connectToWifiWithoutCode(context, dc.getCameraDetails(), status -> {
|
|
215
215
|
if (status.status == SdkWifiConnectionHelper.ConInfo.CONNECTED) {
|
|
216
216
|
wifiSuccess.set(true);
|
|
217
217
|
wifiDone.set(true);
|
|
@@ -257,9 +257,6 @@ public class FlirSdkManager {
|
|
|
257
257
|
response = camera.authenticate(identity, authName, 41 * 1000);
|
|
258
258
|
if (response.authenticationStatus == AuthenticationResponse.AuthenticationStatus.APPROVED) {
|
|
259
259
|
break;
|
|
260
|
-
} else if (response.authenticationStatus == AuthenticationResponse.AuthenticationStatus.REJECTED) {
|
|
261
|
-
notifyError("Authentication rejected by camera");
|
|
262
|
-
return;
|
|
263
260
|
}
|
|
264
261
|
} while (response.authenticationStatus == AuthenticationResponse.AuthenticationStatus.PENDING && attempts < MAX_AUTH_ATTEMPTS);
|
|
265
262
|
|
|
@@ -274,10 +271,7 @@ public class FlirSdkManager {
|
|
|
274
271
|
stopScanInternal();
|
|
275
272
|
try { Thread.sleep(300); } catch (Exception ignored) {}
|
|
276
273
|
}
|
|
277
|
-
camera =
|
|
278
|
-
if (camera == null) {
|
|
279
|
-
camera = new Camera();
|
|
280
|
-
}
|
|
274
|
+
camera = new Camera();
|
|
281
275
|
}
|
|
282
276
|
|
|
283
277
|
Log.d(TAG, "Calling camera.connect() for " + identity.deviceId);
|