diff --git a/IoTGateway.Model/Device.cs b/IoTGateway.Model/Device.cs index 4b2e98a..8795544 100644 --- a/IoTGateway.Model/Device.cs +++ b/IoTGateway.Model/Device.cs @@ -7,20 +7,20 @@ namespace IoTGateway.Model { public class Device : TreePoco, IBasePoco { - [Display(Name = "Name")] + [Display(Name = "Device Name")] public string DeviceName { get; set; } - [Display(Name = "sort")] + [Display(Name = "Sort")] public uint Index { get; set; } - [Display(Name = "describe")] + [Display(Name = "Description")] public string Description { get; set; } public Driver Driver { get; set; } - [Display(Name = "drive")] + [Display(Name = "Device PLC")] public Guid? DriverId { get; set; } - [Display(Name = "start up")] + [Display(Name = "Start up")] public bool AutoStart { get; set; } [Display(Name = "Change upload")] @@ -32,7 +32,7 @@ namespace IoTGateway.Model [Display(Name = "Command interval ms")] public uint CmdPeriod { get; set; } - [Display(Name = "Type")] + [Display(Name = "Device Type")] public DeviceTypeEnum DeviceTypeEnum { get; set; } [Display(Name = "Creation time")] diff --git a/IoTGateway.Model/DeviceVariable.cs b/IoTGateway.Model/DeviceVariable.cs index 46eefdb..a619aec 100644 --- a/IoTGateway.Model/DeviceVariable.cs +++ b/IoTGateway.Model/DeviceVariable.cs @@ -42,7 +42,7 @@ namespace IoTGateway.Model [Newtonsoft.Json.JsonIgnore] public Device Device { get; set; } - [Display(Name = "ID")] + [Display(Name = "Device Name")] public Guid? DeviceId { get; set; } [Display(Name = "Alias")] diff --git a/Plugins/PluginInterface/DataTypeEnum.cs b/Plugins/PluginInterface/DataTypeEnum.cs index 309ff24..4875ec4 100644 --- a/Plugins/PluginInterface/DataTypeEnum.cs +++ b/Plugins/PluginInterface/DataTypeEnum.cs @@ -47,17 +47,17 @@ namespace PluginInterface TimeStampMs, [Display(Name = "timestamp(s)")] TimeStampS, - [Display(Name = "任意类型")] + [Display(Name = "Any")] Any, - [Display(Name = "自定义1")] + [Display(Name = "Custom 1")] Custome1, - [Display(Name = "自定义2")] + [Display(Name = "Custom 2")] Custome2, - [Display(Name = "自定义3")] + [Display(Name = "Custom 3")] Custome3, - [Display(Name = "自定义4")] + [Display(Name = "Custom4")] Custome4, - [Display(Name = "自定义5")] + [Display(Name = "Custom 5")] Custome5, [Display(Name = "Gb2312")] Gb2312String, diff --git a/Plugins/PluginInterface/EndianEnum.cs b/Plugins/PluginInterface/EndianEnum.cs index 99c95ce..38e334d 100644 --- a/Plugins/PluginInterface/EndianEnum.cs +++ b/Plugins/PluginInterface/EndianEnum.cs @@ -10,10 +10,10 @@ namespace PluginInterface { public enum EndianEnum { - [Display(Name = "无")] None = 0, - [Display(Name = "大端")] BigEndian, - [Display(Name = "小端")] LittleEndian, - [Display(Name = "大端交换")] BigEndianSwap, - [Display(Name = "小端交换")] LittleEndianSwap + [Display(Name = "None")] None = 0, + [Display(Name = "BigEndian")] BigEndian, + [Display(Name = "LittleEndian")] LittleEndian, + [Display(Name = "BigEndianSwap")] BigEndianSwap, + [Display(Name = "LittleEndianSwap")] LittleEndianSwap } } diff --git a/Plugins/PluginInterface/ProtectTypeEnum.cs b/Plugins/PluginInterface/ProtectTypeEnum.cs index 0f4a106..421bd97 100644 --- a/Plugins/PluginInterface/ProtectTypeEnum.cs +++ b/Plugins/PluginInterface/ProtectTypeEnum.cs @@ -9,11 +9,11 @@ namespace PluginInterface { public enum ProtectTypeEnum { - [Display(Name = "只读")] + [Display(Name = "ReadOnly")] ReadOnly, - [Display(Name = "读写")] + [Display(Name = "ReadWrite")] ReadWrite, - [Display(Name = "只写")] + [Display(Name = "WriteOnly")] WriteOnly, } }