From eb0314a2534e4e88e7c4ae5caf1bb712bc303669 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Mon, 29 Jul 2019 16:46:44 +0800 Subject: [PATCH] update Former-commit-id: 347c1ab49424ba178efbf8c5422d63c7f675797f --- .../IoT.Shared/DeviceServices/Onvif/OnvifService.cs | 6 +++++- projects/IoT/IoTNode/Program.cs | 10 ++++++++++ projects/IoT/IoTNode/Startup.cs | 2 +- projects/IoT/IoTNode/libman.json | 6 ------ 4 files changed, 16 insertions(+), 8 deletions(-) delete mode 100644 projects/IoT/IoTNode/libman.json diff --git a/projects/IoT/IoT.Shared/DeviceServices/Onvif/OnvifService.cs b/projects/IoT/IoT.Shared/DeviceServices/Onvif/OnvifService.cs index 59e5187a..7e50e6a4 100644 --- a/projects/IoT/IoT.Shared/DeviceServices/Onvif/OnvifService.cs +++ b/projects/IoT/IoT.Shared/DeviceServices/Onvif/OnvifService.cs @@ -104,6 +104,9 @@ namespace IoT.Shared.DeviceServices.Onvif deviceInfoRepo.SaveChanges(); this.SendDeviceInfo(deviceInfo); } + var deviceNodeRepo = scope.ServiceProvider.GetService>(); + var node = deviceNodeRepo.ReadOnlyTable().FirstOrDefault(); + var deviceRepo = scope.ServiceProvider.GetService>(); var device = deviceRepo.Table().Include(o => o.Data).FirstOrDefault(o => o.Number == ipCamera.Id); if (device == null) @@ -115,7 +118,8 @@ namespace IoT.Shared.DeviceServices.Onvif Icon = "camera", CategoryNumber = "10", InfoNumber = deviceInfoNumber, - InfoId = deviceInfo.Id + InfoId = deviceInfo.Id, + NodeId = node.Id }; device.AddorUpdateData("mainrtmp", $"rtmp://{this._configuration["stream.rtmp"]}/live/main{ipCamera.Id}", DeviceDataType.String, "主码流rtmp"); device.AddorUpdateData("mainflv", $"http://{this._configuration["stream.flv"]}/live/main{ipCamera.Id}.flv", DeviceDataType.String, "主码流flv"); diff --git a/projects/IoT/IoTNode/Program.cs b/projects/IoT/IoTNode/Program.cs index 84f0f9ad..d02ed828 100644 --- a/projects/IoT/IoTNode/Program.cs +++ b/projects/IoT/IoTNode/Program.cs @@ -13,6 +13,7 @@ namespace IoTNode public static void Main(string[] args) { var host = "localhost"; + var stream = "49.4.92.112"; WebHost.CreateDefaultBuilder(args) .Run(new List { new EFConfigurationValue { Id = "id", Value= "根据设备编号生成的授权码" }, @@ -36,6 +37,15 @@ namespace IoTNode new EFConfigurationValue { Id = "influxdb:url", Value= "http://localhost:8086"}, new EFConfigurationValue { Id = "influxdb:usr", Value= "admin"}, new EFConfigurationValue { Id = "influxdb:pwd", Value= "admin"}, + new EFConfigurationValue { Id = "onvif.timer", Value="1"}, + new EFConfigurationValue { Id = "onvif.speed", Value="0.2"}, + new EFConfigurationValue { Id = "camera.usr", Value="admin"}, + new EFConfigurationValue { Id = "camera.pwd", Value="dsideal123"}, + new EFConfigurationValue { Id = "stream.rtmp", Value=stream}, + new EFConfigurationValue { Id = "stream.flv", Value=$"{stream}:8080"}, + new EFConfigurationValue { Id = "stream.hls", Value=$"{stream}:8080"}, + new EFConfigurationValue { Id = "ffmpeg.args", Value=" -y -threads {0} -rtsp_transport tcp -use_wallclock_as_timestamps 1 -stimeout 3000000 -i \"{1}\" -fflags +genpts -c copy -f flv \"{2}\""}, + new EFConfigurationValue { Id = "ffmpeg.file", Value="/usr/ffmpeg-rkmp/bin/ffmpeg"}, // new EFConfigurationValue { Id = "name", Value= "物联网节点"}, new EFConfigurationValue { Id = "logo", Value= "/images/logo.png",Type= InputType.ImageUrl}, diff --git a/projects/IoT/IoTNode/Startup.cs b/projects/IoT/IoTNode/Startup.cs index 2141c6c0..ef6d30eb 100644 --- a/projects/IoT/IoTNode/Startup.cs +++ b/projects/IoT/IoTNode/Startup.cs @@ -24,7 +24,7 @@ namespace IoTNode public override void ConfigureServices(IServiceCollection services) { - services.AddSingleton(); ; + services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/projects/IoT/IoTNode/libman.json b/projects/IoT/IoTNode/libman.json deleted file mode 100644 index 9c72767d..00000000 --- a/projects/IoT/IoTNode/libman.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "version": "1.0", - "defaultProvider": "cdnjs", - "libraries": [ - ] -} \ No newline at end of file