2024年07月25日17:24:45

mac

2024-07-25 3f6685c77beeb12baf840733fb890860f4c26e7c

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -70,12 +70,17 @@
                                    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,
                                    ShowFunction.VideoDoorLock,
                                    ShowFunction.Series,
                                    ShowFunction.Aks,
                    };
                }
                return dddd;
            }
@@ -92,7 +97,7 @@
                    {
                        instance = new DB_ResidenceData();
                        instance.SaveResidenceData();
                        instance.residenceImage = "Classification/Room/Roombg.png";
                        instance.residenceImage = "Classification/Room/HomePagebg.png";
                        instance.HomeGateway = new HomeGatewayInfo()
                        {
                            homeId = "1396717478877241345",
@@ -131,7 +136,7 @@
                        instance = new DB_ResidenceData { };
                        return instance;
                    }
                    instance.residenceImage = "Classification/Room/Roombg.png";
                    instance.residenceImage = "Classification/Room/HomePagebg.png";
                    //初始化住宅功能数据
                    SpatialInfo.CurrentSpatial.InitRoomListFunctions();

@@ -151,17 +156,17 @@
            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();
            DAL.Mqtt.MqttClient.DisConnectRemote("退出登录，或者切换住宅");

#if IOS
            //退出全视通登录
            Shared.IOS.HDLFVSDK.Video.Logout();
            //重置默认不支持全视通
            Entity.DB_ResidenceData.Instance.SupportFVDevice = false;
            ////退出全视通登录
            //Shared.IOS.HDLFVSDK.Video.Logout();
            ////重置默认不支持全视通
            //Entity.DB_ResidenceData.Instance.SupportFVDevice = false;
#endif
        }
        /// <summary>
@@ -182,7 +187,7 @@
        /// <summary>
        /// 网关详细信息
        /// </summary>
        public HomeGatewayInfo HomeGateway;
        public HomeGatewayInfo HomeGateway;// = new HomeGatewayInfo ();

        /// <summary>
        /// 0:一端口
@@ -297,16 +302,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>
@@ -492,5 +508,10 @@
            }
        }

        /// <summary>
        /// 第一次申请定位权限，用户拒绝之后，不能再次申请（Android）
        /// </summary>
        public bool CheckGPS_IsFirst = true;

    }
}