Merge remote-tracking branch 'origin/wxr-udp修改验证' into Wxr-V2.4.2

wxr

2023-11-16 58ccc89832196860a74609a1c54b40b7c6f7faed

 HDL_ON/Entity/Function/Scene.cs

@@ -3,6 +3,7 @@
using HDL_ON.Common;
using HDL_ON.DAL.Server;
using HDL_ON.UI;
using HDL_ON.UI.UI2.Intelligence.Automation;
using Shared;

namespace HDL_ON.Entity
@@ -86,6 +87,14 @@
        /// 是否允许删除
        /// </summary>
        public bool can_delete = true;
        /// <summary>
        /// 是否允许编辑
        /// </summary>
        public bool can_edit = true;
        /// <summary>
        /// 是否是网关本地场景
        /// </summary>
        public bool local = false;

        /// <summary>
        /// 创建该场景的用户ID
@@ -561,12 +570,24 @@
        /// <returns></returns>
        private Function ConvertFunctionObject()
        {
            var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
            if(localFunction == null)
            Function temp = null;
            if (type == "7")
            {
                localFunction = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
                var logic = Logic.LogicList.Find((obj) => obj.sid == sid);
                if (logic != null) {
                    temp = new Function();
                    temp.name = logic.name;
            }
            return localFunction;
            }
            else
            {
                temp = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
                if (temp == null)
                {
                    temp = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
                }
            }
            return temp;
        }


@@ -577,6 +598,23 @@
        public string GetFunctionScnenInfo()
        {
            var sceneFunctionInfo = "";
            if (type == "7")
            {
                foreach (var sfs in status)
                {
                    if (sfs.key == "enable")
                    {
                        if (sfs.value == "true")
                            return Language.StringByID(StringId.OpenArm);
                        else
                        {
                            return Language.StringByID(StringId.Close);
                        }
                    }
                }
            }
            else
            {
            foreach (var sfs in status)
            {
                if (sfs.key == FunctionAttributeKey.OnOff)
@@ -663,6 +701,7 @@
            {
                sceneFunctionInfo += " " + perSongName.value;
            }
            }
            return sceneFunctionInfo;
        }

@@ -670,6 +709,8 @@
        /// 设备
        /// 场景 =scene
        /// 群控=5
        /// 自动化=7
        /// 
        /// </summary>
        public string type = "0";
    }