20210222

wei

2021-02-22 abf4a98837e43e542701c60b7ec6a088cd5236da

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -94,7 +94,7 @@
                                    //ShowFunction.EnergyMonitoring,
                                    //ShowFunction.FreshAir,ShowFunction.DoorLock,
                                    //ShowFunction.Panel,ShowFunction.SecurityMonitoring,
                                    //ShowFunction.Sensor,ShowFunction.VideoIntercom
                                    ShowFunction.Sensor//,ShowFunction.VideoIntercom
                                });
                            instance.SaveResidenceData();
                        }
@@ -107,7 +107,7 @@
                    }
                    instance.residenceImage = "Classification/Room/Roombg.png";
                    //初始化住宅功能数据
                    SpatialInfo.CurrentSpatial.InitRoomFunction();
                    SpatialInfo.CurrentSpatial.InitRoomListFunctions();

                }
                return instance;
@@ -121,6 +121,8 @@
            instance = null;
            ins_OidList = null;
            HomeGateway = null;
            //重置网关状态
            DriverLayer.Control.Ins.GatewayOnline = false;
            SpatialInfo.CurrentSpatial.Clear();
            FunctionList.List.Clear();
            
@@ -272,7 +274,6 @@
        /// <returns></returns>
        static byte[] ReadResidenceInfo()
        {
                MainPage.Log("get file Instance ");
            var fileName = "DB_ResidenceData";
            FileStream fs = null;
            try
@@ -300,7 +301,6 @@
            }
            finally
            {
                MainPage.Log("get file  ");
                try
                {
                    if (fs != null)