diff --git a/projects/IoT.Shared/Application/Models/Users/EditPermissionModel.cs b/projects/IoT.Shared/Application/Models/Users/EditPermissionModel.cs
index 2edf8a41..8ef4a620 100644
--- a/projects/IoT.Shared/Application/Models/Users/EditPermissionModel.cs
+++ b/projects/IoT.Shared/Application/Models/Users/EditPermissionModel.cs
@@ -1,6 +1,5 @@
using Infrastructure.Application;
using System;
-using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace Application.Models
@@ -8,7 +7,7 @@ namespace Application.Models
[Display(Name = "权限")]
public class EditPermissionModel : EditModel
{
- [Display(Name = "分类")]
+ [Display(Name = "分类"), Required]
[DataType("SelectList")]
public Guid? CategoryId { get; set; }
diff --git a/projects/IoTCenter/wwwroot/images/lamp.svg b/projects/IoTCenter/wwwroot/images/lamp.svg
new file mode 100644
index 00000000..bc8a6889
--- /dev/null
+++ b/projects/IoTCenter/wwwroot/images/lamp.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/projects/IoTCenter/wwwroot/js/site.js b/projects/IoTCenter/wwwroot/js/site.js
index 4eaf9210..76f52ce5 100644
--- a/projects/IoTCenter/wwwroot/js/site.js
+++ b/projects/IoTCenter/wwwroot/js/site.js
@@ -1,5 +1,5 @@
function urlContent2(baseUrl,path) {
- if (path.startsWith("/dfs/")) {
+ if (!path.startsWith("/dfs/")) {
return baseUrl + path;
}
return path;
diff --git a/projects/IoTNode/DeviceServices/FBee/FBeeService.cs b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs
index 384b8392..44645544 100644
--- a/projects/IoTNode/DeviceServices/FBee/FBeeService.cs
+++ b/projects/IoTNode/DeviceServices/FBee/FBeeService.cs
@@ -687,7 +687,7 @@ namespace IoTNode.DeviceServices.FBee
{
//this.X85(sn, ieee);
}
- if (deviceId == 0x0220)
+ if (deviceId == 0x0210 || deviceId == 0x0220)
{
this.X86(sn, ieee);
this.X87(sn, ieee);
@@ -804,7 +804,7 @@ namespace IoTNode.DeviceServices.FBee
///
///
/// 0-255
- 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
{
@@ -843,7 +843,7 @@ namespace IoTNode.DeviceServices.FBee
///
/// 0x84设置指定设备的颜色，即色调和饱和度
///
- 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
{
@@ -1025,7 +1025,7 @@ namespace IoTNode.DeviceServices.FBee
///
/// 0xa8设置指定设备的色温
///
- 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();
list.AddRange(BitConverter.GetBytes(color));
@@ -1085,7 +1085,7 @@ namespace IoTNode.DeviceServices.FBee
///
///
///
- 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
{
diff --git a/projects/IoTNode/wwwroot/images/lamp.svg b/projects/IoTNode/wwwroot/images/lamp.svg
new file mode 100644
index 00000000..bc8a6889
--- /dev/null
+++ b/projects/IoTNode/wwwroot/images/lamp.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/projects/UserCenter/Application/Models/EditPermissionModel.cs b/projects/UserCenter/Application/Models/EditPermissionModel.cs
index 8281e883..8ef4a620 100644
--- a/projects/UserCenter/Application/Models/EditPermissionModel.cs
+++ b/projects/UserCenter/Application/Models/EditPermissionModel.cs
@@ -1,13 +1,13 @@
+using Infrastructure.Application;
using System;
using System.ComponentModel.DataAnnotations;
-using Infrastructure.Application;
namespace Application.Models
{
[Display(Name = "权限")]
public class EditPermissionModel : EditModel
{
- [Display(Name = "分类")]
+ [Display(Name = "分类"), Required]
[DataType("SelectList")]
public Guid? CategoryId { get; set; }
diff --git a/projects/UserCenter/wwwroot/js/site.js b/projects/UserCenter/wwwroot/js/site.js
index 4eaf9210..76f52ce5 100644
--- a/projects/UserCenter/wwwroot/js/site.js
+++ b/projects/UserCenter/wwwroot/js/site.js
@@ -1,5 +1,5 @@
function urlContent2(baseUrl,path) {
- if (path.startsWith("/dfs/")) {
+ if (!path.startsWith("/dfs/")) {
return baseUrl + path;
}
return path;
diff --git a/projects/Version.cs b/projects/Version.cs
index 5c007afe..1e67deac 100644
--- a/projects/Version.cs
+++ b/projects/Version.cs
@@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("1.0.0.530")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("1.0.0.602")]
\ No newline at end of file
diff --git a/projects/lib/local/js/site.js b/projects/lib/local/js/site.js
index 4eaf9210..76f52ce5 100644
--- a/projects/lib/local/js/site.js
+++ b/projects/lib/local/js/site.js
@@ -1,5 +1,5 @@
function urlContent2(baseUrl,path) {
- if (path.startsWith("/dfs/")) {
+ if (!path.startsWith("/dfs/")) {
return baseUrl + path;
}
return path;