From 407a5b77c3586fef44dc771e48f05c2354740795 Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期二, 07 九月 2021 09:20:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java b/src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java
index e747118..d952cc8 100644
--- a/src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java
@@ -12,13 +12,12 @@
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+@SuppressWarnings("rawtypes")
/**
* 澶勭悊onvif鐨勫悇绉嶆搷浣�
*/
@@ -43,7 +42,7 @@
public void onDevicesFound(List<Device> devices) {
if (devices == null || devices.size() == 0) return;
for (Device device : devices){
- System.out.println(device.getHostName());
+ logger.info(device.getHostName());
deviceMap.put(device.getHostName(), device);
}
}
@@ -53,7 +52,7 @@
public void onDiscoveryFinished() {
ArrayList<String> result = new ArrayList<>();
for (Device device : deviceMap.values()) {
- System.out.println(device.getHostName());
+ logger.info(device.getHostName());
result.add(device.getHostName());
}
callBack.run(0, result);
@@ -71,14 +70,14 @@
@Override
public void onResponse(OnvifDevice onvifDevice, OnvifResponse response) {
- System.out.println("[RESPONSE] " + onvifDevice.getHostName()
+ logger.info("[RESPONSE] " + onvifDevice.getHostName()
+ "======" + response.getErrorCode()
+ "======" + response.getErrorMessage());
}
@Override
public void onError(OnvifDevice onvifDevice, int errorCode, String errorMessage) {
- System.out.println("[ERROR] " + onvifDevice.getHostName() + "======" + errorCode + "=======" + errorMessage);
+ logger.info("[ERROR] " + onvifDevice.getHostName() + "======" + errorCode + "=======" + errorMessage);
callBack.run(errorCode, errorMessage);
}
});
@@ -91,8 +90,8 @@
@Override
public void onMediaProfilesReceived(OnvifDevice device, List<OnvifMediaProfile> mediaProfiles) {
for (OnvifMediaProfile mediaProfile : mediaProfiles) {
- System.out.println(mediaProfile.getName());
- System.out.println(mediaProfile.getToken());
+ logger.info(mediaProfile.getName());
+ logger.info(mediaProfile.getToken());
if (mediaProfile.getName().equals("mainStream")) {
onvifManager.getMediaStreamURI(device, mediaProfile, (OnvifDevice onvifDevice,
OnvifMediaProfile profile, String uri) -> {
--
Gitblit v1.8.0