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/SocketUtil.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/basic/security/utils/SocketUtil.java b/app/src/main/java/com/basic/security/utils/SocketUtil.java
index 47b1c7e..db5e013 100644
--- a/app/src/main/java/com/basic/security/utils/SocketUtil.java
+++ b/app/src/main/java/com/basic/security/utils/SocketUtil.java
@@ -1,11 +1,12 @@
package com.basic.security.utils;
import android.os.SystemClock;
+import android.text.TextUtils;
import com.basic.security.base.BaseApplication;
+import com.basic.security.manager.PersonManager;
import com.basic.security.manager.RemoteInDoorManager;
import com.basic.security.manager.RemoteOutdoorManager;
-import com.basic.security.manager.PersonManager;
import com.basic.security.model.ModelAdapter;
import com.basic.security.model.Person;
import com.basic.security.model.PersonSocket;
@@ -53,14 +54,20 @@
public static List<String> getRpcCallIp() {
List<String> ipList = new ArrayList<>();
- String ip = "";
if (Constants.isIndoor) {
ipList = RemoteOutdoorManager.getOutdoorDeviceIp();
}
if (Constants.isOutdoor) {
ipList = RemoteInDoorManager.getIndoorDeviceIp();
}
- return ipList;
+ List<String> finalList = new ArrayList<>();
+ for (String ip : ipList) {
+ if (!TextUtils.isEmpty(ip)) {
+ finalList.add(ip);
+ }
+ }
+// LogUtil.println("getRpcCallIp " + finalList);
+ return finalList;
}
public static void rpcCallAsyncCommonSave(ModelAdapter modelAdapter) {
@@ -78,6 +85,9 @@
}
public static void rpcCallAsync(ModelAdapter modelAdapter, String requestType) {
+ if (!Constants.isUseSocketRpc) {
+ return;
+ }
BaseApplication.getApplication().executorService.execute(() -> {
List<String> remoteIpList = getRpcCallIp();
for (String remoteIp : remoteIpList) {
@@ -95,7 +105,7 @@
socketUtil.writeByteArray(modelMapByteArray);
}
Map<String, String> responseMap = socketUtil.readJsonAsMap();
-// System.out.println("SocketUtil.rpcCallSaveVisit " + responseMap + " " + requestType);
+// System1.out.println("SocketUtil.rpcCallAsync " + responseMap + " " + requestType + " remoteIp=" + remoteIp + " " + Constants.personServerPort);
} catch (Exception e) {
e.printStackTrace();
} finally {
@@ -184,7 +194,7 @@
socketUtil.readFullByteArray(personByteArray);
Map<String, Object> personModel = (Map<String, Object>) ObjectUtil.toObject(personByteArray);//SerializationUtils.deserialize(personByteArray);
if (personModel != null) {
-// System.out.println("SocketUtil.rpcCallFindPersonById " + personModel);
+// System1.out.println("SocketUtil.rpcCallFindPersonById " + personModel);
ModelAdapter person = new ModelAdapter();
person.model = personModel;
byte[] camera_image_path_byte_array = (byte[]) person.model.get(PersonSocket.camera_image_path_byte_array);
@@ -195,7 +205,7 @@
return person;
}
} else {
-// System.out.println("SocketUtil.rpcCallFindPersonById");
+// System1.out.println("SocketUtil.rpcCallFindPersonById");
}
} catch (Exception e) {
e.printStackTrace();
@@ -236,7 +246,7 @@
IOUtils.write(fileBuffer, fileWriter);
fileWriter.flush();
fileWriter.close();
- System.out.println("SocketUtil.rpcCallDownload camera_image_path=" + camera_image_path);
+ System1.out.println("SocketUtil.rpcCallDownload camera_image_path=" + camera_image_path);
}
} catch (Exception e) {
e.printStackTrace();
@@ -277,7 +287,7 @@
try {
element = parser.parse(json);
} catch (JsonParseException e) {
- System.out.println("exception: " + e);
+ System1.out.println("exception: " + e);
isJSON = false;
}
if (isJSON && element != null) {
--
Gitblit v1.8.0