2021-07-06 1.更新

JLChen

2021-07-06 d72ca686a3e262693f8a6e45e747e8e8da43335b

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Threading;
@@ -91,10 +91,11 @@
                                    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();
                        }
@@ -107,7 +108,7 @@
                    }
                    instance.residenceImage = "Classification/Room/Roombg.png";
                    //初始化住宅功能数据
                    SpatialInfo.CurrentSpatial.InitRoomFunction();
                    SpatialInfo.CurrentSpatial.InitRoomListFunctions();

                }
                return instance;
@@ -121,15 +122,15 @@
            instance = null;
            ins_OidList = null;
            HomeGateway = null;
            //重置网关状态
            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)
            {
                DAL.Mqtt.MqttClient.DisConnectRemote("退出登录，或者切换住宅");
            }
            DAL.Mqtt.MqttClient.DisConnectRemote("退出登录，或者切换住宅");
        }

        /// <summary>
@@ -271,7 +272,6 @@
        /// <returns></returns>
        static byte[] ReadResidenceInfo()
        {
                MainPage.Log("get file Instance ");
            var fileName = "DB_ResidenceData";
            FileStream fs = null;
            try
@@ -299,7 +299,6 @@
            }
            finally
            {
                MainPage.Log("get file  ");
                try
                {
                    if (fs != null)
@@ -421,4 +420,4 @@

        #endregion
    }
}
}