Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 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"))
                {
@@ -620,7 +624,7 @@
            var perAngle = status.Find((obj) => obj.key == FunctionAttributeKey.Angle);
            if (perAngle != null)
            {
                sceneFunctionInfo += " " + perState.value + "°";
                sceneFunctionInfo += " " + perAngle.value + "°";
            }
            return sceneFunctionInfo;
        }
@@ -688,6 +692,9 @@
                case "angle":
                    text = Language.StringByID(StringId.Angle);
                    break;
                case "security":
                    text = Language.StringByID(StringId.DeploymentStatus);
                    break;
            }
            return text;
        }
@@ -739,6 +746,9 @@
            string text = "";
            switch (key)
            {
                case FunctionAttributeKey.Security:
                    text = catchString == "true" ? Language.StringByID(StringId.Defense) : Language.StringByID(StringId.Undefense);
                    break;
                case FunctionAttributeKey.OnOff:
                    text = catchString == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
                    break;
@@ -746,6 +756,7 @@
                case FunctionAttributeKey.RoomTemp:
                case FunctionAttributeKey.Brightness:
                case FunctionAttributeKey.Percent:
                case FunctionAttributeKey.CCT:
                case FunctionAttributeKey.Angle:
                    int outT = 0;
                    int.TryParse(catchString, out outT);