From 603cb36a5123e46656b06a5deb8d7ac7ff81307f Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 25 十二月 2019 08:48:51 +0800
Subject: [PATCH] a
---
app/src/main/java/com/basic/security/utils/socket/indoor/IndoorGuestSocketClient.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/basic/security/utils/socket/indoor/IndoorGuestSocketClient.java b/app/src/main/java/com/basic/security/utils/socket/indoor/IndoorGuestSocketClient.java
index 27d19d1..c37a9c6 100644
--- a/app/src/main/java/com/basic/security/utils/socket/indoor/IndoorGuestSocketClient.java
+++ b/app/src/main/java/com/basic/security/utils/socket/indoor/IndoorGuestSocketClient.java
@@ -44,13 +44,14 @@
boolean reConnectSocket;
SocketUtil socketUtil = new SocketUtil();
while (true) {
-// System.out.println("GuestSocketClient.run 1");
+// System1.out.println("GuestSocketClient.run 1");
try {
lastUpdateTime = System.currentTimeMillis();
reConnectSocket = false;
try {
String outdoorServerIp = "";
List<String> outdoorDeviceIpList = RemoteOutdoorManager.getOutdoorDeviceIp();
+// System1.out.println("IndoorGuestSocketClient.run outdoorDeviceIpList="+outdoorDeviceIpList);
if (outdoorDeviceIpList.size() > 0) {
outdoorServerIp = outdoorDeviceIpList.get(0);
}
@@ -59,8 +60,9 @@
continue;
}
serverIp = outdoorServerIp;
+// System1.out.println("IndoorGuestSocketClient.run serverIp="+serverIp);
} catch (Exception e) {
- System.out.println("GuestSocketClient.run 1 " + e.getMessage());
+ System1.out.println("GuestSocketClient.run 1 " + e.getMessage());
SystemClock.sleep(1000);
continue;
}
@@ -74,7 +76,9 @@
MainActivity activity = BaseApplication.getApplication().activity;
activity.runOnUiThread(() -> {
try {
- FragmentUtil.guestModeFragment().camera1.setImageBitmap(image);
+// System1.out.println("IndoorGuestSocketClient.onBitmap ");
+ activity.fragment_camera.camera2.setImageBitmap(image);
+// FragmentUtil.guestModeFragment().camera1.setImageBitmap(image);
} catch (Exception e) {
e.printStackTrace();
}
@@ -92,6 +96,7 @@
Type listType = new TypeToken<List<Map<String, String>>>() {
}.getType();
List<Map<String, String>> faces = new Gson().fromJson(facePositionsJson, listType);
+// System1.out.println("IndoorGuestSocketClient.detectFace " + faces + " " + guestListCameraType + " facePositionsJson="+facePositionsJson);
FragmentUtil.guestModeFragment().addGuestList(faces, guestListCameraType, image, featureArray);
}
} catch (Exception e) {
@@ -100,7 +105,7 @@
}
});
while (!Thread.currentThread().isInterrupted() && !reConnectSocket) {
-// System.out.println("GuestSocketClient.run 6");
+// System1.out.println("GuestSocketClient.run 6");
lastUpdateTime = System.currentTimeMillis();
Map<String, String> requestMap = new HashMap<>();
requestMap.put(RemoteCameraMessage.requestFrame, BaseApplication.getApplication().activity.requestFrame());
@@ -150,9 +155,9 @@
} catch (Exception e) {
if (e instanceof NoRouteToHostException) {
} else {
- System.out.println("GuestSocketClient.run 3 " + e.getMessage());
+ System1.out.println("GuestSocketClient.run 3 " + e.getMessage());
}
- SystemClock.sleep(1000);
+ SystemClock.sleep(3000);
} finally {
socketUtil.close();
}
--
Gitblit v1.8.0