wxr
2023-07-30 d76b0e40e5bb127fd33aa1f7842447a1df0628d5
HDL_ON/Entity/Function/Scene.cs
@@ -430,6 +430,7 @@
                {
                    var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
                    Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
                    return revPack.Code;
                }
                var scenes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(revPack.Data.ToString());
                var tempScene = scenes.Find((obj) => obj.sid == sid);
@@ -560,6 +561,10 @@
        private Function ConvertFunctionObject()
        {
            var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
            if(localFunction == null)
            {
                localFunction = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
            }
            return localFunction;
        }
@@ -629,7 +634,12 @@
            return sceneFunctionInfo;
        }
        /// <summary>
        /// 设备
        /// 场景 =scene
        /// 群控=5
        /// </summary>
        public string type = "0";
    }
    /// <summary>
@@ -663,7 +673,7 @@
                    text = Language.StringByID(StringId.Brightness);
                    break;
                case FunctionAttributeKey.RGB:
                    text = Language.StringByID(StringId.ColorValue);
                    text = "RGB";// Language.StringByID(StringId.ColorValue);
                    break;
                case FunctionAttributeKey.Mode:
                    text = Language.StringByID(StringId.Mode);
@@ -706,7 +716,7 @@
        /// </summary>
        public string GetUintString()
        {
            if (!string.IsNullOrEmpty(UintString))
            if (!string.IsNullOrEmpty(UintString) && UintString!= "{}")
            {
                return UintString;
            }
@@ -751,6 +761,7 @@
                    text = catchString == "true" ? Language.StringByID(StringId.Defense) : Language.StringByID(StringId.Undefense);
                    break;
                case FunctionAttributeKey.OnOff:
                case FunctionAttributeKey.Colorful:
                    text = catchString == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
                    break;
                case FunctionAttributeKey.SetTemp: