wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1.0.0-rc.108

Browse Source 
Former-commit-id: b05f73bcb1a75f41c0dc53270ba971b26a3f98d0
TangShanKaiPing
wanggang 6 years ago
parent c6e7e75b57
commit d790591bc3
27 changed files with 3775 additions and 142 deletions
Show Stats Download Patch File Download Diff File

2
projects/IoT.Shared/Services/IoTNode/IoTNodeClient.cs
Unescape View File

@ -370,7 +370,7 @@ namespace IoT.Shared.Services
{ {
var model = message.FromJson<EditDataModel>(); var model = message.FromJson<EditDataModel>();
dataService.Edit<Data, EditDataModel>(model); dataService.Edit<Data, EditDataModel>(model);
this.ClientToServer(method, model, null); this.ClientToServer("EditData", model, null);
} }
} }
catch (Exception ex) catch (Exception ex)

32
projects/IoTCenter/Controllers/AppController.cs
Unescape View File

@ -473,6 +473,38 @@ namespace IoTCenter.Controllers
#region srs callback #region srs callback
public IActionResult OnPublish()
{
try
{
using (var reader = new StreamReader(Request.Body))
{
var json = reader.ReadToEndAsync().Result;
var result = JsonConvert.DeserializeObject<Dictionary<string, string>>(json);
if (result["action"] == "on_publish")
{
var streamId = result["stream"];
var deviceNumber = streamId.StartsWith("main") ? streamId.Substring(4) : streamId.Substring(3);
var device = this._deviceRepo.ReadOnlyTable().Include(o => o.Node).Include(o => o.Data).FirstOrDefault(o => o.Number == deviceNumber);
if (device != null)
{
var data = device.Data.FirstOrDefault(o => o.Name == "录制");
if (data != null)
{
this.CallApi(null, device.Node.Number, $"/Onvif/{(data.Value == "是" ? "Start" : "Stop")}Record");
}
}
}
}
}
catch (Exception ex)
{
ex.PrintStack();
}
return Content(string.Empty);
}
/// <summary> /// <summary>
/// 录制完毕事件响应 /// 录制完毕事件响应
///{"action":"on_dvr","client_id":107,"ip":"192.168.3.124","vhost":"__defaultVhost__","app":"live","stream":"main0a5d5deee43011b483884cbd8fd2b3dd","param":"","cwd":"/root/publish/apps/srs","file":"./objs/nginx/html/live.main0a5d5deee43011b483884cbd8fd2b3dd.1574832559180.mp4"} ///{"action":"on_dvr","client_id":107,"ip":"192.168.3.124","vhost":"__defaultVhost__","app":"live","stream":"main0a5d5deee43011b483884cbd8fd2b3dd","param":"","cwd":"/root/publish/apps/srs","file":"./objs/nginx/html/live.main0a5d5deee43011b483884cbd8fd2b3dd.1574832559180.mp4"}

2
projects/IoTCenter/appsettings.json
Unescape View File

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-rc.107", "version": "1.0.0-rc.108",
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Warning", "Default": "Warning",

4
projects/IoTNode/DeviceServices/Onvif/Controllers/OnvifController.cs
Unescape View File

@ -120,7 +120,7 @@ namespace IoTNode.Controllers
{ {
return this.AsyncAction(() => return this.AsyncAction(() =>
{ {
this._deviceService.SetRecordStart(number, true); this._deviceService.SetRecord(number, true);
}); });
} }
@ -129,7 +129,7 @@ namespace IoTNode.Controllers
{ {
return this.AsyncAction(() => return this.AsyncAction(() =>
{ {
this._deviceService.SetRecordStart(number, false); this._deviceService.SetRecord(number, false);
}); });
} }
} }

2
projects/IoTNode/DeviceServices/Onvif/OnvifService.cs
Unescape View File

@ -594,7 +594,7 @@ namespace IoTNode.DeviceServices.Onvif
} }
} }
public void SetRecordStart(string number, bool state) public void SetRecord(string number, bool state)
{ {
using (var scope = _applicationServices.CreateScope()) using (var scope = _applicationServices.CreateScope())
{ {

2
projects/IoTNode/appsettings.json
Unescape View File

@ -1,5 +1,5 @@
{ {
"version": "1.0.0-rc.106", "version": "1.0.0-rc.108",
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Warning", "Default": "Warning",

1848
publish/src/linux-arm/publish/apps/srs/conf/full.conf
View File

File diff suppressed because it is too large Load Diff

2
publish/src/linux-arm/publish/apps/srs/objs/nginx/html/nginx.html
Unescape View File

@ -1 +1 @@
nginx is ok Nginx is ok.

BIN
publish/src/linux-arm/publish/apps/srs/objs/srs
View File

Binary file not shown.

1848
publish/src/linux-arm64/publish/apps/srs/conf/full.conf
View File

File diff suppressed because it is too large Load Diff

2
publish/src/linux-arm64/publish/apps/srs/objs/nginx/html/nginx.html
Unescape View File

@ -1 +1 @@
nginx is ok Nginx is ok.

BIN
publish/src/linux-arm64/publish/apps/srs/objs/srs
View File

Binary file not shown.

67
publish/src/linux-x64/publish/apps/srs/conf/srs.conf
Unescape View File

@ -1,48 +1,51 @@
# main config for srs. listen 1935;
# @see full.conf for detail config. daemon off;
max_connections 1000;
listen 1935; srs_log_tank file;
daemon off; srs_log_file ./objs/srs.log;
max_connections 1000;
srs_log_tank file;
srs_log_file ./objs/srs.log;
http_api { http_api {
enabled on; enabled on;
listen 1985; listen 1985;
raw_api {
enabled on;
allow_reload on;
allow_query on;
allow_update on;
}
} }
http_server { http_server {
enabled on; enabled on;
listen 8080; listen 8080;
dir ./objs/nginx/html; dir ./objs/nginx/html;
} }
stats { stats {
network 0; network 0;
disk sda sdb xvda xvdb; disk sda sdb xvda xvdb;
} }
vhost __defaultVhost__ { vhost __defaultVhost__ {
http_remux { http_remux {
enabled on; enabled on;
mount [vhost]/[app]/[stream].flv; mount [vhost]/[app]/[stream].flv;
hstrs on;
} }
hls { hls {
enabled on; enabled on;
hls_fragment 3; hls_fragment 3;
hls_window 10; hls_window 10;
hls_path ./objs/nginx/html; hls_path ./objs/nginx/html;
hls_m3u8_file [app]/[stream].m3u8; hls_m3u8_file [app]/[stream].m3u8;
hls_ts_file [app]/[stream]-[seq].ts; hls_ts_file [app]/[stream]-[seq].ts;
} }
dvr { dvr {
enabled on; enabled on;
dvr_path ../IoTCenter/wwwroot/video/[app]-[stream]-[timestamp].mp4; dvr_apply none;
dvr_plan segment; dvr_path ../IoTCenter/wwwroot/video/[app]-[stream]-[timestamp].mp4;
dvr_duration 3600; dvr_plan session;
dvr_wait_keyframe on; dvr_duration 300;
time_jitter full; dvr_wait_keyframe on;
time_jitter full;
} }
http_hooks { http_hooks {
enabled on; enabled on;
on_dvr http://localhost/IoTCenter/App/OnDvr; on_dvr http://localhost/IoTCenter/App/OnDvr;
} }
} }

48
publish/src/linux-x64/publish/apps/srs2/conf/srs.conf
Unescape View File

@ -1,48 +0,0 @@
# main config for srs.
# @see full.conf for detail config.
listen 1935;
daemon off;
max_connections 1000;
srs_log_tank file;
srs_log_file ./objs/srs.log;
http_api {
enabled on;
listen 1985;
}
http_server {
enabled on;
listen 8080;
dir ./objs/nginx/html;
}
stats {
network 0;
disk sda sdb xvda xvdb;
}
vhost __defaultVhost__ {
http_remux {
enabled on;
mount [vhost]/[app]/[stream].flv;
hstrs on;
}
hls {
enabled on;
hls_fragment 3;
hls_window 10;
hls_path ./objs/nginx/html;
hls_m3u8_file [app]/[stream].m3u8;
hls_ts_file [app]/[stream]-[seq].ts;
}
dvr {
enabled off;
dvr_path ./objs/nginx/html/[app].[stream].[timestamp].flv;
dvr_plan segment;
dvr_duration 600;
dvr_wait_keyframe on;
time_jitter full;
}
http_hooks {
enabled on;
on_dvr http://localhost/IoTCenter/Service/OnDvr;
}
}

3
publish/src/linux-x64/publish/apps/srs2/objs/nginx/html/crossdomain.xml
Unescape View File

@ -1,3 +0,0 @@
<cross-domain-policy>
<allow-access-from domain="*"/>
</cross-domain-policy>

BIN
publish/src/linux-x64/publish/apps/srs2/objs/nginx/html/favicon.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.3 KiB

3
publish/src/linux-x64/publish/apps/srs2/objs/nginx/html/forward/live/livestream.html
Unescape View File

@ -1,3 +0,0 @@
<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
src="livestream.m3u8">
</video>

3
publish/src/linux-x64/publish/apps/srs2/objs/nginx/html/forward/live/livestream_ld.html
Unescape View File

@ -1,3 +0,0 @@
<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
src="livestream_ld.m3u8">
</video>

3
publish/src/linux-x64/publish/apps/srs2/objs/nginx/html/forward/live/livestream_sd.html
Unescape View File

@ -1,3 +0,0 @@
<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
src="livestream_sd.m3u8">
</video>

17
publish/src/linux-x64/publish/apps/srs2/objs/nginx/html/index.html
Unescape View File

@ -1,17 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>SRS</title>
<meta charset="utf-8">
<script type="text/javascript" src="players/js/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="players/js/srs.page.js"></script>
<script type="text/javascript" src="players/js/srs.utility.js"></script>
<script type="text/javascript" src="players/js/winlin.utility.js"></script>
</head>
<body>
<script type="text/javascript">
setTimeout(function(){
window.location.href = "players/index.html" + window.location.search;
}, 500);
</script>
</body>

3
publish/src/linux-x64/publish/apps/srs2/objs/nginx/html/live/demo.html
Unescape View File

@ -1,3 +0,0 @@
<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
src="demo.m3u8">
</video>

3
publish/src/linux-x64/publish/apps/srs2/objs/nginx/html/live/livestream.html
Unescape View File

@ -1,3 +0,0 @@
<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
src="livestream.m3u8">
</video>

3
publish/src/linux-x64/publish/apps/srs2/objs/nginx/html/live/livestream_ld.html
Unescape View File

@ -1,3 +0,0 @@
<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
src="livestream_ld.m3u8">
</video>

3
publish/src/linux-x64/publish/apps/srs2/objs/nginx/html/live/livestream_sd.html
Unescape View File

@ -1,3 +0,0 @@
<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
src="livestream_sd.m3u8">
</video>

1
publish/src/linux-x64/publish/apps/srs2/objs/nginx/html/nginx.html
Unescape View File

@ -1 +0,0 @@
nginx is ok

BIN
publish/src/linux-x64/publish/apps/srs2/objs/srs
View File

Binary file not shown.

16
tools/nginx-1.16.0/conf/nginx.conf
Unescape View File

@ -26,27 +26,20 @@ http {
listen 0.0.0.0:80; listen 0.0.0.0:80;
server_name localhost; server_name localhost;
location ^~ /live/ {
proxy_pass http://localhost:8080/live/;
}
location ^~ /UserCenter/ { location ^~ /UserCenter/ {
proxy_pass http://localhost:8010/; proxy_pass http://localhost:8010/;
#add_header 'Access-Control-Allow-Origin' '*';
#add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, PUT, DELETE';
#add_header 'Access-Control-Allow-Headers' 'Content-Type';
} }
location ^~ /IoTCenter/ { location ^~ /IoTCenter/ {
proxy_pass http://localhost:8011/; proxy_pass http://localhost:8011/;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_read_timeout 86400; proxy_read_timeout 86400;
} }
location ^~ /IoTCenter/App/ { location ^~ /live/ {
proxy_pass http://localhost:8011/App/; proxy_pass http://localhost:8080/live/;
} }
error_page 500 502 503 504 /50x.html; error_page 500 502 503 504 /50x.html;
@ -54,5 +47,4 @@ http {
root html; root html;
} }
} }
}
}
Write Preview
Loading…
Cancel
Save