Merge branch 'WJC' into NewFilePath

wxr

2020-12-22 a56a485926a8927f904d7f4795c371c25b35753a

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Threading;
@@ -126,7 +126,7 @@
            
            ///切换住宅清空前住宅缓存自动化列表；
            HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
            if (DriverLayer.Control.Ins.IsRemote)
            if (HDL_ON.DriverLayer.Control.Ins.IsRemote)
            {
                DriverLayer.Control.Ins.IsRemote = false;
                DAL.Mqtt.MqttClient.DisConnectRemote("退出登录，或者切换住宅");
@@ -422,4 +422,4 @@

        #endregion
    }
}
}