2023年02月07日18:50:21

wjc

2023-02-07 8960f866958ece0900b0ee13e70c9320507f98db

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -54,29 +54,31 @@
            }
        }

        private List<ShowFunction> showFunctions;
        private List<ShowFunction> dddd;

        /// <summary>
        /// 功能类型列表
        /// </summary>
        public List<ShowFunction> functionTypeList
        [Newtonsoft.Json.JsonIgnore]
        public List<ShowFunction> ShowFunctionTypeList
        {
            get
            {
                if (showFunctions == null)
                if (dddd == null)
                {
                    showFunctions = new List<ShowFunction> {
                    dddd = new List<ShowFunction>(){
                                    ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
                                    ShowFunction.FloorHeating,ShowFunction.Music,
                                    ShowFunction.Electric,ShowFunction.Environmental,
                                    ShowFunction.EnergyMonitoring,
                                    ShowFunction.EnergyMonitoring,ShowFunction.IpCam,
                                    ShowFunction.FreshAir,ShowFunction.DoorLock,
                                    ShowFunction.Panel,ShowFunction.SecurityMonitoring,
                                    ShowFunction.Panel,
                                    ShowFunction.Sensor,ShowFunction.VideoIntercom,
                                    ShowFunction.SecurityCenter,ShowFunction.Acst,
                                    ShowFunction.MechanicalArm };
                                    ShowFunction.MechanicalArm ,
                                    ShowFunction.SecurityMonitoring,};
                }
                return showFunctions;
                return dddd;
            }
        }

@@ -121,17 +123,6 @@
                        {
                            instance = temp;
                        }
                        instance.functionTypeList.AddRange(new List<ShowFunction> {
                                    ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
                                    ShowFunction.FloorHeating,ShowFunction.Music,
                                    ShowFunction.Electric,ShowFunction.Environmental,
                                    ShowFunction.EnergyMonitoring,
                                    ShowFunction.FreshAir,ShowFunction.DoorLock,
                                    ShowFunction.Panel,ShowFunction.SecurityMonitoring,
                                    ShowFunction.Sensor,ShowFunction.VideoIntercom,
                                    ShowFunction.SecurityCenter,ShowFunction.Acst,
                                    ShowFunction.MechanicalArm
                                });
                        instance.SupportFacePass = false;
                        instance.SaveResidenceData();
                    }