2020-12-17 1.成员管理UI还原度修改。2.增加右键删除。3.增加无区域功能管理。

JLChen

2020-12-17 cd1029a11d96f55337430cec97b7d4cd510f5d5f

 HDL_ON/Entity/Function/Function.cs

@@ -119,7 +119,7 @@
        /// bus协议数据格式
        /// 使用A协议控制时，改属性为空
        /// </summary>
        public BusData bus_Data;
        public BusData bus;
        /// <summary>
        /// 是否收藏
        /// </summary>
@@ -148,37 +148,6 @@
        /// 延时
        /// </summary>
        public int delay = 0;
        /// <summary>
        /// 延时显示的文本
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public string delayText
        {
            get
            {
                string text = "";
                switch (delay)
                {
                    case 0:
                        text = Language.StringByID(StringId.NoDelay);
                        break;
                    case 30:
                        text = "30s";
                        break;
                    case 60:
                        text = "1min";
                        break;
                    case 120:
                        text = "2min";
                        break;
                    case 300:
                        text = "5min";
                        break;
                }
                return text;
            }
        }

        /// <summary>
        /// 最后控制的一次状态
        /// </summary>
@@ -222,7 +191,8 @@
        /// <summary>
        /// 使用频率
        /// </summary>
        public double usageFrequency {
        public double usageFrequency
        {
            get
            {
                return usageCount / 7;
@@ -236,9 +206,9 @@
        public string GetBusId()
        {
            string busId = "";
            if (bus_Data != null)
            if (bus != null)
            {
                busId = bus_Data.SubnetID + "_" + bus_Data.DeviceID + "_" + bus_Data.loopId;
                busId = bus.SubnetID + "_" + bus.DeviceID + "_" + bus.loopId;
            }
            return busId;
        }
@@ -305,7 +275,7 @@
                Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
            }
        }
      


        /// <summary>
        /// 转换成场景功能对象
@@ -316,7 +286,15 @@
            var sFunc = new SceneFunction();
            foreach (var attr in attributes)
            {
                sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString() });
                if (attr.key == FunctionAttributeKey.SetTemp)
                {
                    var vv = Convert.ToDouble(attr.value);
                    sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = Convert.ToInt32(vv).ToString() });
                }
                else
                {
                    sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString() });
                }
                sFunc.sid = this.sid;
            }
            return sFunc;
@@ -455,11 +433,11 @@
        /// <summary>
        /// 最大值
        /// </summary>
        public int max=100;
        public int max = 100;
        /// <summary>
        /// 最小值
        /// </summary>
        public int min=0;
        public int min = 0;
        /// <summary>
        /// 数据类型
        /// </summary>
@@ -658,4 +636,4 @@
        public const string ElectricFan = "electric.fan";
    }

}
}