From 716b2f1181d92f50761b647393058b8bc29bcc8a Mon Sep 17 00:00:00 2001
From: fajiao <1519100073@qq.com>
Date: Wed, 2 Mar 2022 10:42:32 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9E=B6=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../EC.App.ThatBLL/Onvif/{Impl => }/CurdBLL.cs | 5 +++--
.../EC.App.ThatBLL/Onvif/{Impl => }/DeviceBLL.cs | 5 +++--
.../EC.App.ThatBLL/Onvif/{Impl => }/ImagingBLL.cs | 11 ++++++-----
.../EC.App.ThatBLL/Onvif/{ => Intf}/ICurdBLL.cs | 2 +-
.../EC.App.ThatBLL/Onvif/{ => Intf}/IDeviceBLL.cs | 2 +-
.../EC.App.ThatBLL/Onvif/{ => Intf}/IImagingBLL.cs | 2 +-
.../EC.App.ThatBLL/Onvif/{ => Intf}/IMediaBLL.cs | 2 +-
.../EC.App.ThatBLL/Onvif/{ => Intf}/IPTZBLL.cs | 2 +-
.../EC.App.ThatBLL/Onvif/{Impl => }/MediaBLL.cs | 5 +++--
.../EC.App.ThatBLL/Onvif/{Impl => }/PTZBLL.cs | 5 +++--
.../EC.App.ThatService/EC.App.ThatService.csproj | 4 ++++
.../EC.App.ThatService/Onvif/IOnvifClientService.cs | 9 ---------
.../Onvif/{Impl => }/OnvifClientService.cs | 8 +++++---
OnvifWebServer/Controllers/Onvif/CurdController.cs | 2 +-
OnvifWebServer/Controllers/Onvif/DeviceController.cs | 2 +-
OnvifWebServer/Controllers/Onvif/ImagingController.cs | 2 +-
OnvifWebServer/Controllers/Onvif/MediaController.cs | 6 +++---
OnvifWebServer/Controllers/Onvif/PTZController.cs | 2 +-
OnvifWebServer/OnvifWebServer.csproj | 2 ++
19 files changed, 41 insertions(+), 37 deletions(-)
rename BusinessModule/EC.App.ThatBLL/Onvif/{Impl => }/CurdBLL.cs (90%)
rename BusinessModule/EC.App.ThatBLL/Onvif/{Impl => }/DeviceBLL.cs (79%)
rename BusinessModule/EC.App.ThatBLL/Onvif/{Impl => }/ImagingBLL.cs (82%)
rename BusinessModule/EC.App.ThatBLL/Onvif/{ => Intf}/ICurdBLL.cs (89%)
rename BusinessModule/EC.App.ThatBLL/Onvif/{ => Intf}/IDeviceBLL.cs (87%)
rename BusinessModule/EC.App.ThatBLL/Onvif/{ => Intf}/IImagingBLL.cs (93%)
rename BusinessModule/EC.App.ThatBLL/Onvif/{ => Intf}/IMediaBLL.cs (91%)
rename BusinessModule/EC.App.ThatBLL/Onvif/{ => Intf}/IPTZBLL.cs (97%)
rename BusinessModule/EC.App.ThatBLL/Onvif/{Impl => }/MediaBLL.cs (94%)
rename BusinessModule/EC.App.ThatBLL/Onvif/{Impl => }/PTZBLL.cs (93%)
delete mode 100644 BusinessModule/EC.App.ThatService/Onvif/IOnvifClientService.cs
rename BusinessModule/EC.App.ThatService/Onvif/{Impl => }/OnvifClientService.cs (79%)
diff --git a/BusinessModule/EC.App.ThatBLL/Onvif/Impl/CurdBLL.cs b/BusinessModule/EC.App.ThatBLL/Onvif/CurdBLL.cs
similarity index 90%
rename from BusinessModule/EC.App.ThatBLL/Onvif/Impl/CurdBLL.cs
rename to BusinessModule/EC.App.ThatBLL/Onvif/CurdBLL.cs
index 686b3fd..02258da 100644
--- a/BusinessModule/EC.App.ThatBLL/Onvif/Impl/CurdBLL.cs
+++ b/BusinessModule/EC.App.ThatBLL/Onvif/CurdBLL.cs
@@ -1,8 +1,9 @@
-using EC.App.ThatService.Onvif.Impl;
+using EC.App.ThatBLL.Onvif.Intf;
+using EC.App.ThatService.Onvif;
using EC.Onvif;
using System.Threading.Tasks;
-namespace EC.App.ThatBLL.Onvif.Impl
+namespace EC.App.ThatBLL.Onvif
{
public class CurdBLL : ICurdBLL
{
diff --git a/BusinessModule/EC.App.ThatBLL/Onvif/Impl/DeviceBLL.cs b/BusinessModule/EC.App.ThatBLL/Onvif/DeviceBLL.cs
similarity index 79%
rename from BusinessModule/EC.App.ThatBLL/Onvif/Impl/DeviceBLL.cs
rename to BusinessModule/EC.App.ThatBLL/Onvif/DeviceBLL.cs
index a53e53e..c80b2bd 100644
--- a/BusinessModule/EC.App.ThatBLL/Onvif/Impl/DeviceBLL.cs
+++ b/BusinessModule/EC.App.ThatBLL/Onvif/DeviceBLL.cs
@@ -1,7 +1,8 @@
-using EC.App.ThatService.Onvif.Impl;
+using EC.App.ThatBLL.Onvif.Intf;
+using EC.App.ThatService.Onvif;
using EC.Onvif;
-namespace EC.App.ThatBLL.Onvif.Impl
+namespace EC.App.ThatBLL.Onvif
{
public class DeviceBLL : IDeviceBLL
{
diff --git a/BusinessModule/EC.App.ThatBLL/Onvif/Impl/ImagingBLL.cs b/BusinessModule/EC.App.ThatBLL/Onvif/ImagingBLL.cs
similarity index 82%
rename from BusinessModule/EC.App.ThatBLL/Onvif/Impl/ImagingBLL.cs
rename to BusinessModule/EC.App.ThatBLL/Onvif/ImagingBLL.cs
index 19f1786..85d7092 100644
--- a/BusinessModule/EC.App.ThatBLL/Onvif/Impl/ImagingBLL.cs
+++ b/BusinessModule/EC.App.ThatBLL/Onvif/ImagingBLL.cs
@@ -1,8 +1,9 @@
-using EC.App.ThatService.Onvif.Impl;
+using EC.App.ThatBLL.Onvif.Intf;
+using EC.App.ThatService.Onvif;
using EC.Onvif;
using System.Threading.Tasks;
-namespace EC.App.ThatBLL.Onvif.Impl
+namespace EC.App.ThatBLL.Onvif
{
public class ImagingBLL : IImagingBLL
{
@@ -24,7 +25,7 @@ namespace EC.App.ThatBLL.Onvif.Impl
{
bool flag = _ocService.TryGet(ip, out OnvifClient onvifClient);
if (!flag) return false;
- await onvifClient.FocusStopMove();
+ await onvifClient.FocusAbsoluteMove(position);
return true;
}
@@ -32,7 +33,7 @@ namespace EC.App.ThatBLL.Onvif.Impl
{
bool flag = _ocService.TryGet(ip, out OnvifClient onvifClient);
if (!flag) return false;
- await onvifClient.FocusStopMove();
+ await onvifClient.FocusRelativeMove(distance);
return true;
}
@@ -40,7 +41,7 @@ namespace EC.App.ThatBLL.Onvif.Impl
{
bool flag = _ocService.TryGet(ip, out OnvifClient onvifClient);
if (!flag) return false;
- await onvifClient.FocusStopMove();
+ await onvifClient.FocusContinuousMove(speed);
return true;
}
diff --git a/BusinessModule/EC.App.ThatBLL/Onvif/ICurdBLL.cs b/BusinessModule/EC.App.ThatBLL/Onvif/Intf/ICurdBLL.cs
similarity index 89%
rename from BusinessModule/EC.App.ThatBLL/Onvif/ICurdBLL.cs
rename to BusinessModule/EC.App.ThatBLL/Onvif/Intf/ICurdBLL.cs
index b59ffe2..b941585 100644
--- a/BusinessModule/EC.App.ThatBLL/Onvif/ICurdBLL.cs
+++ b/BusinessModule/EC.App.ThatBLL/Onvif/Intf/ICurdBLL.cs
@@ -2,7 +2,7 @@
using Furion.DependencyInjection;
using System.Threading.Tasks;
-namespace EC.App.ThatBLL.Onvif
+namespace EC.App.ThatBLL.Onvif.Intf
{
public interface ICurdBLL : IBLL, ISingleton
{
diff --git a/BusinessModule/EC.App.ThatBLL/Onvif/IDeviceBLL.cs b/BusinessModule/EC.App.ThatBLL/Onvif/Intf/IDeviceBLL.cs
similarity index 87%
rename from BusinessModule/EC.App.ThatBLL/Onvif/IDeviceBLL.cs
rename to BusinessModule/EC.App.ThatBLL/Onvif/Intf/IDeviceBLL.cs
index 0438ed8..642b985 100644
--- a/BusinessModule/EC.App.ThatBLL/Onvif/IDeviceBLL.cs
+++ b/BusinessModule/EC.App.ThatBLL/Onvif/Intf/IDeviceBLL.cs
@@ -1,7 +1,7 @@
using EC.App.Core;
using Furion.DependencyInjection;
-namespace EC.App.ThatBLL.Onvif
+namespace EC.App.ThatBLL.Onvif.Intf
{
public interface IDeviceBLL : IBLL, ISingleton
{
diff --git a/BusinessModule/EC.App.ThatBLL/Onvif/IImagingBLL.cs b/BusinessModule/EC.App.ThatBLL/Onvif/Intf/IImagingBLL.cs
similarity index 93%
rename from BusinessModule/EC.App.ThatBLL/Onvif/IImagingBLL.cs
rename to BusinessModule/EC.App.ThatBLL/Onvif/Intf/IImagingBLL.cs
index b168763..4e9d923 100644
--- a/BusinessModule/EC.App.ThatBLL/Onvif/IImagingBLL.cs
+++ b/BusinessModule/EC.App.ThatBLL/Onvif/Intf/IImagingBLL.cs
@@ -2,7 +2,7 @@
using Furion.DependencyInjection;
using System.Threading.Tasks;
-namespace EC.App.ThatBLL.Onvif
+namespace EC.App.ThatBLL.Onvif.Intf
{
public interface IImagingBLL : IBLL, ISingleton
{
diff --git a/BusinessModule/EC.App.ThatBLL/Onvif/IMediaBLL.cs b/BusinessModule/EC.App.ThatBLL/Onvif/Intf/IMediaBLL.cs
similarity index 91%
rename from BusinessModule/EC.App.ThatBLL/Onvif/IMediaBLL.cs
rename to BusinessModule/EC.App.ThatBLL/Onvif/Intf/IMediaBLL.cs
index a2d4a01..a9a07d4 100644
--- a/BusinessModule/EC.App.ThatBLL/Onvif/IMediaBLL.cs
+++ b/BusinessModule/EC.App.ThatBLL/Onvif/Intf/IMediaBLL.cs
@@ -2,7 +2,7 @@
using Furion.DependencyInjection;
using System.Threading.Tasks;
-namespace EC.App.ThatBLL.Onvif
+namespace EC.App.ThatBLL.Onvif.Intf
{
public interface IMediaBLL : IBLL, ISingleton
{
diff --git a/BusinessModule/EC.App.ThatBLL/Onvif/IPTZBLL.cs b/BusinessModule/EC.App.ThatBLL/Onvif/Intf/IPTZBLL.cs
similarity index 97%
rename from BusinessModule/EC.App.ThatBLL/Onvif/IPTZBLL.cs
rename to BusinessModule/EC.App.ThatBLL/Onvif/Intf/IPTZBLL.cs
index 7cffcb0..417c4ff 100644
--- a/BusinessModule/EC.App.ThatBLL/Onvif/IPTZBLL.cs
+++ b/BusinessModule/EC.App.ThatBLL/Onvif/Intf/IPTZBLL.cs
@@ -2,7 +2,7 @@
using Furion.DependencyInjection;
using System.Threading.Tasks;
-namespace EC.App.ThatBLL.Onvif
+namespace EC.App.ThatBLL.Onvif.Intf
{
public interface IPTZBLL : IBLL, ISingleton
{
diff --git a/BusinessModule/EC.App.ThatBLL/Onvif/Impl/MediaBLL.cs b/BusinessModule/EC.App.ThatBLL/Onvif/MediaBLL.cs
similarity index 94%
rename from BusinessModule/EC.App.ThatBLL/Onvif/Impl/MediaBLL.cs
rename to BusinessModule/EC.App.ThatBLL/Onvif/MediaBLL.cs
index 279c2f9..c0ffcea 100644
--- a/BusinessModule/EC.App.ThatBLL/Onvif/Impl/MediaBLL.cs
+++ b/BusinessModule/EC.App.ThatBLL/Onvif/MediaBLL.cs
@@ -1,11 +1,12 @@
-using EC.App.ThatService.Onvif.Impl;
+using EC.App.ThatBLL.Onvif.Intf;
+using EC.App.ThatService.Onvif;
using EC.Onvif;
using System;
using System.IO;
using System.Net;
using System.Threading.Tasks;
-namespace EC.App.ThatBLL.Onvif.Impl
+namespace EC.App.ThatBLL.Onvif
{
public class MediaBLL : IMediaBLL
{
diff --git a/BusinessModule/EC.App.ThatBLL/Onvif/Impl/PTZBLL.cs b/BusinessModule/EC.App.ThatBLL/Onvif/PTZBLL.cs
similarity index 93%
rename from BusinessModule/EC.App.ThatBLL/Onvif/Impl/PTZBLL.cs
rename to BusinessModule/EC.App.ThatBLL/Onvif/PTZBLL.cs
index 6d169c1..4d9ba46 100644
--- a/BusinessModule/EC.App.ThatBLL/Onvif/Impl/PTZBLL.cs
+++ b/BusinessModule/EC.App.ThatBLL/Onvif/PTZBLL.cs
@@ -1,8 +1,9 @@
-using EC.App.ThatService.Onvif.Impl;
+using EC.App.ThatBLL.Onvif.Intf;
+using EC.App.ThatService.Onvif;
using EC.Onvif;
using System.Threading.Tasks;
-namespace EC.App.ThatBLL.Onvif.Impl
+namespace EC.App.ThatBLL.Onvif
{
public class PTZBLL : IPTZBLL
{
diff --git a/BusinessModule/EC.App.ThatService/EC.App.ThatService.csproj b/BusinessModule/EC.App.ThatService/EC.App.ThatService.csproj
index 38af50b..916e47a 100644
--- a/BusinessModule/EC.App.ThatService/EC.App.ThatService.csproj
+++ b/BusinessModule/EC.App.ThatService/EC.App.ThatService.csproj
@@ -10,4 +10,8 @@
+
+
+
+
diff --git a/BusinessModule/EC.App.ThatService/Onvif/IOnvifClientService.cs b/BusinessModule/EC.App.ThatService/Onvif/IOnvifClientService.cs
deleted file mode 100644
index a69d8e7..0000000
--- a/BusinessModule/EC.App.ThatService/Onvif/IOnvifClientService.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using EC.App.Core;
-using Furion.DependencyInjection;
-
-namespace EC.App.ThatService.Onvif
-{
- public interface IOnvifClientService : IService, ISingleton
- {
- }
-}
\ No newline at end of file
diff --git a/BusinessModule/EC.App.ThatService/Onvif/Impl/OnvifClientService.cs b/BusinessModule/EC.App.ThatService/Onvif/OnvifClientService.cs
similarity index 79%
rename from BusinessModule/EC.App.ThatService/Onvif/Impl/OnvifClientService.cs
rename to BusinessModule/EC.App.ThatService/Onvif/OnvifClientService.cs
index b2eb952..d12a376 100644
--- a/BusinessModule/EC.App.ThatService/Onvif/Impl/OnvifClientService.cs
+++ b/BusinessModule/EC.App.ThatService/Onvif/OnvifClientService.cs
@@ -1,9 +1,11 @@
-using EC.App.Entity.Onvif;
+using EC.App.Core;
+using EC.App.Entity.Onvif;
using EC.Onvif;
+using Furion.DependencyInjection;
-namespace EC.App.ThatService.Onvif.Impl
+namespace EC.App.ThatService.Onvif
{
- public class OnvifClientService : IOnvifClientService
+ public class OnvifClientService : IService, ISingleton
{
private readonly OnvifClientDict _dict = new OnvifClientDict();
diff --git a/OnvifWebServer/Controllers/Onvif/CurdController.cs b/OnvifWebServer/Controllers/Onvif/CurdController.cs
index 1435e8c..d30885d 100644
--- a/OnvifWebServer/Controllers/Onvif/CurdController.cs
+++ b/OnvifWebServer/Controllers/Onvif/CurdController.cs
@@ -1,5 +1,5 @@
using EC.App.Core;
-using EC.App.ThatBLL.Onvif;
+using EC.App.ThatBLL.Onvif.Intf;
using Furion.DataValidation;
using Microsoft.AspNetCore.Mvc;
using System.ComponentModel.DataAnnotations;
diff --git a/OnvifWebServer/Controllers/Onvif/DeviceController.cs b/OnvifWebServer/Controllers/Onvif/DeviceController.cs
index e042a50..c84fd8f 100644
--- a/OnvifWebServer/Controllers/Onvif/DeviceController.cs
+++ b/OnvifWebServer/Controllers/Onvif/DeviceController.cs
@@ -1,5 +1,5 @@
using EC.App.Core;
-using EC.App.ThatBLL.Onvif;
+using EC.App.ThatBLL.Onvif.Intf;
using Furion.DataValidation;
using Microsoft.AspNetCore.Mvc;
using System.ComponentModel.DataAnnotations;
diff --git a/OnvifWebServer/Controllers/Onvif/ImagingController.cs b/OnvifWebServer/Controllers/Onvif/ImagingController.cs
index 7176df3..58713a6 100644
--- a/OnvifWebServer/Controllers/Onvif/ImagingController.cs
+++ b/OnvifWebServer/Controllers/Onvif/ImagingController.cs
@@ -1,5 +1,5 @@
using EC.App.Core;
-using EC.App.ThatBLL.Onvif;
+using EC.App.ThatBLL.Onvif.Intf;
using Furion.DataValidation;
using Microsoft.AspNetCore.Mvc;
using System.ComponentModel.DataAnnotations;
diff --git a/OnvifWebServer/Controllers/Onvif/MediaController.cs b/OnvifWebServer/Controllers/Onvif/MediaController.cs
index 4e32bb1..6848e83 100644
--- a/OnvifWebServer/Controllers/Onvif/MediaController.cs
+++ b/OnvifWebServer/Controllers/Onvif/MediaController.cs
@@ -1,5 +1,5 @@
using EC.App.Core;
-using EC.App.ThatBLL.Onvif;
+using EC.App.ThatBLL.Onvif.Intf;
using Furion.DataValidation;
using Microsoft.AspNetCore.Mvc;
using System.ComponentModel.DataAnnotations;
@@ -45,7 +45,7 @@ namespace OnvifWebServer.Controllers.Onvif
///
///
[HttpGet]
- public async Task GetStreamUri(
+ public async Task GetStreamUrl(
[Required][DataValidation(ValidationTypes.IPv4)] string ip)
{
string url = await _mediaBLL.GetStreamUrl(ip);
@@ -58,7 +58,7 @@ namespace OnvifWebServer.Controllers.Onvif
///
///
[HttpGet]
- public async Task GetSnapshotUri(
+ public async Task GetSnapshotUrl(
[Required][DataValidation(ValidationTypes.IPv4)] string ip)
{
string url = await _mediaBLL.GetSnapshotUrl(ip);
diff --git a/OnvifWebServer/Controllers/Onvif/PTZController.cs b/OnvifWebServer/Controllers/Onvif/PTZController.cs
index 3b3497d..dcc0737 100644
--- a/OnvifWebServer/Controllers/Onvif/PTZController.cs
+++ b/OnvifWebServer/Controllers/Onvif/PTZController.cs
@@ -1,5 +1,5 @@
using EC.App.Core;
-using EC.App.ThatBLL.Onvif;
+using EC.App.ThatBLL.Onvif.Intf;
using Furion.DataValidation;
using Microsoft.AspNetCore.Mvc;
using System.ComponentModel.DataAnnotations;
diff --git a/OnvifWebServer/OnvifWebServer.csproj b/OnvifWebServer/OnvifWebServer.csproj
index 2823dbc..88f0c24 100644
--- a/OnvifWebServer/OnvifWebServer.csproj
+++ b/OnvifWebServer/OnvifWebServer.csproj
@@ -12,4 +12,6 @@
+
+