20201112

wxr

2020-11-12 a715181089be0d31cd737a5367ffd02690b9d77f

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using HDL_ON.DAL;
using HDL_ON.DAL.Net;
using Shared;

namespace HDL_ON.Entity
{
@@ -15,7 +16,7 @@
        /// 0:bus网关
        /// 1:A协议网关
        /// </summary>
        public int GatewayType = 0;
        public int GatewayType = 1;
        /// <summary>
        /// 住宅基础信息
        /// </summary>
@@ -62,10 +63,10 @@
                    try
                    {
                        var residenceDataBytes = FileUtils.ReadFile("DB_ResidenceData");
                        var userConfigString = CommonPage.MyEncodingUTF8.GetString(residenceDataBytes);
                        var userConfigString = System.Text.Encoding.UTF8.GetString(residenceDataBytes);
                        DB_ResidenceData temp = null;

                         if (!string.IsNullOrEmpty(userConfigString))
                        if (!string.IsNullOrEmpty(userConfigString))
                        {
                            temp = Newtonsoft.Json.JsonConvert.DeserializeObject<DB_ResidenceData>(userConfigString);
                        }
@@ -91,291 +92,296 @@
                            instance.SaveResidenceData();
                        }

                        //new Light()
                        //{
                        //    sid = "030101123456780202010005ABCD",
                        //    name = "吊灯",
                        //    function = new List<Trait>() {
                        //                new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off"} },
                        //                },
                        //    roomIdList = new List<string>() { "0001" },
                        //    bus_Data = new BusData
                        //    {
                        //        SubnetID = 111,
                        //        DeviceID = 3,   
                        //        LoopID = 1,
                        //    },
                        //}.SaveFunctionData();
                        new Light()
                        {
                            sid = "030101123456780202010005ABCD",
                            name = "灯光1",
                            function = new List<Trait>() {
                                        new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off"} },
                                        },
                            roomIdList = new List<string>() { "0001" },
                            bus_Data = new BusData
                            {
                                SubnetID = 42,
                                DeviceID = 6,
                                LoopID = 1,
                            },
                        }.SaveFunctionData();



                        //#if DEBUG
                        //                        if (rooms.Count == 0 && residenceData.CurReginID == "1108024")
                        //                        {
                        //                            //--------------------
                        //                            var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "", backgroundImage = "Classification/Room/Roombg.png" };
                        //                            rooms.Add(r111);
                        //                            instance.floors.Add(new Floor() { sid = "000022222", name = "1F" });
                        //                            r111.SaveRoomData();
                        //                            new AC()
                        //                            {
                        //                                sid = "030101123456780604010001ABCD",
                        //                                name = "空调",
                        //                                function = new List<Trait>() {
                        //                                        new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
                        //                                        new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "auto", "heat", "cool","dry" } },
                        //                                        new Trait { name = "fan",max = 3,min =0,value_key = new List<string>{ "low", "medium", "high" ,"auto"} },
                        //                                        new Trait { name = "temperature", max = 32,min=16,value_key = new List<string>{"up","down" } },
                        //                                    },
                        //                                roomIdList = new List<string>() { "0001" },
                        //                                lastState = "制冷 中风 18°C",
                        //                                bus_Data = new BusData
                        //                                {
                        //                                    SubnetID = 42,
                        //                                    DeviceID = 8,
                        //                                    LoopID = 1,
                        //                                },
                        //                            }.SaveFunctionData();
                        //                            new Light()
                        //                            {
                        //                                sid = "030101123456780202020002ABCD",
                        //                                name = "调光灯",
                        //                                function = new List<Trait>() {
                        //                                        new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "up","down"} },
                        //                                    },//"brightness",
                        //                                roomIdList = new List<string>() { "0001" },
                        //                                lastState = "20%",
                        //                                bus_Data = new BusData
                        //                                {
                        //                                    SubnetID = 42,
                        //                                    DeviceID = 9,
                        //                                    LoopID = 1,
                        //                                },

                        //                            }.SaveFunctionData();
                        //                            new Curtain()
                        //                            {
                        //                                sid = "030101123456780303010003ABCD",
                        //                                name = "窗帘模块",
                        //                                roomIdList = new List<string>() { "0001" },
                        //                                function = new List<Trait>() {
                        //                                        new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
                        //                                    },// "curtain",
                        //                                lastState = "开",
                        //                                bus_Data = new BusData
                        //                                {
                        //                                    SubnetID = 42,
                        //                                    DeviceID = 7,
                        //                                    LoopID = 1,
                        //                                },
                        //                            }.SaveFunctionData();
                        //                            new Curtain()
                        //                            {
                        //                                sid = "030101123456780303030011ABCD",
                        //                                name = "开合帘",
                        //                                roomIdList = new List<string>() { "0001" },
                        //                                function = new List<Trait>() {
                        //                                        new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off","stop"} },
                        //                                    },//"curtaintype",
                        //                                lastState = "20%",
                        //                                bus_Data = new BusData
                        //                                {
                        //                                    SubnetID = 42,
                        //                                    DeviceID = 7,
                        //                                    LoopID = 11,
                        //                                },
                        //                            }.SaveFunctionData();
                        //                            new Curtain()
                        //                            {
                        //                                sid = "030101123456780503040012ABCD",
                        //                                name = "卷帘",
                        //                                roomIdList = new List<string>() { "0001" },
                        //                                function = new List<Trait>() {
                        //                                        new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
                        //                                        new Trait { name="percent", max=100,min = 0, value_key= new List<string> { "percent" } },
#if DEBUG11
                        if (rooms.Count == 0 )
                        {
                            //--------------------
                            var r111 = new Room() { sid = "0001", name = "客厅", floorId = "", backgroundImage = "Classification/Room/Roombg.png" };
                            rooms.Add(r111);
                            instance.floors.Add(new Floor() { sid = "000022222", name = "1F" });
                            r111.SaveRoomData();
                            new AC()
                            {
                                sid = "030101123456780604010001ABCD",
                                name = "空调",
                                function = new List<Trait>() {
                                                                new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
                                                                new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "auto", "heat", "cool","dry" } },
                                                                new Trait { name = "fan",max = 3,min =0,value_key = new List<string>{ "low", "medium", "high" ,"auto"} },
                                                                new Trait { name = "temperature", max = 32,min=16,value_key = new List<string>{"up","down" } },
                                                            },
                                roomIdList = new List<string>() { "0001" },
                                lastState = "制冷 中风 18°C",
                                bus_Data = new BusData
                                {
                                    SubnetID = 42,
                                    DeviceID = 8,
                                    LoopID = 1,
                                },
                            }.SaveFunctionData();
                            new Light()
                            {
                                sid = "030101123456780202020002ABCD",
                                name = "调光灯",
                                function = new List<Trait>() {
                                                                new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "up","down"} },
                                                            },//"brightness",
                                roomIdList = new List<string>() { "0001" },
                                lastState = "20%",
                                bus_Data = new BusData
                                {
                                    SubnetID = 42,
                                    DeviceID = 9,
                                    LoopID = 1,
                                },

                        //                                    },// "rollingshutter",
                        //                                lastState = "20%",
                        //                                bus_Data = new BusData
                        //                                {
                        //                                    SubnetID = 42,
                        //                                    DeviceID = 17,
                        //                                    LoopID = 1,
                        //                                },
                        //                            }.SaveFunctionData();
                        //                            new FloorHeating()
                        //                            {
                        //                                sid = "030101123456780404020004ABCD",
                        //                                name = "地热",
                        //                                roomIdList = new List<string>() { "0001" },
                        //                                function = new List<Trait>() {
                        //                                        new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
                        //                                        new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "normal", "day", "night","timer","away" } },
                        //                                        new Trait { name = "temperature", max = 32,min=5,value_key = new List<string>{"up","down" } },
                        //                                    },//
                        //                                lastState = "自动 25°C",
                        //                                bus_Data = new BusData
                        //                                {
                        //                                    SubnetID = 111,
                        //                                    DeviceID = 12,
                        //                                    LoopID = 1
                        //                                }
                        //                            }.SaveFunctionData();
                        //                            new Light()
                        //                            {
                        //                                sid = "030101123456780202010005ABCD",
                        //                                name = "吊灯",
                        //                                function = new List<Trait>() {
                        //                                        new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off"} },
                        //                                    },//"on_off",
                        //                                roomIdList = new List<string>() { "0001" },
                        //                                bus_Data = new BusData
                        //                                {
                        //                                    SubnetID = 42,
                        //                                    DeviceID = 6,
                        //                                    LoopID = 1,
                        //                                },
                        //                            }.SaveFunctionData();
                        //                            new Light()
                        //                            {
                        //                                sid = "030101123456780202040006ABCD",
                        //                                name = "RGB灯",
                        //                                function = new List<Trait>() {
                        //                                        new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "on","off"} },
                        //                                        new Trait { name="color", max=100,min = 0, value_key= new List<string> { "255", "255", "255" } },
                        //                                    },//"brightness,color",
                        //                                roomIdList = new List<string>() { "0001" },
                        //                                bus_Data = new BusData
                        //                                {
                        //                                    SubnetID = 42,
                        //                                    DeviceID = 4,
                        //                                    LoopID = 1,
                        //                                },
                        //                            }.SaveFunctionData();
                        //                            new Fan()
                        //                            {
                        //                                sid = "030101123456781010020006ABCD",
                        //                                name = "风扇",
                        //                                function = new List<Trait>() {
                        //                                    new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
                        //                                    new Trait { name="percent", max=7,min = 0, value_key= new List<string> { "percent" } },
                        //                                },//"brightness,color",
                        //                                roomIdList = new List<string>() { "0001" },
                        //                                bus_Data = new BusData
                        //                                {
                        //                                    SubnetID = 142,
                        //                                    DeviceID = 4,
                        //                                    LoopID = 11,
                        //                                },
                        //                            }.SaveFunctionData();
                        //                            new TV()
                        //                            {
                        //                                sid = "030101123456781010020006ABCD",
                        //                                name = "电视",
                        //                                function = new List<Trait>() {
                        //                                    new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
                        //                                },
                        //                                roomIdList = new List<string>() { "0001" },
                        //                                bus_Data = new BusData
                        //                                {
                        //                                    SubnetID = 142,
                        //                                    DeviceID = 4,
                        //                                    LoopID = 111,
                        //                                },
                        //                            }.SaveFunctionData();
                        //                            new SwitchSocket()
                        //                            {
                        //                                sid = "030101123456780101020006ABCD",
                        //                                name = "插座",
                        //                                function = new List<Trait>() {
                        //                                    new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
                        //                                },//"brightness,color",
                        //                                roomIdList = new List<string>() { "0001" },
                        //                                bus_Data = new BusData
                        //                                {
                        //                                    SubnetID = 42,
                        //                                    DeviceID = 6,
                        //                                    LoopID = 1,
                        //                                },
                        //                            }.SaveFunctionData();
                        //                            new Sensor()
                        //                            {
                        //                                sid = "030101123456781005060006ABCD",
                        //                                name = "PM2.5",
                        //                                roomIdList = new List<string>() { "0001" },
                        //                                function = new List<Trait>() {
                        //                                    new Trait { name="values", max=1,min = 0, value_key= new List<string> { "22"} },
                        //                                },
                        //                                bus_Data = new BusData
                        //                                {
                        //                                    SubnetID = 111,
                        //                                    DeviceID = 15,
                        //                                    LoopID = 1,
                        //                                },
                        //                            }.SaveFunctionData();
                        //                            new Sensor()
                        //                            {
                        //                                sid = "030101123456781005070006ABCD",
                        //                                name = "CO2",
                        //                                roomIdList = new List<string>() { "0001" },
                        //                                function = new List<Trait>() {
                        //                                    new Trait { name="values", max=1,min = 0, value_key= new List<string> { "1352"} },
                        //                                },
                        //                                bus_Data = new BusData
                        //                                {
                        //                                    SubnetID = 111,
                        //                                    DeviceID = 15,
                        //                                    LoopID = 1,
                        //                                },
                        //                            }.SaveFunctionData();
                        //                            new Sensor()
                        //                            {
                        //                                sid = "030101123456781005020006ABCD",
                        //                                name = "温度",
                        //                                roomIdList = new List<string>() { "0001" },
                        //                                function = new List<Trait>() {
                        //                                    new Trait { name="values", max=1,min = 0, value_key= new List<string> { "28"} },
                        //                                },
                        //                                bus_Data = new BusData
                        //                                {
                        //                                    SubnetID = 111,
                        //                                    DeviceID = 15,
                        //                                    LoopID = 1,
                        //                                },
                        //                            }.SaveFunctionData();
                        //                            new Sensor()
                        //                            {
                        //                                sid = "030101123456781005050006ABCD",
                        //                                name = "TVOC",
                        //                                roomIdList = new List<string>() { "0001" },
                        //                                function = new List<Trait>() {
                        //                                    new Trait { name="values", max=1,min = 0, value_key= new List<string> { "0.3"} },
                        //                                },
                        //                                bus_Data = new BusData
                        //                                {
                        //                                    SubnetID = 111,
                        //                                    DeviceID = 15,
                        //                                    LoopID = 1,
                        //                                },
                        //                            }.SaveFunctionData();
                        //                            new Sensor()
                        //                            {
                        //                                sid = "030101123456781005030006ABCD",
                        //                                name = "湿度",
                        //                                roomIdList = new List<string>() { "0001" },
                        //                                function = new List<Trait>() {
                        //                                    new Trait { name="values", max=1,min = 0, value_key= new List<string> { "15"} },
                        //                                },
                        //                                bus_Data = new BusData
                        //                                {
                        //                                    SubnetID = 111,
                        //                                    DeviceID = 15,
                        //                                    LoopID = 1,
                        //                                },
                        //                            }.SaveFunctionData();
                        //                            instance.SaveResidenceData();
                        //                        }
                        //                        #endif
                            }.SaveFunctionData();
                            new Curtain()
                            {
                                sid = "030101123456780303010003ABCD",
                                name = "窗帘",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
                                                                new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
                                                            },// "curtain",
                                lastState = "开",
                                bus_Data = new BusData
                                {
                                    SubnetID = 42,
                                    DeviceID = 7,
                                    LoopID = 1,
                                },
                            }.SaveFunctionData();
                            new Curtain()
                            {
                                sid = "030101123456780303030011ABCD",
                                name = "开合帘",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
                                                                new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off","stop"} },
                                                            },//"curtaintype",
                                lastState = "20%",
                                bus_Data = new BusData
                                {
                                    SubnetID = 42,
                                    DeviceID = 7,
                                    LoopID = 11,
                                },
                            }.SaveFunctionData();
                            new Curtain()
                            {
                                sid = "030101123456780503040012ABCD",
                                name = "卷帘",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
                                                                new Trait { name="on_off", max=2,min = 0, value_key= new List<string> { "on","off","stop"} },
                                                                new Trait { name="percent", max=100,min = 0, value_key= new List<string> { "percent" } },

                                                            },// "rollingshutter",
                                lastState = "20%",
                                bus_Data = new BusData
                                {
                                    SubnetID = 42,
                                    DeviceID = 17,
                                    LoopID = 1,
                                },
                            }.SaveFunctionData();
                            new FloorHeating()
                            {
                                sid = "030101123456780404020004ABCD",
                                name = "地热",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
                                                                new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
                                                                new Trait { name="mode", max = 2,min =0,value_key = new List<string>{ "normal", "day", "night","timer","away" } },
                                                                new Trait { name = "temperature", max = 32,min=5,value_key = new List<string>{"up","down" } },
                                                            },//
                                lastState = "自动 25°C",
                                bus_Data = new BusData
                                {
                                    SubnetID = 111,
                                    DeviceID = 12,
                                    LoopID = 1
                                }
                            }.SaveFunctionData();
                            new Light()
                            {
                                sid = "030101123456780202010005ABCD",
                                name = "吊灯",
                                function = new List<Trait>() {
                                                                new Trait { name="on_off", max=100,min = 0, value_key= new List<string> { "on","off"} },
                                                            },//"on_off",
                                roomIdList = new List<string>() { "0001" },
                                bus_Data = new BusData
                                {
                                    SubnetID = 42,
                                    DeviceID = 6,
                                    LoopID = 1,
                                },
                            }.SaveFunctionData();
                            new Light()
                            {
                                sid = "030101123456780202040006ABCD",
                                name = "RGB灯",
                                function = new List<Trait>() {
                                                                new Trait { name="brightness", max=100,min = 0, value_key= new List<string> { "on","off"} },
                                                                new Trait { name="color", max=100,min = 0, value_key= new List<string> { "255", "255", "255" } },
                                                            },//"brightness,color",
                                roomIdList = new List<string>() { "0001" },
                                bus_Data = new BusData
                                {
                                    SubnetID = 42,
                                    DeviceID = 4,
                                    LoopID = 1,
                                },
                            }.SaveFunctionData();
                            new Fan()
                            {
                                sid = "030101123456781010020006ABCD",
                                name = "风扇",
                                function = new List<Trait>() {
                                                            new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
                                                            new Trait { name="percent", max=7,min = 0, value_key= new List<string> { "percent" } },
                                                        },//"brightness,color",
                                roomIdList = new List<string>() { "0001" },
                                bus_Data = new BusData
                                {
                                    SubnetID = 142,
                                    DeviceID = 4,
                                    LoopID = 11,
                                },
                            }.SaveFunctionData();
                            new TV()
                            {
                                sid = "030101123456781010020006ABCD",
                                name = "电视",
                                function = new List<Trait>() {
                                                            new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
                                                        },
                                roomIdList = new List<string>() { "0001" },
                                bus_Data = new BusData
                                {
                                    SubnetID = 142,
                                    DeviceID = 4,
                                    LoopID = 111,
                                },
                            }.SaveFunctionData();
                            new SwitchSocket()
                            {
                                sid = "030101123456780101020006ABCD",
                                name = "插座",
                                function = new List<Trait>() {
                                                            new Trait { name="on_off", max=1,min = 0, value_key= new List<string> { "on","off"} },
                                                        },
                                roomIdList = new List<string>() { "0001" },
                                bus_Data = new BusData
                                {
                                    SubnetID = 42,
                                    DeviceID = 6,
                                    LoopID = 1,
                                },
                            }.SaveFunctionData();
                            new Sensor()
                            {
                                sid = "030101123456781005060006ABCD",
                                name = "PM2.5",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
                                                            new Trait { name="values", max=1,min = 0, value_key= new List<string> { "22"} },
                                                        },
                                bus_Data = new BusData
                                {
                                    SubnetID = 111,
                                    DeviceID = 15,
                                    LoopID = 1,
                                },
                            }.SaveFunctionData();
                            new Sensor()
                            {
                                sid = "030101123456781005070006ABCD",
                                name = "CO2",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
                                                            new Trait { name="values", max=1,min = 0, value_key= new List<string> { "1352"} },
                                                        },
                                bus_Data = new BusData
                                {
                                    SubnetID = 111,
                                    DeviceID = 15,
                                    LoopID = 1,
                                },
                            }.SaveFunctionData();
                            new Sensor()
                            {
                                sid = "030101123456781005020006ABCD",
                                name = "温度",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
                                                            new Trait { name="values", max=1,min = 0, value_key= new List<string> { "28"} },
                                                        },
                                bus_Data = new BusData
                                {
                                    SubnetID = 111,
                                    DeviceID = 15,
                                    LoopID = 1,
                                },
                            }.SaveFunctionData();
                            new Sensor()
                            {
                                sid = "030101123456781005050006ABCD",
                                name = "TVOC",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
                                                            new Trait { name="values", max=1,min = 0, value_key= new List<string> { "0.3"} },
                                                        },
                                bus_Data = new BusData
                                {
                                    SubnetID = 111,
                                    DeviceID = 15,
                                    LoopID = 1,
                                },
                            }.SaveFunctionData();
                            new Sensor()
                            {
                                sid = "030101123456781005030006ABCD",
                                name = "湿度",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
                                                            new Trait { name="values", max=1,min = 0, value_key= new List<string> { "15"} },
                                                        },
                                bus_Data = new BusData
                                {
                                    SubnetID = 111,
                                    DeviceID = 15,
                                    LoopID = 1,
                                },
                            }.SaveFunctionData();
                            instance.SaveResidenceData();
                        }
#endif




                    }
                    catch (Exception ex)
                    {
@@ -398,7 +404,7 @@
            ins_Room = null;
            ins_OidList = null;
            ins_Function = null;
            if(MainPage.IsRemote)
            if (MainPage.IsRemote)
            {
                Mqtt_Cloud.DisConnectRemoteMqttClient("退出登录，或者切换住宅");
            }
@@ -411,18 +417,23 @@
        /// <summary>
        /// 当前住宅的网关MAC
        /// </summary>
        public string residenceGatewayMAC = "00964E19C4467B1E";
        public string residenceGatewayMAC = "0281B9078C000000";// "00964E19C4467B1E";
        /// <summary>
        /// 保存住宅数据
        /// </summary>
        public void SaveResidenceData()
        {
            if (this == null|| this.residecenInfo==null)
            if (this == null || this.residecenInfo == null)
                return;
            var ssd = CommonPage.MyEncodingUTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
            var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
            FileUtils.WriteFileByBytes("DB_ResidenceData", ssd);
            MainPage.Log("Save DB_ResidenceData");
        }

        /// <summary>
        /// 当前选择的楼层
        /// </summary>
        public string CurFoor = Language.StringByID(StringId.All);

        #region 房间数据相关
        /// <summary>
@@ -462,12 +473,12 @@

                        foreach (var filePath in filePathList)
                        {
                            if (filePath.StartsWith("RoomData_") )
                            if (filePath.StartsWith("RoomData_"))
                            {
                                var roomDataBytes = FileUtils.ReadFile(filePath);
                                var roomDataString = CommonPage.MyEncodingUTF8.GetString(roomDataBytes);
                                var roomDataString = System.Text.Encoding.UTF8.GetString(roomDataBytes);
                                var room = Newtonsoft.Json.JsonConvert.DeserializeObject<Room>(roomDataString);
                                if(room != null)
                                if (room != null)
                                {
                                    ins_Room.Add(room);
                                }
@@ -486,17 +497,16 @@
        /// 删除房间
        /// </summary>
        /// <param name="delRoom"></param>
        public static void DelRoom (Room delRoom)
        public static void DelRoom(Room delRoom)
        {
            var tRoom = rooms.Find((obj) => obj.sid == delRoom.sid);
            if (tRoom!=null)
            if (tRoom != null)
            {
                FileUtils.DeleteFile(delRoom.roomSavePath);
                rooms.Remove(tRoom);
            }
        }
        #endregion


        #region 功能数据
        static FunctionList ins_Function;
@@ -527,7 +537,7 @@
                                    case FunctionType.AC:
                                        //恢复空调数据
                                        var acDataBytes = FileUtils.ReadFile(filePath);
                                        var acString = CommonPage.MyEncodingUTF8.GetString(acDataBytes);
                                        var acString = System.Text.Encoding.UTF8.GetString(acDataBytes);
                                        ins_Function.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(acString));
                                        break;
                                    case FunctionType.Relay:
@@ -535,20 +545,21 @@
                                    case FunctionType.RGB:
                                        //恢复灯光数据
                                        var lightsDataBytes = FileUtils.ReadFile(filePath);
                                        var lightsString = CommonPage.MyEncodingUTF8.GetString(lightsDataBytes);
                                        var lightsString = System.Text.Encoding.UTF8.GetString(lightsDataBytes);
                                        ins_Function.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(lightsString));
                                        break;
                                    case FunctionType.Curtain:
                                    case FunctionType.MotorCurtain:
                                    case FunctionType.RollingShutter:
                                        //恢复窗帘数据
                                        var curtainsDataBytes = FileUtils.ReadFile(filePath);
                                        var curtainsString = CommonPage.MyEncodingUTF8.GetString(curtainsDataBytes);
                                        var curtainsString = System.Text.Encoding.UTF8.GetString(curtainsDataBytes);
                                        ins_Function.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(curtainsString));
                                        break;
                                    case FunctionType.FloorHeating:
                                        //恢复地热数据
                                        var fhDataBytes = FileUtils.ReadFile(filePath);
                                        var fhString = CommonPage.MyEncodingUTF8.GetString(fhDataBytes);
                                        var fhString = System.Text.Encoding.UTF8.GetString(fhDataBytes);
                                        ins_Function.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(fhString));
                                        break;
                                    case FunctionType.PM25:
@@ -558,31 +569,31 @@
                                    case FunctionType.Humidity:
                                        //恢复环境数据
                                        var sesDataBytes = FileUtils.ReadFile(filePath);
                                        var sesString = CommonPage.MyEncodingUTF8.GetString(sesDataBytes);
                                        var sesString = System.Text.Encoding.UTF8.GetString(sesDataBytes);
                                        ins_Function.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(sesString));
                                        break;
                                    case FunctionType.Socket:
                                        //恢复插座数据
                                        var eleDataBytes = FileUtils.ReadFile(filePath);
                                        var eleString = CommonPage.MyEncodingUTF8.GetString(eleDataBytes);
                                        var eleString = System.Text.Encoding.UTF8.GetString(eleDataBytes);
                                        ins_Function.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(eleString));
                                        break;
                                    case FunctionType.TV:
                                        //恢复电视数据
                                        var eleDataBytes1 = FileUtils.ReadFile(filePath);
                                        var eleString1 = CommonPage.MyEncodingUTF8.GetString(eleDataBytes1);
                                        var eleString1 = System.Text.Encoding.UTF8.GetString(eleDataBytes1);
                                        ins_Function.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(eleString1));
                                        break;
                                    case FunctionType.Fan:
                                        //恢复风扇数据
                                        var eleDataBytes2 = FileUtils.ReadFile(filePath);
                                        var eleString2 = CommonPage.MyEncodingUTF8.GetString(eleDataBytes2);
                                        var eleString2 = System.Text.Encoding.UTF8.GetString(eleDataBytes2);
                                        ins_Function.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(eleString2));
                                        break;
                                    case FunctionType.Scene:
                                        //恢复场景数据
                                        var scenesDataBytes = FileUtils.ReadFile(filePath);
                                        var scenesString = CommonPage.MyEncodingUTF8.GetString(scenesDataBytes);
                                        var scenesString = System.Text.Encoding.UTF8.GetString(scenesDataBytes);
                                        ins_Function.scenes.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(scenesString));
                                        break;

@@ -649,18 +660,18 @@
                    foreach (var function in functionList.GetAllDeviceFunctionList())
                    {
                        System.Threading.Thread.Sleep(100);
                        //if (function.bus_Data != null)
                        switch (function.functionCategory)
                        {
                            switch (function.functionCategory)
                            {
                                case FunctionCategory.Light:
                                case FunctionCategory.Electrical:
                                case FunctionCategory.SwitchDevice:
                                case FunctionCategory.Curtain:
                                case FunctionCategory.Thermostat:
                                    Control.SendReadCommand(function);
                                    break;
                            }
                            case FunctionCategory.Light:
                            case FunctionCategory.Electrical:
                            case FunctionCategory.SwitchDevice:
                            case FunctionCategory.Curtain:
                            case FunctionCategory.Thermostat:
                                if (DB_ResidenceData.residenceData.GatewayType == 0)
                                {
                                    DriverLayer.Control.ins.SendReadCommand(function);
                                }
                                break;
                        }
                    }
                }