1.0.0-rc.105

Former-commit-id: ce9646396a64f465900c49af3732704ec57dd5bd
TangShanKaiPing
wanggang 6 years ago
parent 1699ff4c94
commit bb2db44782

@ -48,7 +48,7 @@
border-radius: 5px;
}
/**/
.fancybox img.thumbnail, td .fancybox img {
.fancybox img.thumbnail, td .fancybox img, .form-control .fancybox img {
max-width: 30px;
max-height: 30px;
}

@ -308,7 +308,7 @@
<ul class="nav nav-tabs card-tools" role="tablist">
<li class="nav-item"><a class="nav-link active" :href="'#tab_1'+model.Number" data-toggle="tab">空调</a></li>
<li class="nav-item"><a class="nav-link" :href="'#tab_2'+model.Number" data-toggle="tab">电视</a></li>
<li class="nav-item"><a class="nav-link" :href="'#tab_3'+model.Number" data-toggle="tab">图影仪</a></li>
<li class="nav-item"><a class="nav-link" :href="'#tab_3'+model.Number" data-toggle="tab">机顶盒</a></li>
<li class="nav-item"><a class="nav-link" :href="'#tab_4'+model.Number" data-toggle="tab">自定义</a></li>
</ul>
</div>
@ -461,6 +461,20 @@
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="card-header">
<h3 class="card-title">遥控器匹配</h3>
<div class="card-tools">
<button class="btn btn-sm btn-success" v-on:click="CallApi(model.Number,'/Ir/MathAir1')">空调匹配</button>
<button class="btn btn-sm btn-success" v-on:click="CallApi(model.Number,'/Ir/MathAir2')">电视匹配</button>
<button class="btn btn-sm btn-success" v-on:click="CallApi(model.Number,'/Ir/MathAir3')">机顶盒匹配</button>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="card">

@ -391,7 +391,7 @@
<ul class="nav nav-tabs card-tools" role="tablist">
<li class="nav-item"><a class="nav-link active" :href="'#tab_1'+device.Number" data-toggle="tab">空调</a></li>
<li class="nav-item"><a class="nav-link" :href="'#tab_2'+device.Number" data-toggle="tab">电视</a></li>
<li class="nav-item"><a class="nav-link" :href="'#tab_3'+device.Number" data-toggle="tab">图影仪</a></li>
<li class="nav-item"><a class="nav-link" :href="'#tab_3'+device.Number" data-toggle="tab">机顶盒</a></li>
<li class="nav-item"><a class="nav-link" :href="'#tab_4'+device.Number" data-toggle="tab">自定义</a></li>
</ul>
</div>

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

@ -319,7 +319,7 @@
<f7-toolbar tabbar bottom>
<f7-link :tab-link="'#tab_1'+model.Number" tab-link-active>空调</f7-link>
<f7-link :tab-link="'#tab_2'+model.Number">电视</f7-link>
<f7-link :tab-link="'#tab_3'+model.Number">图影仪</f7-link>
<f7-link :tab-link="'#tab_3'+model.Number">机顶盒</f7-link>
<f7-link :tab-link="'#tab_4'+model.Number">自定义</f7-link>
</f7-toolbar>
<f7-tabs class="tab-content" style="min-height:176px;">
@ -468,6 +468,16 @@
</f7-tabs>
</div>
</div>
<div class="card">
<div class="card-header">
遥控器匹配
<div class="row">
<label class="button button-raised" v-on:click="CallApi(model.Number,'/Ir/MathAir1')">空调匹配</label>
<label class="button button-raised" v-on:click="CallApi(model.Number,'/Ir/MathAir2')">电视匹配</label>
<label class="button button-raised" v-on:click="CallApi(model.Number,'/Ir/MathAir3')">机顶盒匹配</label>
</div>
</div>
</div>
<div class="card">
<div class="card-header">
自定义指令

@ -1,5 +1,5 @@
//
var version = '1.0.0-rc.101';
var version = '1.0.0-rc.105';
var isDebug = isDebug || false;
var useSignalR = useSignalR || false;
var isApp = location.href.indexOf('http') !== 0;

@ -342,7 +342,7 @@
<f7-toolbar tabbar bottom>
<f7-link :tab-link="'#tab_1'+device.Number" tab-link-active>空调</f7-link>
<f7-link :tab-link="'#tab_2'+device.Number">电视</f7-link>
<f7-link :tab-link="'#tab_3'+device.Number">图影仪</f7-link>
<f7-link :tab-link="'#tab_3'+device.Number">机顶盒</f7-link>
<f7-link :tab-link="'#tab_4'+device.Number">自定义</f7-link>
</f7-toolbar>
<f7-tabs class="tab-content" style="min-height:176px;">

@ -1 +1 @@
25f978cc1dc22e8729d0400a5d8b6b66728855d5
db18615540b78f52eae016df7a574ae5a1b6f934

@ -3,7 +3,6 @@ using IoTNode.DeviceServices.FBee;
using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
using System;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace IoTNode.Controllers
@ -47,5 +46,32 @@ namespace IoTNode.Controllers
this._deviceService.UpdateButtons(number, buttons);
});
}
[HttpGet, Route("/[controller]/[action]"), SwaggerOperation("")]
public ApiResponse MathAir1([SwaggerParameter("设备编号")]string number)
{
return this.AsyncAction(() =>
{
this._deviceService.IRMath(number, 1);
});
}
[HttpGet, Route("/[controller]/[action]"), SwaggerOperation("")]
public ApiResponse MathAir2([SwaggerParameter("设备编号")]string number)
{
return this.AsyncAction(() =>
{
this._deviceService.IRMath(number, 2);
});
}
[HttpGet, Route("/[controller]/[action]"), SwaggerOperation("")]
public ApiResponse MathAir3([SwaggerParameter("设备编号")]string number)
{
return this.AsyncAction(() =>
{
this._deviceService.IRMath(number, 3);
});
}
}
}

@ -76,6 +76,24 @@ namespace IoTNode.DeviceServices.FBee
}
}
public void IRMath(string number, byte type)
{
using (var scope = _applicationServices.CreateScope())
{
var deviceRepo = scope.ServiceProvider.GetService<IRepository<Device>>();
var device = deviceRepo.Table().Include(o => o.Data).FirstOrDefault(o => o.Number == number);
if (device != null)
{
var values = number.Split('-');
var version = device.Data.FirstOrDefault(o => o.Key == Keys.Version)?.Value;
if (version != null)
{
this.XA70081(values[0], values[1], version, type);
}
}
}
}
public override void Execute()
{
var ips = NetworkInterface.GetAllNetworkInterfaces()
@ -1062,8 +1080,8 @@ namespace IoTNode.DeviceServices.FBee
list.AddRange(new byte[] { 0x81, 0x00 });
list.Add(type);
list[1] = (byte)(list.Count() - 3 + 2);
list.Add((byte)list.Skip(3).Take(12).Select(o => (int)o).Sum());
list.Add(0x0a);
list.Add((byte)list.Skip(list.Count - 10).Take(10).Select(o => (int)o).Sum());
//list.Add(0x1a);
this.Write(sn, RequestType.xa7, ieee, list, 2);
}
@ -1130,7 +1148,7 @@ namespace IoTNode.DeviceServices.FBee
list.AddRange(BitConverter.GetBytes(code));
list[1] = (byte)(list.Count() - 3 + 2);
list.Add((byte)list.Skip(5).Take(12).Select(o => (int)o).Sum());
list.Add(0x0a);
//list.Add(0x1a);
this.Write(sn, RequestType.xa7, ieee, list, 2);
}

@ -31,11 +31,11 @@ namespace IoTNode
services.AddTransient<IEmailSender, EmptyEmailSender>();
services.AddTransient<IoTNodeJob>();
services.AddSingleton<IoTNodeClient>();
services.AddSingleton<OnvifService>();
//services.AddSingleton<OnvifService>();
services.AddSingleton<FBeeService>();
//services.AddSingleton<SerialPortService>();
services.AddHostedService(o => o.GetService<IoTNodeClient>());
services.AddHostedService(o => o.GetService<OnvifService>());
//services.AddHostedService(o => o.GetService<OnvifService>());
services.AddHostedService(o => o.GetService<FBeeService>());
//services.AddHostedService(o => o.GetService<SerialPortService>());
base.ConfigureServices(services);

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

Loading…
Cancel
Save