update 架构

BusinessModule/EC.App.ThatBLL/Onvif/Impl/CurdBLL.cs → 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
 	{

BusinessModule/EC.App.ThatBLL/Onvif/Impl/DeviceBLL.cs → 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
 	{

BusinessModule/EC.App.ThatBLL/Onvif/Impl/ImagingBLL.cs → 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;
 		}
 

BusinessModule/EC.App.ThatBLL/Onvif/ICurdBLL.cs → 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
 	{

BusinessModule/EC.App.ThatBLL/Onvif/IDeviceBLL.cs → 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
 	{

BusinessModule/EC.App.ThatBLL/Onvif/IImagingBLL.cs → 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
 	{

BusinessModule/EC.App.ThatBLL/Onvif/IMediaBLL.cs → 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
 	{

BusinessModule/EC.App.ThatBLL/Onvif/IPTZBLL.cs → 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
 	{

BusinessModule/EC.App.ThatBLL/Onvif/Impl/MediaBLL.cs → 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
 	{

BusinessModule/EC.App.ThatBLL/Onvif/Impl/PTZBLL.cs → 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
 	{

BusinessModule/EC.App.ThatService/EC.App.ThatService.csproj

@@ -10,4 +10,8 @@
     <ProjectReference Include="..\EC.App.Entity\EC.App.Entity.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Onvif\Intf\" />
+  </ItemGroup>
+
 </Project>

BusinessModule/EC.App.ThatService/Onvif/IOnvifClientService.cs

@@ -1,9 +0,0 @@
-using EC.App.Core;
-using Furion.DependencyInjection;
-
-namespace EC.App.ThatService.Onvif
-{
-	public interface IOnvifClientService : IService, ISingleton
-	{
-	}
-}

BusinessModule/EC.App.ThatService/Onvif/Impl/OnvifClientService.cs → 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();
 

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;

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;

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;

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
 		/// <param name="ip"></param>
 		/// <returns></returns>
 		[HttpGet]
-		public async Task<string> GetStreamUri(
+		public async Task<string> GetStreamUrl(
 			[Required][DataValidation(ValidationTypes.IPv4)] string ip)
 		{
 			string url = await _mediaBLL.GetStreamUrl(ip);
@@ -58,7 +58,7 @@ namespace OnvifWebServer.Controllers.Onvif
 		/// <param name="ip"></param>
 		/// <returns></returns>
 		[HttpGet]
-		public async Task<string> GetSnapshotUri(
+		public async Task<string> GetSnapshotUrl(
 			[Required][DataValidation(ValidationTypes.IPv4)] string ip)
 		{
 			string url = await _mediaBLL.GetSnapshotUrl(ip);

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;

OnvifWebServer/OnvifWebServer.csproj

@@ -12,4 +12,6 @@
     <ProjectReference Include="..\BusinessModule\EC.App.ThatBLL\EC.App.ThatBLL.csproj" />
   </ItemGroup>
 
+  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
+
 </Project>