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

update

Browse Source 
Former-commit-id: 72c2d3348a786e675363c0475126aea9e9937c24
TangShanKaiPing
wanggang 6 years ago
parent be032ce6c3
commit 525abe200a
7 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
projects/IoT/IoT.Shared/Infrastructure/ClientService.cs
Unescape View File

@ -76,7 +76,9 @@ namespace IoT.Shared.Infrastructure
try
{
Console.WriteLine("send device to server");
this.ClientToServer("UpdateDevice", device.ToJson());
var device2 = device.ToJson().FromJson<Device>();
device2.Data.RemoveAll(o => o.Hidden);
this.ClientToServer("UpdateDevice", device2.ToJson());
}
catch (Exception ex)
{

4
projects/IoT/IoTServices/FBeeService/Infrastructure/DeviceService.cs
Unescape View File

@ -549,9 +549,9 @@ namespace FBeeService
device.AddorUpdateData(Keys.State, switchState == 0 ? "关" : (switchState == 1 ? "关" : "停"), DeviceDataType.String, "状态");
}
var battery = ms.ReadByte();
device.AddorUpdateData(Keys.Battery, battery, DeviceDataType.Int, Keys.Battery);
device.AddorUpdateData(Keys.Battery, battery, DeviceDataType.Int, Keys.Battery, hidden: true);
var epCount = ms.ReadByte();
device.AddorUpdateData(Keys.EndPointCount, battery, DeviceDataType.Int, Keys.EndPointCount);
device.AddorUpdateData(Keys.EndPointCount, battery, DeviceDataType.Int, Keys.EndPointCount, hidden: true);
var historyData = ms.ReadHexString(4);
device.AddorUpdateData(Keys.Data, historyData, DeviceDataType.String, Keys.Data, hidden: true);
device.AddorUpdateData(Keys.ZoneType, zoneType, DeviceDataType.String, Keys.ZoneType, hidden: true);

6
projects/IoT/IoTServices/ONVIFService/Controllers/CameraController.cs
Unescape View File

@ -6,12 +6,12 @@ using System;
namespace ONVIFService.Controllers
{
[SwaggerTag("网关")]
public class GatewayController : BaseDeviceController
[SwaggerTag("摄像头")]
public class CameraController : BaseDeviceController
{
private readonly DeviceService _deviceService;
public GatewayController(IServiceProvider applicationServices, DeviceService deviceService) : base(applicationServices)
public CameraController(IServiceProvider applicationServices, DeviceService deviceService) : base(applicationServices)
{
this._deviceService = deviceService;
}

2
projects/IoT/IoTServices/ONVIFService/Infrastructure/DeviceService.cs
Unescape View File

@ -181,7 +181,7 @@ namespace ONVIFService
device.AddorUpdateData("HasAuth", hasAuth ? "是" : "否", DeviceDataType.String, "已认证");
device.AddorUpdateData("DeviceUrl", ipCamera.DeviceUrl, DeviceDataType.String, "设备地址");
device.AddorUpdateData("PtzAddress", ipCamera.PTZAddress, DeviceDataType.String, "云台地址");
device.AddorUpdateData("Ptz3DZoomSupport", ipCamera.Ptz3DZoomSupport, DeviceDataType.String, "缩放支持");
device.AddorUpdateData("Ptz3DZoomSupport", ipCamera.Ptz3DZoomSupport ? "是" : "否", DeviceDataType.String, "缩放支持");
device.AddorUpdateData("MainToken", ipCamera.Profiles.First().Token, DeviceDataType.String, "主码流Token");
device.AddorUpdateData("SubToken", ipCamera.Profiles.Last().Token, DeviceDataType.String, "子码流Token");
device.AddorUpdateData("MainStreamUri", ipCamera.MainStreamUri, DeviceDataType.String, "主码流地址");

4
projects/IoTClient/Assets/StreamingAssets/wwwroot/css/app.css
Unescape View File

@ -83,6 +83,10 @@ form.device label{
line-height:34px;
vertical-align:middle;
}
video.video{
width:100%;
height:100%;
}
/*html5 input rang style*/
input[type=range] {
-webkit-appearance: none;

26
projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html
Unescape View File

@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="Content-Security-Policy" content="default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: gap: content:">
<!--<meta http-equiv="Content-Security-Policy" content="default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: gap: content:">-->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui, viewport-fit=cover">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="default">
@ -634,6 +634,30 @@
</div>
</div>
</template>
<template v-if="getDevices('摄像头').length">
<div class="block-title">摄像头</div>
<div class="block block-strong">
<div class="row">
<div class="col-100 tablet-50 desktop-25" v-for="device in getDevices('摄像头')">
<video class="flv video" muted controls autoplay :src="getData(device,'主码流flv')"></video>
<div class="row" style="text-align:center;">
<a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call('',device.Number,'/Camera/Up')">上</a>
</div>
<div class="row">
<a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call('',device.Number,'/Camera/Zoomin')">大</a>
<a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call('',device.Number,'/Camera/Left')">左</a>
<a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call('',device.Number,'/Camera/Stop')">停</a>
<a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call('',device.Number,'/Camera/Right')">右</a>
<a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call('',device.Number,'/Camera/Zoomout')">小</a>
</div>
<div class="row">
<a class="button button-large button-raised button-fill" href="javascript: ;" v-on:click="call('',device.Number,'/Camera/Down')">下</a>
</div>
</div>
</div>
</div>
</template>
</f7-page>
</template>
<template id="page-device">

BIN
projects/IoTClient/Assets/StreamingAssets/wwwroot/js/app.js
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save