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

1.0.0-rc.1217

Browse Source 
Former-commit-id: e2ce7b84fcbc087e09a79a63b003dcf2117538c8
TangShanKaiPing
wanggang 6 years ago
parent 9a62ff092a
commit 4eb34a28f6
11 changed files with 1804 additions and 1531 deletions
Show Stats Download Patch File Download Diff File

BIN
docs/物联网管控平台.pptx
View File

Binary file not shown.

11
projects/IoT.Shared/Application/Models/EditIRCodeViewModel.cs
Unescape View File

@ -0,0 +1,11 @@
namespace Application.Models
{
public class EditIRCodeViewModel
{
public string InputName { get; set; }
public string Name { get; set; }
public int Type { get; set; }
public int Code { get; set; }
public string Buttons { get; set; }
}
}

15
projects/IoT.Shared/Areas/Admin/Controlls/CommandController.cs
Unescape View File

@ -41,6 +41,19 @@ namespace IoT.Shared.Areas.Admin.Controlls
return PartialView("_Api", model);
}
public IActionResult Code(string name, int type, int code, Guid deviceId)
{
var model = new EditIRCodeViewModel
{
InputName = name,
Name = "指令",
Type = type,
Code = code,
Buttons = this._deviceRepo.ReadOnlyTable().Include(o => o.Data).FirstOrDefault(o => o.Id == deviceId).Data.FirstOrDefault(o => o.Name == "指令").Value
};
return PartialView("_Code", model);
}
public override void ToDisplayModel(Command entity, EditCommandModel model)
{
if (entity != null)
@ -68,7 +81,7 @@ namespace IoT.Shared.Areas.Admin.Controlls
{
var api = this._apiRepo.ReadOnlyTable().Include(o => o.Parameters).FirstOrDefault(o => o.Id == apiId);
var device = this._deviceRepo.ReadOnlyTable().Include(o => o.Data).FirstOrDefault(o => o.Id == deviceId);
ViewData["Number"] = device.Number;
ViewBag.Device = device;
var parameters = api.Parameters.Where(o => o.Description != "设备编号").ToList().Select(o => o.To<EditApiParameterModel>()).ToList();
if (!string.IsNullOrEmpty(queryString))
{

58
projects/IoT.Shared/Areas/Admin/Views/Command/_Api.cshtml
Unescape View File

@ -1,6 +1,7 @@
@model List<EditApiParameterModel>
@if (Model != null && Model.Count > 0)
{
var device = ViewBag.Device as Device;
int i = 0;
foreach (var item in Model)
{
@ -13,24 +14,59 @@
@Html.Hidden($"Parameters[{i}].Name", item.Name)
@if (item.Name == "id")
{
<input type="hidden" name="@name" value="@ViewData["Number"]" />
<input type="hidden" name="@name" value="@device.Number" />
}
else
{
<div class="form-group row">
<lable class="col-sm-2 col-form-label required">@item.Description：</lable>
<div class="col-sm-8">
@if (item.SelectList != null)
@if (device.Name == "串口控制器" && item.Description == "命令")
{
var selectList = device.Data.FirstOrDefault(o => o.Name == "指令").Value.FromJson<List<SPCommandModel>>()
.Select(o => new SelectListItem { Text = o.Name, Value = o.Name, Selected = item.Value == o.Name });
<div class="form-group row">
<lable class="col-sm-2 col-form-label required">@item.Description：</lable>
<div class="col-sm-8">
@Html.DropDownList(name, selectList, "选择", new { @class = "form-control select search", data_val = "true", data_val_required = "请选择" })
@Html.ValidationMessage(name)
</div>
</div>
}
else if (device.Name == "红外转发器" && item.Description == "按键类型")
{
var selectList = new List<SelectListItem> {
new SelectListItem{ Value="1",Text="空调",Selected=item.Value=="1" },
new SelectListItem{ Value="2",Text="电视",Selected=item.Value=="2" },
new SelectListItem{ Value="3",Text="机顶盒",Selected=item.Value=="3" },
new SelectListItem{ Value="5",Text="自定义",Selected=item.Value=="5" }
};
<div class="form-group row">
<lable class="col-sm-2 col-form-label required">@item.Description：</lable>
<div class="col-sm-8">
@Html.DropDownList(name, selectList, "选择", new { @class = "form-control select search irKeyType", data_val = "true", data_val_required = "请选择" })
@Html.ValidationMessage(name)
</div>
</div>
}
else if (device.Name == "红外转发器" && item.Description == "键值")
{
var keyType = Model.FirstOrDefault(o => o.Description == "按键类型")?.Value;
<div id="ajax2" data-name="@name">
@if (!string.IsNullOrEmpty(keyType))
{
@Html.DropDownList(name, item.SelectList, "请选择", new { @class = "form-control select search", data_val = "true", data_val_required = $"请输入{item.Description}" })
var buttons = device.Data.FirstOrDefault(o => o.Name == "指令").Value;
@(await Html.PartialAsync("_Code", new EditIRCodeViewModel { InputName = name, Name = item.Description, Type = Convert.ToInt32(keyType), Code = Convert.ToInt32(item.Value), Buttons = buttons }))
}
else
{
</div>
}
else
{
<div class="form-group row">
<lable class="col-sm-2 col-form-label required">@item.Description：</lable>
<div class="col-sm-8">
<input class="form-control" name="@name" type="@Html.Raw(type)" data-val="true" value="@item.Value" @Html.Raw(required) @Html.Raw(range) @Html.Raw(minimum) @Html.Raw(maximum) />
}
@Html.ValidationMessage(name)
@Html.ValidationMessage(name)
</div>
</div>
</div>
}
}
i += 1;
}

195
projects/IoT.Shared/Areas/Admin/Views/Command/_Code.cshtml
Unescape View File

@ -0,0 +1,195 @@
@model EditIRCodeViewModel
<div class="form-group row">
<lable class="col-sm-2 col-form-label required">@Model.Name：</lable>
<div class="col-sm-8" id="ircodediv">
@if (Model.Type == 1)
{
var values = GetCode(Model.Code);
<input class="form-control" id="ircodeid" name="@Model.InputName" type="text" data-val="true" data-val-required="必填项" value="@Model.Code" />
<label class="btn">电源</label>
<label class="btn btn-sm btn-success"><input onchange="AirChange(event)" name="power" type="radio" value="2" @Html.Raw(values.power == 2 ? "checked" : "") />开</label>
<label class="btn btn-sm btn-success"><input onchange="AirChange(event)" name="power" type="radio" value="1" @Html.Raw(values.power == 1 ? "checked" : "") />关</label>
<label class="btn">模式</label>
<label class="btn btn-sm btn-success"><input onchange="AirChange(event)" name="pattern" type="radio" value="0" @Html.Raw(values.pattern == 0 ? "checked" : "") />制冷</label>
<label class="btn btn-sm btn-success"><input onchange="AirChange(event)" name="pattern" type="radio" value="120" @Html.Raw(values.pattern == 120 ? "checked" : "") />自动</label>
<label class="btn btn-sm btn-success"><input onchange="AirChange(event)" name="pattern" type="radio" value="240" @Html.Raw(values.pattern == 240 ? "checked" : "") />制热</label>
<label class="btn btn-sm btn-success"><input onchange="AirChange(event)" name="pattern" type="radio" value="360" @Html.Raw(values.pattern == 360 ? "checked" : "") />抽湿</label>
<label class="btn btn-sm btn-success"><input onchange="AirChange(event)" name="pattern" type="radio" value="480" @Html.Raw(values.pattern == 480 ? "checked" : "") />送风</label>
<br />
<lable class="btn">风向</lable>
<label class="btn btn-sm btn-success"><input onchange="AirChange(event)" name="direction" type="radio" value="0" @Html.Raw(values.direction == 0 ? "checked" : "") />任意</label>
<label class="btn btn-sm btn-success"><input onchange="AirChange(event)" name="direction" type="radio" value="60" @Html.Raw(values.direction == 60 ? "checked" : "") />手动</label>
<label class="btn btn-sm btn-success"><input onchange="AirChange(event)" name="direction" type="radio" value="75" @Html.Raw(values.direction == 75 ? "checked" : "") />自动</label>
<lable class="btn">风量</lable>
<label class="btn btn-sm btn-success"><input onchange="AirChange(event)" name="wind" type="radio" value="0" @Html.Raw(values.wind == 0 ? "checked" : "") />自动</label>
<label class="btn btn-sm btn-success"><input onchange="AirChange(event)" name="wind" type="radio" value="15" @Html.Raw(values.wind == 15 ? "checked" : "") />高</label>
<label class="btn btn-sm btn-success"><input onchange="AirChange(event)" name="wind" type="radio" value="30" @Html.Raw(values.wind == 30 ? "checked" : "") />中</label>
<label class="btn btn-sm btn-success"><input onchange="AirChange(event)" name="wind" type="radio" value="45" @Html.Raw(values.wind == 45 ? "checked" : "") />低</label>
<br />
<lable class="btn">温度</lable>
<input onchange="AirChange(event)" name="temperature" type="range" step="1" min="1" max="15" value="@values.temperature" style="width:80%;" />
}
else if (Model.Type == 2)
{
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 1 ? "checked" : "") value="1" />POWR</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 2 ? "checked" : "") value="2" />AV</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 3 ? "checked" : "") value="3" />1</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 4 ? "checked" : "") value="4" />2</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 5 ? "checked" : "") value="5" />3</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 6 ? "checked" : "") value="6" />4</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 7 ? "checked" : "") value="7" />5</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 8 ? "checked" : "") value="8" />6</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 9 ? "checked" : "") value="9" />7</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 10 ? "checked" : "") value="10" />8</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 11 ? "checked" : "") value="11" />9</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 12 ? "checked" : "") value="12" />0</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 13 ? "checked" : "") value="13" />返回</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 14 ? "checked" : "") value="14" />退出</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 15 ? "checked" : "") value="15" />静音</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 16 ? "checked" : "") value="16" />菜单</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 17 ? "checked" : "") value="17" />音量+</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 18 ? "checked" : "") value="18" />音量-</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 19 ? "checked" : "") value="19" />上</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 20 ? "checked" : "") value="20" />下</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 21 ? "checked" : "") value="21" />左</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 22 ? "checked" : "") value="22" />右</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 26 ? "checked" : "") value="26" />快退</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 27 ? "checked" : "") value="27" />播放</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 28 ? "checked" : "") value="28" />快进</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 29 ? "checked" : "") value="29" />录像</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 30 ? "checked" : "") value="30" />暂停</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 31 ? "checked" : "") value="31" />停止</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 23 ? "checked" : "") value="23" />OK</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 24 ? "checked" : "") value="24" />ch+</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 25 ? "checked" : "") value="25" />ch-</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 32 ? "checked" : "") value="32" />A</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 33 ? "checked" : "") value="33" />B</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 34 ? "checked" : "") value="34" />C</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 35 ? "checked" : "") value="35" />D</label>
}
else if (Model.Type == 3)
{
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 1 ? "checked" : "") value="1" />PW-ON</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 2 ? "checked" : "") value="2" />PW-OFF</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 3 ? "checked" : "") value="3" />1</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 4 ? "checked" : "") value="4" />2</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 5 ? "checked" : "") value="5" />3</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 6 ? "checked" : "") value="6" />4</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 7 ? "checked" : "") value="7" />5</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 8 ? "checked" : "") value="8" />6</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 9 ? "checked" : "") value="9" />7</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 10 ? "checked" : "") value="10" />8</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 11 ? "checked" : "") value="11" />9</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 12 ? "checked" : "") value="12" />0</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 13 ? "checked" : "") value="13" />CLEAR</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 14 ? "checked" : "") value="14" />退出</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 15 ? "checked" : "") value="15" />静音</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 16 ? "checked" : "") value="16" />菜单</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 17 ? "checked" : "") value="17" />音量+</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 18 ? "checked" : "") value="18" />音量-</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 19 ? "checked" : "") value="19" />上</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 20 ? "checked" : "") value="20" />下</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 21 ? "checked" : "") value="21" />左</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 22 ? "checked" : "") value="22" />右</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 26 ? "checked" : "") value="26" />鼠标L</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 27 ? "checked" : "") value="27" />节能</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 28 ? "checked" : "") value="28" />鼠标R</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 29 ? "checked" : "") value="29" />局部放大+</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 30 ? "checked" : "") value="30" />局部放大-</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 31 ? "checked" : "") value="31" />冻结</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 23 ? "checked" : "") value="23" />ENTER</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 24 ? "checked" : "") value="24" />page+</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 25 ? "checked" : "") value="25" />page-</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 32 ? "checked" : "") value="32" />梯形修正</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 33 ? "checked" : "") value="33" />图像</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 34 ? "checked" : "") value="34" />ID SET</label>
<label class="btn btn-sm btn-success"><input onchange="CodeChange(event)" name="@Model.InputName" type="radio" @Html.Raw(Model.Code == 35 ? "checked" : "") value="35" />自动调整</label>
}
else if (Model.Type == 5)
{
var selectList = Model.Buttons.FromJson<List<ButtonModel>>()
.Select(o => new SelectListItem { Text = o.Name, Value = o.Value, Selected = Model.Code.ToString() == o.Value });
@Html.DropDownList(Model.InputName, selectList, "选择", new { @class = "form-control select search", data_val = "true", data_val_required = "请选择" })
}
@Html.ValidationMessage(Model.InputName)
</div>
</div>
@functions{
public (int pattern, int direction, int wind, int power, int temperature) GetCode(int code)
{
var pattern = 0;
var direction = 0;
var wind = 0;
var power = 2;
var temperature = 1;
if (code > 480 + 2)
{
pattern = 480;
}
else if (code > 360 + 2)
{
pattern = 360;
}
else if (code > 240 + 2)
{
pattern = 240;
}
else if (code > 120 + 2)
{
pattern = 120;
}
else
{
pattern = 0;
}
code -= pattern;
if (code > 75 + 2)
{
direction = 75;
}
else if (code > 60 + 2)
{
direction = 60;
}
else
{
direction = 0;
}
code -= direction;
if (code > 45 + 2)
{
wind = 45;
}
else if (code > 30 + 2)
{
wind = 30;
}
else if (code > 15 + 2)
{
wind = 15;
}
else
{
wind = 0;
}
code -= wind;
if (code == 1)
{
power = 1;
}
else
{
power = 2;
temperature = code - power;
}
return (
pattern,
direction,
wind,
power,
temperature
);
}
}

45
projects/IoT.Shared/Areas/Admin/Views/Command/_Script.cshtml
Unescape View File

@ -21,7 +21,50 @@
$('#ajax').html(html);
reset();
});
});
$('body').on('change','.irKeyType',function () {
var id = $(this).find(':selected').val();
$('#ajax2').html('');
if (id) {
var url = '@Url.Action("Code")?type=' + encodeURI(id) + '&code=' + encodeURI($('#ircodeid').val())+ '&name=' + encodeURI($('#ajax2').attr('data-name'))+ '&deviceId=' + encodeURI($('#DeviceId').val());
$.get(url, function (html) {
$('#ajax2').html(html);
reset();
});
}
});
$('body').on('change,load',"input[type='range']",function (e) {
$(this).attr('data-value',e.target.value);
});
});
function AirChange(e) {
var form = $('#ircodediv');
var list = {};
list['power'] = form.find("[name = 'power']:checked").val();
list['pattern'] = form.find("[name = 'pattern']:checked").val();
list['direction'] = form.find("[name = 'direction']:checked").val();
list['wind'] = form.find("[name = 'wind']:checked").val();
list['temperature'] = form.find("[name = 'temperature']").val();
list[event.target.name] = event.target.value;
code = 0;
for (var name in list) {
code += parseInt(list[name]);
}
$('#ircodeid').val(code);
}
function CodeChange(e) {
var form = $('#ircodediv');
var list = {};
list['power'] = form.find("[name = 'power']:checked").val();
list['pattern'] = form.find("[name = 'pattern']:checked").val();
list['direction'] = form.find("[name = 'direction']:checked").val();
list['wind'] = form.find("[name = 'wind']:checked").val();
list['temperature'] = form.find("[name = 'temperature']").val();
list[event.target.name] = event.target.value;
code = 0;
for (var name in list) {
code += parseInt(list[name]);
}
$('#ircodeid').val(code);
}
</script>

2
projects/IoTCenter/appsettings.json
Unescape View File

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

1238
projects/IoTClient/Assembly-CSharp-Editor.csproj
View File

File diff suppressed because it is too large Load Diff

1764
projects/IoTClient/Assembly-CSharp.csproj
View File

File diff suppressed because it is too large Load Diff

3
projects/IoTClient/Assets/StreamingAssets/wwwroot/js/device.js
Unescape View File

@ -201,6 +201,9 @@ methods = {
Vue.nextTick(function () {
ajax(url, null, 'get');
});
},
GetCommands() {
return Enumerable.from(this.model.Commands).orderBy('o=>o.DisplayOrder').toArray();
}
};
function onMessage(method, json, to, from) {

4
projects/IoTClient/IoTClient.sln
Unescape View File

@ -1,6 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{EF6565BD-C12A-AF2F-9766-E75AAE388FD9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{74FE0653-2917-AAD7-D8C4-EFCC5DE2DC43}"

Write Preview
Loading…
Cancel
Save