主从网关属性，防挤下线账号删除

wei

2021-09-26 dd3fecc3a8b92b377febfcf92d32ec22a07724f6

 HDL_ON/Entity/Function/Scene.cs

@@ -77,17 +77,24 @@
        public string group = "1";
        /// <summary>
        /// 场景类型
        /// 0:普通
        /// 1:电影
        /// 2:调光
        /// </summary>
        public SceneType sceneType = SceneType.OrdinaryScenes;
        /// <summary>
        /// 收藏标记
        /// </summary>
        public bool collect = false;
        /// <summary>
        /// 是否允许删除
        /// </summary>
        public bool can_delete = true;

        /// <summary>
        /// 创建该场景的用户ID
        /// </summary>
        public string userId = "";
        public string userId = UserInfo.Current.ID;

        ///// <summary>
        ///// 场景背景
@@ -542,10 +549,15 @@
        /// <summary>
        /// 属性值单位
        /// </summary>
        public string GetUintString()
        public string GetUintString(string inputKey = "")
        {
            var us = "";
            switch (key)
            var swithchString = key;
            if(!string.IsNullOrEmpty(inputKey))
            {
                swithchString = inputKey;
            }
            switch (swithchString)
            {
                case FunctionAttributeKey.SetTemp:
                case FunctionAttributeKey.RoomTemp:
@@ -564,26 +576,35 @@
        /// 获取指定属性的显示文本
        /// 中英文显示
        /// </summary>
        public string GetValueText()
        public string GetValueText(string temp = "")
        {
            string catchString = value;
            if(temp!= "")
            {
                catchString = temp;
            }
            string text = "";
            switch (key)
            {
                case FunctionAttributeKey.OnOff:
                    text = value == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
                    text = catchString == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
                    break;
                case FunctionAttributeKey.SetTemp:
                case FunctionAttributeKey.RoomTemp:
                case FunctionAttributeKey.Brightness:
                case FunctionAttributeKey.Percent:
                    if (value == "")
                    int outT = 0;
                    int.TryParse(catchString,out outT);
                    if (outT < 0)
                        catchString = "0";
                    if (catchString == "")
                    {
                        value = "0";
                        catchString = "0";
                    }
                    text = value;
                    text = catchString;
                    break;
                case FunctionAttributeKey.Mode:
                    switch (value)
                    switch (catchString)
                    {
                        //----空调
                        case "auto":
@@ -602,6 +623,7 @@
                            text = Language.StringByID(StringId.AirSupply);
                            break;
                        //-----地热
                        // 1:普通,2:白天,3:夜晚,4:离开,5:时间
                        case "day":
                            text = Language.StringByID(StringId.Day);
                            break;
@@ -620,7 +642,7 @@
                    }
                    break;
                case FunctionAttributeKey.FanSpeed:
                    switch (value)
                    switch (catchString)
                    {
                        case "high":
                            text = Language.StringByID(StringId.HighWindSpeed);