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/outdoor/OutdoorGuestSocketServer.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/basic/security/utils/socket/outdoor/OutdoorGuestSocketServer.java b/app/src/main/java/com/basic/security/utils/socket/outdoor/OutdoorGuestSocketServer.java
index 0541f7c..cd7ef7c 100644
--- a/app/src/main/java/com/basic/security/utils/socket/outdoor/OutdoorGuestSocketServer.java
+++ b/app/src/main/java/com/basic/security/utils/socket/outdoor/OutdoorGuestSocketServer.java
@@ -6,7 +6,6 @@
import com.basic.security.manager.DeviceManager;
import com.basic.security.model.GuestMessage;
import com.basic.security.model.ModelAdapter;
-import com.basic.security.receiver.WebRtcBroadCastReceiver;
import com.basic.security.utils.CompareFeatureResult;
import com.basic.security.utils.Constants;
import com.basic.security.utils.DetectedResult;
@@ -76,7 +75,7 @@
boolean detectedResultChangedByTrackId = detectedResultChangedByTrackId(detectedResult);
if (System.currentTimeMillis() - lastSetDetectedResult > 3 * 1000 || detectedResultChangedByTrackId) {
if (Constants.indoorOutdoorInOne) {
-// System.out.println("GuestAcceptedClient.setDetectedResult");
+// System1.out.println("GuestAcceptedClient.setDetectedResult");
BaseApplication.getApplication().activity.fragment_guest_mode.addGuestListS(detectedResult);
}
acceptedClientListLock.lock();
@@ -137,7 +136,7 @@
mLastFrame = detectedResultQueue.poll();
}
}
-// System.out.println("GuestAcceptedClient.getDetectedResult " + mLastFrame);
+// System1.out.println("GuestAcceptedClient.getDetectedResult " + mLastFrame);
return mLastFrame;
}
@@ -236,6 +235,8 @@
map.put(GuestMessage.frameJpgOrYuv, frameJpgOrYuv);
map.put(GuestMessage.frameJpgLength, frameJpgLength + "");
map.put(GuestMessage.hasFrameData, hasFrameData);
+// map.put(Constants.webRtcClientConnected, WebRtcBroadCastReceiver.webRtcClientConnected ? Constants.TRUE : Constants.FALSE);
+// map.put(Constants.webRtcServerStarted, allowed && WebRtcBroadCastReceiver.webRtcServerStarted ? Constants.TRUE : Constants.FALSE);
map.put(GuestMessage.deviceId, DeviceManager.getDeviceId());
socketUtil.writeMap(map);
if (Constants.TRUE.equals(hasFrameData)) {
--
Gitblit v1.8.0