Former-commit-id: 8e6c8118b102970974adfe690efb4f21c37efdb4
TangShanKaiPing
wanggang 6 years ago
parent 54f3951e85
commit dcc0eaa3a5

@ -5,7 +5,7 @@
@section bread{ @section bread{
<li class="breadcrumb-item"><a href="@Url.Action("Product","Home",new { number=Model})">产品</a></li> <li class="breadcrumb-item"><a href="@Url.Action("Product","Home",new { number=Model})">产品</a></li>
} }
<div id="template" debug="12021250"> <div id="template" debug="12021250">
<style> <style>
h3 img { h3 img {
height: 32px; height: 32px;
@ -160,8 +160,6 @@
</div> </div>
</div> </div>
<!--命令--> <!--命令-->
<div class="row" v-if="model.Commands.length"> <div class="row" v-if="model.Commands.length">
<div class="col-md-12"> <div class="col-md-12">
@ -192,7 +190,7 @@
</div> </div>
</div> </div>
<div style="max-width:100%;max-height:50%;margin:0;padding:0;background:#000;"> <div style="max-width:100%;max-height:50%;margin:0;padding:0;background:#000;">
<video id="liveVideo" class="video" controls autoplay style="width:100%;max-width:100%;height:100%;"></video> <video id="liveVideo" class="video" controls autoplay style="width:100%;max-width:100%;height:100%;" v-on:volumechange="VolumeChange($event)"></video>
</div> </div>
</div> </div>
</div> </div>

@ -283,7 +283,7 @@
<option v-for="c in GetDevices('摄像头')" :value="c.Number">{{c.DisplayName}}</option> <option v-for="c in GetDevices('摄像头')" :value="c.Number">{{c.DisplayName}}</option>
</select> </select>
<div style="width:100%;height:180px;margin:0;padding:0;background:#000;"> <div style="width:100%;height:180px;margin:0;padding:0;background:#000;">
<video id="liveVideo" class="video" controls autoplay style="width:100%;max-width:100%;height:100%;"></video> <video id="liveVideo" class="video" controls autoplay style="width:100%;max-width:100%;height:100%;" v-on:volumechange="VolumeChange($event)"></video>
</div> </div>
</div> </div>
</div> </div>

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

@ -230,7 +230,7 @@
</div> </div>
</div> </div>
<div style="max-width:100%;max-height:50%;margin:0;padding:0;background:#000;"> <div style="max-width:100%;max-height:50%;margin:0;padding:0;background:#000;">
<video id="liveVideo" class="video" controls autoplay style="width:100%;max-width:100%;height:100%;"></video> <video id="liveVideo" class="video" controls autoplay style="width:100%;max-width:100%;height:100%;" v-on:volumechange="VolumeChange($event)"></video>
</div> </div>
</div> </div>
<div class="card"> <div class="card">

@ -16,6 +16,10 @@ loadDataSuccess = function () {
}); });
} }
methods = { methods = {
VolumeChange(e) {
muted = e.target.muted;
volume = e.target.volume;
},
HasChart() { HasChart() {
var o = this.model; var o = this.model;
return o.Name === '温湿度传感器' || o.Name === 'PM2.5感应器' || o.Name === '光强检测器' || o.Name === '智能插座'; return o.Name === '温湿度传感器' || o.Name === 'PM2.5感应器' || o.Name === '光强检测器' || o.Name === '智能插座';

@ -387,7 +387,7 @@ namespace IoTNode.DeviceServices.Onvif
Console.WriteLine($"ffmpeg processes list:{_list.Count},exit:{_process.ExitCode},args:{arguments}"); Console.WriteLine($"ffmpeg processes list:{_list.Count},exit:{_process.ExitCode},args:{arguments}");
if (_process != null) if (_process != null)
{ {
Thread.Sleep(10 * 1000); Thread.Sleep(100);
_process.CancelErrorRead(); _process.CancelErrorRead();
_process.Start(); _process.Start();
_process.BeginErrorReadLine(); _process.BeginErrorReadLine();

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

Loading…
Cancel
Save