20201212-4

wei

2020-12-12 9ed4d6675aa1f0abe20e3f84e92f5ac2da8ab4f4

 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.CheckWhetherGatewayIdIsNull())
            {
                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;
@@ -333,7 +333,7 @@
        /// <returns></returns>
        Function ConvertFunctionObject()
        {
            var localFunction = DB_ResidenceData.functionList.GetAllDeviceFunctionList().Find((obj) => obj.sid == sid);
            var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
            foreach (var s in status)
            {
                localFunction.attributes.Add(new FunctionAttributes() { key = s.key, curValue = s.value, value = new List<string>() { s.value } });