1.0.0.0814d1

修复录像回放 Former-commit-id: 07d7ab68295ba6175c4dc7d983cf3ffd86baa273 Former-commit-id: b5399474370dd5a3f8e34c0eabdf0d7b8c154983
5 years ago · f4eaf7baab
parent 517a674864
commit f4eaf7baab
24 changed files with 118 additions and 9 deletions
--- a/projects/IoT.Shared/Application/Models/EditLiveRecordModel.cs
+++ b/projects/IoT.Shared/Application/Models/EditLiveRecordModel.cs
@ -9,17 +9,21 @@ namespace Application.Models
    {
        [Display(Name = "设备编号")]
        [ReadOnly(true)]
+        [Required(ErrorMessage = nameof(RequiredAttribute))]
        public string DeviceNumber { get; set; }

        [Display(Name = "设备名称")]
        [ReadOnly(true)]
+        [Required(ErrorMessage = nameof(RequiredAttribute))]
        public string DeviceName { get; set; }

        [Display(Name = "名称")]
+        [Required(ErrorMessage = nameof(RequiredAttribute))]
        public string Name { get; set; }

        [Display(Name = "文件")]
        [ReadOnly(true)]
+        [Required(ErrorMessage = nameof(RequiredAttribute))]
        public string Value { get; set; }
    }
 }
--- a/projects/IoTCenter/Areas/Admin/Controllers/LiveRecordController.cs
+++ b/projects/IoTCenter/Areas/Admin/Controllers/LiveRecordController.cs
@ -26,10 +26,10 @@ namespace IoTCenter.Areas.Admin.Controllers
        {
            ViewData.SelectList(o => model.Query.DeviceNumber, () => this._ajax.GetCameraSelectList(model.Query.DeviceNumber));
            return query
-                .WhereIf(!string.IsNullOrEmpty(model.Query.DeviceNumber), o => o.DeviceNumber == model.Query.DeviceNumber)
+                .WhereIf(!string.IsNullOrEmpty(model.Query.DeviceNumber), o => o.DeviceNumber.Contains(model.Query.DeviceNumber))
                .WhereIf(!string.IsNullOrEmpty(model.Query.DeviceName), o => o.DeviceName.Contains(model.Query.DeviceName))
-                .WhereIf(!string.IsNullOrEmpty(model.Query.Value), o => o.DeviceName.Contains(model.Query.Value))
-                .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.DeviceName.Contains(model.Query.Name));
+                .WhereIf(!string.IsNullOrEmpty(model.Query.Value), o => o.Value.Contains(model.Query.Value))
+                .WhereIf(!string.IsNullOrEmpty(model.Query.Name), o => o.Name.Contains(model.Query.Name));
        }
    }
 }
--- a/projects/Version.cs
+++ b/projects/Version.cs
@ -1,4 +1,4 @@
 using System.Reflection;

 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0.0813d3")]
+[assembly: AssemblyInformationalVersion("1.0.0.0814d1")]
--- a/projects/WebMVC/wwwroot/components/shared/display.html
+++ b/projects/WebMVC/wwwroot/components/shared/display.html
@ -1,6 +1,7 @@
 <template>
    <layout :title="data.schema.title">
        <h1 style="font-size:1.5rem;margin:.5em 0;">{{data.schema.title}}详情页</h1>
+        <slot></slot>
        <div class="row">
            <div class="col-12">
                <div class="card">
@ -67,6 +68,7 @@
                var url = this.baseUrl + this.url;
                axios.get(url).then(function (response) {
                    vm.data = response.data;
+                    vm.$emit('load', vm.data.model);
                });
            },
            hasPermission: function (cmd) {
--- a/projects/WebMVC/wwwroot/components/shared/layout.html
+++ b/projects/WebMVC/wwwroot/components/shared/layout.html
@ -277,7 +277,7 @@
                            </ul>
                        </li>
                        <li class="nav-item" v-if="hasPermission('Read-LiveRecord')">
-                            <router-link :key="$route.fullPath" to="/routes/shared/index.html?area=admin&entity=LiveRecord" :class="getLinkClass('LiveRecord')">
+                            <router-link :key="$route.fullPath" to="/routes/admin/record/index.html?area=admin&entity=LiveRecord" :class="getLinkClass('LiveRecord')">
                                <i class="far fa-circle nav-icon"></i>
                                <p>
                                    回放管理
--- a/projects/WebMVC/wwwroot/routes/admin/record/detail.html
+++ b/projects/WebMVC/wwwroot/routes/admin/record/detail.html
@ -0,0 +1,21 @@
+<template>
+    <display class="child" service="IoTCenter" area="admin" entity="LiveRecord" model="LiveRecord" :id="this.$route.query.id" @load="load">
+        <div style="text-align:center;background-color:#333;height:240px;">
+            <video controls muted autoplay :src="src" style="margin:0 auto;height:100%;"></video>
+        </div>
+    </display>
+</template>
+<script>
+    export default {
+        data: function () {
+            return {
+                src: ''
+            }
+        },
+        methods: {
+            load: function (model) {
+                this.src = model.value;
+            }
+        }
+    }
+</script>
--- a/projects/WebMVC/wwwroot/routes/admin/record/edit.html
+++ b/projects/WebMVC/wwwroot/routes/admin/record/edit.html
@ -0,0 +1,7 @@
+<template>
+    <update service="IoTCenter" area="admin" entity="LiveRecord" model="LiveRecord" :mode="this.$route.query.mode" :id="this.$route.query.id" />
+</template>
+<script>
+    export default {
+    }
+</script>
--- a/projects/WebMVC/wwwroot/routes/admin/record/index.html
+++ b/projects/WebMVC/wwwroot/routes/admin/record/index.html
@ -0,0 +1,7 @@
+<template>
+    <list service="IoTCenter" area="admin" entity="LiveRecord" model="LiveRecord" />
+</template>
+<script>
+    export default {
+    }
+</script>
--- a/publish/build.ps1
+++ b/publish/build.ps1
@ -4,6 +4,12 @@ Copy-Item  ./src/* ./dist -recurse -Exclude @('.gitignore','start-dev.cmd','dock

 Remove-Item ./dist/linux-x64/publish/docker/log/* -recurse -force
 Remove-Item ./dist/linux-x64/publish/docker/data/* -recurse -force
+Remove-Item ./dist/linux-x64/publish/apps/srs/objs/*.log -recurse -force
+Remove-Item ./dist/linux-x64/publish/apps/srs/objs/srs.pid -recurse -force
+Remove-Item ./dist/linux-x64/publish/apps/srs/objs/nginx/html/video/*.mp4 -recurse -force
+Remove-Item ./dist/linux-x64/publish/apps/srs/objs/nginx/html/live/*.png -recurse -force
+Remove-Item ./dist/linux-x64/publish/apps/srs/objs/nginx/html/live/*.m3u8 -recurse -force
+Remove-Item ./dist/linux-x64/publish/apps/srs/objs/nginx/html/live/*.ts -recurse -force

 Copy-Item  ../projects/WebMVC/wwwroot ./dist/linux-x64/publish/apps/WebMVC/wwwroot -recurse
 Copy-Item  ../projects/WebSPA/wwwroot ./dist/linux-x64/publish/apps/WebSPA/wwwroot -recurse
--- a/publish/src/linux-x64/publish/apps/srs/.gitignore
+++ b/publish/src/linux-x64/publish/apps/srs/.gitignore
@ -0,0 +1,6 @@
+*.log
+srs.pid
+*.m3u8
+*.ts
+*.mp4
+*.png
--- a/publish/src/linux-x64/publish/apps/srs/conf/srs.conf
+++ b/publish/src/linux-x64/publish/apps/srs/conf/srs.conf
@ -1,8 +1,8 @@
 listen 1935;
-daemon off;
 max_connections 1000;
 srs_log_tank file;
-srs_log_file ./objs/srs.log;
+srs_log_file ./objs/log/srs.log;
+daemon off;
 http_api {
    enabled on;
    listen 1985;
@ -24,7 +24,7 @@ stats {
 }
 vhost __defaultVhost__ {
    transcode live {
-        enabled on;
+        enabled off;
        ffmpeg ./objs/ffmpeg/bin/ffmpeg;
        engine snapshot {
            enabled on;
@ -60,6 +60,6 @@ vhost __defaultVhost__ {
    }
    http_hooks {
        enabled on;
-        on_dvr http://localhost/IoTCenter/api/v1/Srs/OnDvr;
+        on_dvr http://host.docker.internal/IoTCenter/api/v1/Srs/OnDvr http://172.172.0.80/IoTCenter/api/v1/Srs/OnDvr;
    }
 }
--- a/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/crossdomain.xml
+++ b/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/crossdomain.xml
--- a/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/forward/live/livestream.html
+++ b/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/forward/live/livestream.html
@ -0,0 +1,3 @@
+<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
+    src="livestream.m3u8">
+</video>
--- a/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/forward/live/livestream_ld.html
+++ b/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/forward/live/livestream_ld.html
@ -0,0 +1,3 @@
+<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
+    src="livestream_ld.m3u8">
+</video>
--- a/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/forward/live/livestream_sd.html
+++ b/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/forward/live/livestream_sd.html
@ -0,0 +1,3 @@
+<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
+    src="livestream_sd.m3u8">
+</video>
--- a/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/live/demo.html
+++ b/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/live/demo.html
@ -0,0 +1,3 @@
+<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
+    src="demo.m3u8">
+</video>
--- a/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/live/livestream.html
+++ b/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/live/livestream.html
@ -0,0 +1,3 @@
+<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
+    src="livestream.m3u8">
+</video>
--- a/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/live/livestream_ld.html
+++ b/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/live/livestream_ld.html
@ -0,0 +1,3 @@
+<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
+    src="livestream_ld.m3u8">
+</video>
--- a/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/live/livestream_sd.html
+++ b/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/live/livestream_sd.html
@ -0,0 +1,3 @@
+<video autoplay controls autobuffer type="application/vnd.apple.mpegurl"
+    src="livestream_sd.m3u8">
+</video>
--- a/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/nginx.html
+++ b/publish/src/linux-x64/publish/apps/srs/objs/nginx/html/nginx.html
@ -0,0 +1 @@
+Nginx is ok.
--- a/publish/src/linux-x64/publish/apps/srs/objs/srs
+++ b/publish/src/linux-x64/publish/apps/srs/objs/srs
--- a/tools/srs/.gitignore
+++ b/tools/srs/.gitignore
@ -0,0 +1 @@
+srs
--- a/tools/srs/docker-compose.yml
+++ b/tools/srs/docker-compose.yml
@ -0,0 +1,22 @@
+version: "3.8"
+services:
+  ubuntu:
+    image: ubuntu:16.04
+    working_dir: /root
+    # command: bash -c "while true; do echo hello world; sleep 1; done"
+    command: bash -c "
+      apt-get update
+      &&apt-get install -y sudo 
+      &&apt-get install -y python
+      &&apt-get upgrade -y
+      &&apt-get install -y git
+      &&rm -rf /root/srs/
+      &&git clone https://gitee.com/winlinvip/srs.oschina.git srs
+      &&cd srs/trunk
+      && git remote set-url origin https://github.com/ossrs/srs.git
+      && git pull
+      &&./configure
+      && make"
+    volumes:
+      - ./sources.list:/etc/apt/sources.list
+      - ./srs:/root
--- a/tools/srs/sources.list
+++ b/tools/srs/sources.list
@ -0,0 +1,11 @@
+deb http://mirrors.aliyun.com/ubuntu/ xenial main restricted
+deb http://mirrors.aliyun.com/ubuntu/ xenial-updates main restricted
+deb http://mirrors.aliyun.com/ubuntu/ xenial universe
+deb http://mirrors.aliyun.com/ubuntu/ xenial-updates universe
+deb http://mirrors.aliyun.com/ubuntu/ xenial multiverse
+deb http://mirrors.aliyun.com/ubuntu/ xenial-updates multiverse
+deb http://mirrors.aliyun.com/ubuntu/ xenial-backports main restricted universe multiverse
+
+deb http://mirrors.aliyun.com/ubuntu/ xenial-security main restricted
+deb http://mirrors.aliyun.com/ubuntu/ xenial-security universe
+deb http://mirrors.aliyun.com/ubuntu/ xenial-security multiverse