20201210

wei

2020-12-11 680d96f157e4609af3e7af6f8d01ee0bf3f55063

 HDL_ON/Entity/Function/Scene.cs

@@ -27,7 +27,7 @@
        public Scene()
        {
            sid = NewSid();
            if (!string.IsNullOrEmpty(DB_ResidenceData.residenceData.HomeGateway.gatewayId))
            if (DB_ResidenceData.residenceData.HomeGateway !=null && !string.IsNullOrEmpty(DB_ResidenceData.residenceData.HomeGateway.gatewayId))
            {
                gatewayId = DB_ResidenceData.residenceData.HomeGateway.gatewayId;
            }
@@ -210,7 +210,7 @@
            string roomNameList = "";
            foreach (var roomId in roomIds)
            {
                var findRoom = DB_ResidenceData.residenceData.Rooms.Find(obj => obj.roomId == roomId);
                var findRoom = SpatialInfo.CurrentSpatial.RoomList.Find(obj => obj.roomId == roomId);
                if (findRoom == null)
                {
                    continue;