Codecleamup
This commit is contained in:
parent
b21b2c3678
commit
507e08ab19
@ -17,10 +17,10 @@ namespace Squirrowse.Client
|
|||||||
.ConfigureServices((hostContext, services) =>
|
.ConfigureServices((hostContext, services) =>
|
||||||
{
|
{
|
||||||
services.AddHostedService<Worker>();
|
services.AddHostedService<Worker>();
|
||||||
services.AddSingleton<IConnectionManager>(x=> new ConnectionManager("http://localhost", 5000)); //keep as transient for now
|
services.AddSingleton<IConnectionManager>(x =>
|
||||||
|
new ConnectionManager("http://localhost", 5000)); //keep as transient for now
|
||||||
services.AddSingleton<ICameraService, CameraService>(x => new CameraService(new Camera()));
|
services.AddSingleton<ICameraService, CameraService>(x => new CameraService(new Camera()));
|
||||||
services.AddSingleton<IActionDispatcher, ActionDispatcher>();
|
services.AddSingleton<IActionDispatcher, ActionDispatcher>();
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
using System.Collections.Generic;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Microsoft.AspNetCore.SignalR.Client;
|
using Microsoft.AspNetCore.SignalR.Client;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
@ -22,7 +23,7 @@ namespace Squirrowse.Client.Service
|
|||||||
|
|
||||||
public Task StopStream()
|
public Task StopStream()
|
||||||
{
|
{
|
||||||
throw new System.NotImplementedException();
|
throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task SayHello()
|
public async Task SayHello()
|
||||||
@ -40,7 +41,7 @@ namespace Squirrowse.Client.Service
|
|||||||
|
|
||||||
public Task StartStream()
|
public Task StartStream()
|
||||||
{
|
{
|
||||||
throw new System.NotImplementedException();
|
throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,7 +1,4 @@
|
|||||||
using System;
|
using OpenCvSharp;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Text;
|
|
||||||
using OpenCvSharp;
|
|
||||||
|
|
||||||
namespace Squirrowse.Client.Service
|
namespace Squirrowse.Client.Service
|
||||||
{
|
{
|
||||||
|
@ -17,25 +17,18 @@ namespace Squirrowse.Client.Service
|
|||||||
.AddMessagePackProtocol()
|
.AddMessagePackProtocol()
|
||||||
.WithAutomaticReconnect()
|
.WithAutomaticReconnect()
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<HubConnection> GetConnection()
|
public async Task<HubConnection> GetConnection()
|
||||||
{
|
{
|
||||||
if (Connected)
|
if (Connected) return _connection;
|
||||||
{
|
|
||||||
return _connection;
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new Exception();
|
throw new Exception();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task InitConnection()
|
public async Task InitConnection()
|
||||||
{
|
{
|
||||||
if (_connection.State == HubConnectionState.Connected)
|
if (_connection.State == HubConnectionState.Connected) return;
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
await _connection.StartAsync();
|
await _connection.StartAsync();
|
||||||
await RegisterOnHub();
|
await RegisterOnHub();
|
||||||
Connected = true;
|
Connected = true;
|
||||||
|
@ -1,8 +1,4 @@
|
|||||||
using System;
|
namespace Squirrowse.Client.Service
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Text;
|
|
||||||
|
|
||||||
namespace Squirrowse.Client.Service
|
|
||||||
{
|
{
|
||||||
public interface ICameraFactory
|
public interface ICameraFactory
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
using System;
|
using System.Collections.Generic;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using OpenCvSharp;
|
using OpenCvSharp;
|
||||||
|
|
||||||
|
@ -1,24 +1,21 @@
|
|||||||
using System;
|
|
||||||
using System.Drawing;
|
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Microsoft.Extensions.Hosting;
|
using Microsoft.Extensions.Hosting;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using OpenCvSharp;
|
|
||||||
using Squirrowse.Client.Service;
|
using Squirrowse.Client.Service;
|
||||||
|
|
||||||
namespace Squirrowse.Client
|
namespace Squirrowse.Client
|
||||||
{
|
{
|
||||||
public class Worker : IHostedService
|
public class Worker : IHostedService
|
||||||
{
|
{
|
||||||
private readonly ILogger<Worker> logger;
|
|
||||||
private readonly IConnectionManager _connectionManager;
|
private readonly IConnectionManager _connectionManager;
|
||||||
private readonly ICameraService camera;
|
private readonly ICameraService camera;
|
||||||
|
private readonly ILogger<Worker> logger;
|
||||||
|
|
||||||
public Worker(ILogger<Worker> logger, IConnectionManager connectionManager, ICameraService camera)
|
public Worker(ILogger<Worker> logger, IConnectionManager connectionManager, ICameraService camera)
|
||||||
{
|
{
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
this._connectionManager = connectionManager;
|
_connectionManager = connectionManager;
|
||||||
this.camera = camera;
|
this.camera = camera;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
{
|
{
|
||||||
public class User
|
public class User
|
||||||
{
|
{
|
||||||
public string ConnectionId { get; set; }
|
|
||||||
public string AgentName { get; set; }
|
|
||||||
|
|
||||||
public User(string connectionId, string agentName)
|
public User(string connectionId, string agentName)
|
||||||
{
|
{
|
||||||
ConnectionId = connectionId;
|
ConnectionId = connectionId;
|
||||||
AgentName = agentName;
|
AgentName = agentName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string ConnectionId { get; set; }
|
||||||
|
public string AgentName { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,7 +1,4 @@
|
|||||||
using System;
|
using System.Threading.Tasks;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace Squirrowse.Service.Hubs
|
namespace Squirrowse.Service.Hubs
|
||||||
{
|
{
|
||||||
@ -11,6 +8,5 @@ namespace Squirrowse.Service.Hubs
|
|||||||
Task RemoveUserbyConnectionId(string connectionId);
|
Task RemoveUserbyConnectionId(string connectionId);
|
||||||
Task RemoveUserByUserName(string agentName);
|
Task RemoveUserByUserName(string agentName);
|
||||||
bool CheckUser(string agentName);
|
bool CheckUser(string agentName);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,5 +1,4 @@
|
|||||||
using System;
|
using System.Collections.Generic;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Microsoft.AspNetCore.SignalR;
|
using Microsoft.AspNetCore.SignalR;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
@ -13,6 +12,8 @@ namespace Squirrowse.Service.Hubs
|
|||||||
{
|
{
|
||||||
private readonly ILogger<StreamHub> logger;
|
private readonly ILogger<StreamHub> logger;
|
||||||
private readonly IStreamManager manager;
|
private readonly IStreamManager manager;
|
||||||
|
public Window okno = new Window("test");
|
||||||
|
|
||||||
public StreamHub(ILogger<StreamHub> logger, IStreamManager manager)
|
public StreamHub(ILogger<StreamHub> logger, IStreamManager manager)
|
||||||
{
|
{
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
@ -62,10 +63,9 @@ namespace Squirrowse.Service.Hubs
|
|||||||
|
|
||||||
await client.SendAsync("Stop");
|
await client.SendAsync("Stop");
|
||||||
}
|
}
|
||||||
public Window okno = new Window("test");
|
|
||||||
public async Task UploadByteStream(IAsyncEnumerable<byte[]> stream)
|
public async Task UploadByteStream(IAsyncEnumerable<byte[]> stream)
|
||||||
{
|
{
|
||||||
|
|
||||||
await foreach (var frame in stream)
|
await foreach (var frame in stream)
|
||||||
{
|
{
|
||||||
using var imgbuffer = frame.ConvertByteToMat();
|
using var imgbuffer = frame.ConvertByteToMat();
|
||||||
|
@ -25,6 +25,7 @@ namespace Squirrowse.Service
|
|||||||
services.AddControllers();
|
services.AddControllers();
|
||||||
services.AddMediatR(Assembly.GetAssembly(typeof(Startup)));
|
services.AddMediatR(Assembly.GetAssembly(typeof(Startup)));
|
||||||
services.AddTransient<IStreamHub, StreamHub>();
|
services.AddTransient<IStreamHub, StreamHub>();
|
||||||
|
services.AddTransient<IStreamManager, StreamManager>();
|
||||||
services.AddCoreModule();
|
services.AddCoreModule();
|
||||||
services.AddSignalR()
|
services.AddSignalR()
|
||||||
.AddHubOptions<StreamHub
|
.AddHubOptions<StreamHub
|
||||||
|
Loading…
Reference in New Issue
Block a user