2023年03月28日11:52:02

wjc

2023-03-28 a9d1161b1df96e7ddad566335989a1444e433ef5

 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();
                    }
@@ -161,7 +152,7 @@
            DriverLayer.Control.Ins.GatewayOnline_Cloud = false;
            DriverLayer.Control.Ins.GatewayOnline_Local = false;
            SpatialInfo.CurrentSpatial.Clear();
            FunctionList.List.Clear();
            FunctionList.List.ClearDatas();

            ///切换住宅清空前住宅缓存自动化列表；
            HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
@@ -307,16 +298,27 @@
            var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
            WirteResidenceInfo(ssd);
        }
        /// <summary>
        /// 当前选择的楼层
        /// </summary>
        public string CurFoor = Language.StringByID(StringId.All);


        SpatialInfo _CurFloor;
        /// <summary>
        /// 当前选择的楼层
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public SpatialInfo CurFloor = new SpatialInfo() { roomId = "", roomName = Language.StringByID(StringId.All)};
        public SpatialInfo CurFloor {
            get
            {
                if(_CurFloor == null || _CurFloor.roomName == "")
                {
                    _CurFloor = new SpatialInfo() { roomId = "", roomName = Language.StringByID(StringId.All) };
                }
                return _CurFloor;
            }
            set
            {
                _CurFloor = value;
            }
        } 
        /// <summary>
        /// 分类界面显示的楼层
        /// </summary>