2020-12-16 1.bus_Data改成bus。2.成员屏蔽设备和房间的编辑功能。

JLChen

2020-12-16 6c26794cefc555b6e695fc9e8ac7a247441ac455

 HDL_ON/Entity/FunctionList.cs

@@ -400,7 +400,7 @@
                                    localFunction.collect = newFunction.collect;
                                    localFunction.modifyTime = newFunction.modifyTime;
                                    localFunction.roomIds = newFunction.roomIds;
                                    localFunction.bus_Data = newFunction.bus_Data;
                                    localFunction.bus = newFunction.bus;
                                    localFunction.SaveFunctionData(false);
                                }
                                deviceList.list.Remove(newFunction);//操作完的数据清理掉，剩下的就是新增的功能
@@ -778,6 +778,35 @@
            }
            return text;
        }


        /// <summary>
        /// 延时显示的文本
        /// </summary>
        public string GetDelayText(string delay)
        {
            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;
        }

        #endregion
    }