Update PublicAssmeblyBLL.cs

wxr

2023-07-30 d76b0e40e5bb127fd33aa1f7842447a1df0628d5

 HDL_ON/Entity/Function/Scene.cs

@@ -112,6 +112,10 @@
                //{
                //    return image;
                //}
                if(image == "")
                {
                    image = "Intelligence/Gallery/scenebg1.png";
                }

                if (image.Contains("Intelligence/Gallery/scenebg"))
                {
@@ -426,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);
@@ -556,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;
        }

@@ -620,12 +629,17 @@
            var perAngle = status.Find((obj) => obj.key == FunctionAttributeKey.Angle);
            if (perAngle != null)
            {
                sceneFunctionInfo += " " + perState.value + "°";
                sceneFunctionInfo += " " + perAngle.value + "°";
            }
            return sceneFunctionInfo;
        }


        /// <summary>
        /// 设备
        /// 场景 =scene
        /// 群控=5
        /// </summary>
        public string type = "0";
    }

    /// <summary>
@@ -659,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);
@@ -688,22 +702,26 @@
                case "angle":
                    text = Language.StringByID(StringId.Angle);
                    break;
                case "security":
                    text = Language.StringByID(StringId.DeploymentStatus);
                    break;
            }
            return text;
        }

        public string UintString = "";

        /// <summary>
        /// 属性值单位
        /// </summary>
        public string GetUintString(string inputKey = "")
        public string GetUintString()
        {
            if (!string.IsNullOrEmpty(UintString) && UintString!= "{}")
            {
                return UintString;
            }
            var us = "";
            var swithchString = key;
            if (!string.IsNullOrEmpty(inputKey))
            {
                swithchString = inputKey;
            }
            switch (swithchString)
            {
                case FunctionAttributeKey.SetTemp:
@@ -739,13 +757,18 @@
            string text = "";
            switch (key)
            {
                case FunctionAttributeKey.Security:
                    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:
                case FunctionAttributeKey.RoomTemp:
                case FunctionAttributeKey.Brightness:
                case FunctionAttributeKey.Percent:
                case FunctionAttributeKey.CCT:
                case FunctionAttributeKey.Angle:
                    int outT = 0;
                    int.TryParse(catchString, out outT);