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

update

Browse Source 
Former-commit-id: 604c0061d76425e5d005d1de9303153954ab13ff
TangShanKaiPing
wanggang 5 years ago
parent fc5f84f893
commit c216a8bade
9 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File

3
projects/IoT.Shared/Application/Models/Users/EditPermissionModel.cs
Unescape View File

@ -1,6 +1,5 @@
using Infrastructure.Application; using Infrastructure.Application;
using System; using System;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
namespace Application.Models namespace Application.Models
@ -8,7 +7,7 @@ namespace Application.Models
[Display(Name = "权限")] [Display(Name = "权限")]
public class EditPermissionModel : EditModel public class EditPermissionModel : EditModel
{ {
[Display(Name = "分类")] [Display(Name = "分类"), Required]
[DataType("SelectList")] [DataType("SelectList")]
public Guid? CategoryId { get; set; } public Guid? CategoryId { get; set; }

1
projects/IoTCenter/wwwroot/images/lamp.svg
Unescape View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1591081256612" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4095" xmlns:xlink="http://www.w3.org/1999/xlink" width="1024" height="1024"><defs><style type="text/css"></style></defs><path d="M722.96 145.857c-116.348-109.215-305.572-109.215-421.898 0-115.132 108.113-116.325 283.32-3.488 392.805l67.523 126.09 53.28-25.132-71.752-134.077-3.375-3.195c-93.038-87.345-93.038-229.5 0-316.868 93.015-87.345 244.462-87.345 337.523 0 92.992 87.367 92.992 229.5 0 316.868l-75.532 137.228 53.235 25.222 67.928-126.113c112.86-109.463 111.667-284.715-3.442-392.828z m-333.9 561.488l7.155 55.598L634.85 735.83l-7.178-55.62-238.613 27.135z m0 84.015l7.155 55.598 238.635-27.067-7.178-55.687-238.613 27.157z m122.265 112.68c-16.47 0-29.835-12.577-29.835-27.99h-59.647c0 46.373 40.162 84.015 89.505 84.015s89.505-37.665 89.505-84.015h-59.692c-0.045 15.412-13.455 27.99-29.835 27.99zM332.99 343.88h59.67c0-61.785 53.505-112.028 119.295-112.028v-56.025c-98.662 0-178.965 75.375-178.965 168.053z" p-id="4096" fill="#07c160"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

2
projects/IoTCenter/wwwroot/js/site.js
Unescape View File

@ -1,5 +1,5 @@
function urlContent2(baseUrl,path) { function urlContent2(baseUrl,path) {
if (path.startsWith("/dfs/")) { if (!path.startsWith("/dfs/")) {
return baseUrl + path; return baseUrl + path;
} }
return path; return path;

10
projects/IoTNode/DeviceServices/FBee/FBeeService.cs
Unescape View File

@ -687,7 +687,7 @@ namespace IoTNode.DeviceServices.FBee
{ {
//this.X85(sn, ieee); //this.X85(sn, ieee);
} }
if (deviceId == 0x0220) if (deviceId == 0x0210 || deviceId == 0x0220)
{ {
this.X86(sn, ieee); this.X86(sn, ieee);
this.X87(sn, ieee); this.X87(sn, ieee);
@ -804,7 +804,7 @@ namespace IoTNode.DeviceServices.FBee
/// <param name="sn"></param> /// <param name="sn"></param>
/// <param name="ieee"></param> /// <param name="ieee"></param>
/// <param name="value">0-255</param> /// <param name="value">0-255</param>
public void X83(string sn, string ieee, [Range(0, 255)]byte brightness) public void X83(string sn, string ieee, [Range(0, 255)] byte brightness)
{ {
var list = new List<byte> var list = new List<byte>
{ {
@ -843,7 +843,7 @@ namespace IoTNode.DeviceServices.FBee
/// <summary> /// <summary>
/// 0x84设置指定设备的颜色，即色调和饱和度 /// 0x84设置指定设备的颜色，即色调和饱和度
/// </summary> /// </summary>
public void X84(string sn, string ieee, [Range(0, 255)]byte hue, [Range(0, 255)]byte saturation) public void X84(string sn, string ieee, [Range(0, 255)] byte hue, [Range(0, 255)] byte saturation)
{ {
var list = new List<byte> var list = new List<byte>
{ {
@ -1025,7 +1025,7 @@ namespace IoTNode.DeviceServices.FBee
/// <summary> /// <summary>
/// 0xa8设置指定设备的色温 /// 0xa8设置指定设备的色温
/// </summary> /// </summary>
public void XA8(string sn, string ieee, [Range(2700, 6500)]ushort color) public void XA8(string sn, string ieee, [Range(2700, 6500)] ushort color)
{ {
var list = new List<byte>(); var list = new List<byte>();
list.AddRange(BitConverter.GetBytes(color)); list.AddRange(BitConverter.GetBytes(color));
@ -1085,7 +1085,7 @@ namespace IoTNode.DeviceServices.FBee
/// </summary> /// </summary>
/// <param name="sn"></param> /// <param name="sn"></param>
/// <param name="ieee"></param> /// <param name="ieee"></param>
public void XA70081(string sn, string ieee, string version, [Range(1, 5)]byte type) public void XA70081(string sn, string ieee, string version, [Range(1, 5)] byte type)
{ {
var list = new List<byte> var list = new List<byte>
{ {

1
projects/IoTNode/wwwroot/images/lamp.svg
Unescape View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1591081256612" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4095" xmlns:xlink="http://www.w3.org/1999/xlink" width="1024" height="1024"><defs><style type="text/css"></style></defs><path d="M722.96 145.857c-116.348-109.215-305.572-109.215-421.898 0-115.132 108.113-116.325 283.32-3.488 392.805l67.523 126.09 53.28-25.132-71.752-134.077-3.375-3.195c-93.038-87.345-93.038-229.5 0-316.868 93.015-87.345 244.462-87.345 337.523 0 92.992 87.367 92.992 229.5 0 316.868l-75.532 137.228 53.235 25.222 67.928-126.113c112.86-109.463 111.667-284.715-3.442-392.828z m-333.9 561.488l7.155 55.598L634.85 735.83l-7.178-55.62-238.613 27.135z m0 84.015l7.155 55.598 238.635-27.067-7.178-55.687-238.613 27.157z m122.265 112.68c-16.47 0-29.835-12.577-29.835-27.99h-59.647c0 46.373 40.162 84.015 89.505 84.015s89.505-37.665 89.505-84.015h-59.692c-0.045 15.412-13.455 27.99-29.835 27.99zM332.99 343.88h59.67c0-61.785 53.505-112.028 119.295-112.028v-56.025c-98.662 0-178.965 75.375-178.965 168.053z" p-id="4096" fill="#07c160"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

4
projects/UserCenter/Application/Models/EditPermissionModel.cs
Unescape View File

@ -1,13 +1,13 @@
using Infrastructure.Application;
using System; using System;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Infrastructure.Application;
namespace Application.Models namespace Application.Models
{ {
[Display(Name = "权限")] [Display(Name = "权限")]
public class EditPermissionModel : EditModel public class EditPermissionModel : EditModel
{ {
[Display(Name = "分类")] [Display(Name = "分类"), Required]
[DataType("SelectList")] [DataType("SelectList")]
public Guid? CategoryId { get; set; } public Guid? CategoryId { get; set; }

2
projects/UserCenter/wwwroot/js/site.js
Unescape View File

@ -1,5 +1,5 @@
function urlContent2(baseUrl,path) { function urlContent2(baseUrl,path) {
if (path.startsWith("/dfs/")) { if (!path.startsWith("/dfs/")) {
return baseUrl + path; return baseUrl + path;
} }
return path; return path;

2
projects/Version.cs
Unescape View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("1.0.0.530")] [assembly: AssemblyInformationalVersion("1.0.0.602")]

2
projects/lib/local/js/site.js
Unescape View File

@ -1,5 +1,5 @@
function urlContent2(baseUrl,path) { function urlContent2(baseUrl,path) {
if (path.startsWith("/dfs/")) { if (!path.startsWith("/dfs/")) {
return baseUrl + path; return baseUrl + path;
} }
return path; return path;

Write Preview
Loading…
Cancel
Save