Merge remote-tracking branch 'origin/CJL' into NewFilePath

wei

2020-12-23 d814c978efc068425c500a553cf7ec6b4f628219

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -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();