2021-12-01-01

xm

2021-12-01 6d73bf6e816570291865674bef8bce8972e4de3f

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -19,7 +19,6 @@
        /// </summary>
        public string MasterToken;

        //RegionInfoRes _residecenInfo;
        RegionInfoRes _residecenInfo = new RegionInfoRes();
        /// <summary>
        /// 住宅基础信息
@@ -30,7 +29,7 @@
            {
                if (MainPage.NoLoginMode)
                {
                    return new RegionInfoRes() { Name = "本地模式" };
                    return new RegionInfoRes() { homeName = "HDL Home" ,id = "text000001"};
                }
                else
                {
@@ -58,6 +57,7 @@
        /// <summary>
        /// 功能类型列表
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public List<ShowFunction> functionTypeList = new List<ShowFunction>();

        static DB_ResidenceData instance;
@@ -67,6 +67,32 @@
            {
                if (instance == null)
                {
                    if(MainPage.NoLoginMode)
                    {
                        instance = new DB_ResidenceData();
                        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
                                });
                        instance.SaveResidenceData();
                        instance.residenceImage = "Classification/Room/Roombg.png";
                        instance.HomeGateway = new HomeGatewayInfo()
                        {
                            homeId = "1396717478877241345",
                            gatewayId = "1396997079658602498",
                            mac = "123457890123456",
                        };
                        //初始化住宅功能数据
                        SpatialInfo.CurrentSpatial.InitRoomListFunctions();
                        return instance;
                    }

                    try
                    {
                        var residenceDataBytes = ReadResidenceInfo();
@@ -85,19 +111,18 @@
                        {
                            instance = temp;
                        }
                        if (instance.functionTypeList.Count == 0)
                        {
                            instance.functionTypeList.AddRange(new List<ShowFunction> {
                        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.EnergyMonitoring,
                                    ShowFunction.FreshAir,ShowFunction.DoorLock,
                                    ShowFunction.Panel,ShowFunction.SecurityMonitoring,
                                    ShowFunction.Sensor,ShowFunction.VideoIntercom,
                                    ShowFunction.SecurityCenter
                                });
                            instance.SaveResidenceData();
                        }
                        instance.SupportFacePass = false;
                        instance.SaveResidenceData();
                    }
                    catch (Exception ex)
                    {
@@ -122,18 +147,19 @@
            ins_OidList = null;
            HomeGateway = null;
            //重置网关状态
            DriverLayer.Control.Ins.GatewayOnline = false;
            DriverLayer.Control.Ins.GatewayOnline_Cloud = false;
            DriverLayer.Control.Ins.GatewayOnline_Local = false;
            SpatialInfo.CurrentSpatial.Clear();
            FunctionList.List.Clear();
            

            ///切换住宅清空前住宅缓存自动化列表；
            HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
            if (HDL_ON.DriverLayer.Control.Ins.IsRemote)
            {
                DriverLayer.Control.Ins.IsRemote = false;
                DAL.Mqtt.MqttClient.DisConnectRemote("退出登录，或者切换住宅");
            }
            DAL.Mqtt.MqttClient.DisConnectRemote("退出登录，或者切换住宅");
        }
        /// <summary>
        /// 是否支持人脸通行
        /// </summary>
        public bool SupportFacePass = false;

        /// <summary>
        /// 网关详细信息
@@ -141,8 +167,8 @@
        public HomeGatewayInfo HomeGateway;

        /// <summary>
        /// 0:bus网关
        /// 1:A协议网关
        /// 0:一端口
        /// 1:Link协议网关
        /// </summary>
        public int GatewayType
        {
@@ -153,7 +179,7 @@
                //#endif
                if (HomeGateway == null)
                    return -1;
                if (HomeGateway.gatewayType == "AGATEWAY")
                if (HomeGateway.gatewayType != "BUSUDPGATEWAY")
                {
                    return 1;
                }
@@ -229,6 +255,11 @@
            }

        }

        ///// <summary>
        ///// 城市信息
        ///// </summary>
        //public static Entity.CityInfo cityInfo = new Entity.CityInfo();

        /// <summary>
        /// 住宅图片
@@ -421,5 +452,23 @@
        }

        #endregion



        /// <summary>
        /// 上一次提示的时间
        /// </summary>
        public DateTime LastTipTime = DateTime.MinValue;
        /// <summary>
        /// 是否需要提示
        /// </summary>
        public bool NeedTip
        {
            get
            {
                return (DateTime.Now - LastTipTime).TotalDays > 2;
            }
        }

    }
}