20200511

wxr

2020-05-11 7f233a10afa6882b4d9531185af60e8843bc1af2

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -82,161 +82,238 @@
                        }

#if DEBUG
                        if (DB_ResidenceData.residenceData.functionList.scenes.Count == 0)
                        {
                            var s0 = new Scene()
                            {
                                sid = "12341212345678901234560A00010001ABCD",
                                name = "全关场景",
                                sceneType = SceneType.OrdinaryScenes,
                                roomIdList = new List<string>() { "0001" },
                                bus_SceneData = new Dictionary<string, byte[]>(),
                            };
                            s0.bus_SceneData.Add("12341212345678901234560202020002ABCD", new byte[] { 1, 0, 0, 0 });
                            s0.bus_SceneData.Add("12341212345678901234560202010005ABCD", new byte[] { 1, 0, 0, 0 });
                            s0.bus_SceneData.Add("12341212345678901234560202040006ABCD", new byte[] { 1, 0, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
                            s0.bus_SceneData.Add("12341212345678901234560604010001ABCD", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 0, 0, 1, 28, 0 });
                            s0.bus_SceneData.Add("12341212345678901234560303010003ABCD", new byte[] { 1, 2 });
                            DB_ResidenceData.residenceData.functionList.scenes.Add(s0);
                            var s1 = new Scene()
                            {
                                sid = "12341212345678901234560A00010002ABCD",
                                name = "全开场景",
                                sceneType = SceneType.OrdinaryScenes,
                                roomIdList = new List<string>() { "0001" },
                                bus_SceneData = new Dictionary<string, byte[]>(),
                            };
                            s1.bus_SceneData.Add("12341212345678901234560202020002ABCD", new byte[] { 1, 100, 0, 0 });
                            s1.bus_SceneData.Add("12341212345678901234560202010005ABCD", new byte[] { 1, 100, 0, 0 });
                            s1.bus_SceneData.Add("12341212345678901234560202040006ABCD", new byte[] { 1, 100, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
                            s1.bus_SceneData.Add("12341212345678901234560604010001ABCD", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 1, 0, 1, 28, 0 });
                            s1.bus_SceneData.Add("12341212345678901234560303010003ABCD", new byte[] { 1, 1 });
                            DB_ResidenceData.residenceData.functionList.scenes.Add(s1);
                            var s2 = new Scene()
                            {
                                sid = "12341212345678901234560A00010004ABCD",
                                name = "电影场景",
                                sceneType = SceneType.MovieScene,
                                roomIdList = new List<string>() { "0001" },
                            };
                            DB_ResidenceData.residenceData.functionList.scenes.Add(s2);
                            var s3 = new Scene()
                            {
                                sid = "12341212345678901234560A00010005ABCD",
                                name = "电影场景2",
                                sceneType = SceneType.MovieScene,
                                roomIdList = new List<string>() { "0001" },
                            };
                            DB_ResidenceData.residenceData.functionList.scenes.Add(s3);
                        }
                        //if (DB_ResidenceData.residenceData.functionList.scenes.Count == 0)
                        //{
                        //    var s0 = new Scene()
                        //    {
                        //        sid = "12341212345678901234560A0A010001ABCD",
                        //        name = "全关场景",
                        //        sceneType = SceneType.OrdinaryScenes,
                        //        roomIdList = new List<string>() { "0001" },
                        //        bus_SceneData = new Dictionary<string, byte[]>(),
                        //    };
                        //    s0.bus_SceneData.Add("12341212345678901234560202020002ABCD", new byte[] { 1, 0, 0, 0 });
                        //    s0.bus_SceneData.Add("12341212345678901234560202010005ABCD", new byte[] { 1, 0, 0, 0 });
                        //    s0.bus_SceneData.Add("12341212345678901234560202040006ABCD", new byte[] { 1, 0, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
                        //    s0.bus_SceneData.Add("12341212345678901234560604010001ABCD", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 0, 0, 1, 28, 0 });
                        //    s0.bus_SceneData.Add("12341212345678901234560303010003ABCD", new byte[] { 1, 2 });
                        //    DB_ResidenceData.residenceData.functionList.scenes.Add(s0);
                        //    var s1 = new Scene()
                        //    {
                        //        sid = "12341212345678901234560A0A00010002ABCD",
                        //        name = "全开场景",
                        //        sceneType = SceneType.OrdinaryScenes,
                        //        roomIdList = new List<string>() { "0001" },
                        //        bus_SceneData = new Dictionary<string, byte[]>(),
                        //    };
                        //    s1.bus_SceneData.Add("12341212345678901234560202020002ABCD", new byte[] { 1, 100, 0, 0 });
                        //    s1.bus_SceneData.Add("12341212345678901234560202010005ABCD", new byte[] { 1, 100, 0, 0 });
                        //    s1.bus_SceneData.Add("12341212345678901234560202040006ABCD", new byte[] { 1, 100, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
                        //    s1.bus_SceneData.Add("12341212345678901234560604010001ABCD", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 1, 0, 1, 28, 0 });
                        //    s1.bus_SceneData.Add("12341212345678901234560303010003ABCD", new byte[] { 1, 1 });
                        //    DB_ResidenceData.residenceData.functionList.scenes.Add(s1);
                        //    var s2 = new Scene()
                        //    {
                        //        sid = "12341212345678901234560A0A010004ABCD",
                        //        name = "电影场景",
                        //        sceneType = SceneType.MovieScene,
                        //        roomIdList = new List<string>() { "0001" },
                        //    };
                        //    DB_ResidenceData.residenceData.functionList.scenes.Add(s2);
                        //    var s3 = new Scene()
                        //    {
                        //        sid = "12341212345678901234560A0A010005ABCD",
                        //        name = "电影场景2",
                        //        sceneType = SceneType.MovieScene,
                        //        roomIdList = new List<string>() { "0001" },
                        //    };
                        //    DB_ResidenceData.residenceData.functionList.scenes.Add(s3);
                        //}
                        if (instance.rooms.Count == 0)
                        {
                            //--------------------
                            var r111 = new Room() { sid = "0001", name = "Room-1", floorIndex = 1, backgroundImage = "Classification/Room/Roombg.png" };
                            var r111 = new Room() { sid = "0001", name = "Room-1", floorIndex = 0, backgroundImage = "Classification/Room/Roombg.png" };
                            instance.rooms.Add(r111);
                            instance.functionList.aCs.Add(new AC()
                            {
                                sid = "12341212345678901234560604010001ABCD",
                                name = "空调",
                                trait = new List<Trait>() {
                                    new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
                                    new Trait { attri="mode", max = 2,min =0,value = new List<string>{ "auto", "heat", "cool","dry" } },
                                    new Trait { attri = "fan",max = 3,min =0,value = new List<string>{ "low", "mid", "high" ,"auto"} },
                                    new Trait { attri = "temperature", max = 32,min=16,value = new List<string>{"up","down" } },
                                },
                                roomIdList = new List<string>() { "0001" },
                                lastState = "制冷 中风 18°C",
                                bus_Data = new BusData
                                {
                                    SubnetID = 42,
                                    DeviceID = 8,
                                    LoopID = 1,
                                },
                            });
                            instance.functionList.lights.Add(new Light()
                            {
                                sid = "12341212345678901234560202020002ABCD",
                                name = "调光灯",
                                trait = new List<Trait>() {
                                    new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "up","down"} },
                                },//"brightness",
                                roomIdList = new List<string>() { "0001" },
                                lastState = "20%",
                                bus_Data = new BusData
                                {
                                    SubnetID = 111,
                                    DeviceID = 2,
                                    LoopID = 1,
                                },
                            instance.floors.Add("1 F");
                            //    instance.functionList.aCs.Add(new AC()
                            //    {
                            //        sid = "12341212345678901234560604010001ABCD",
                            //        name = "空调",
                            //        propertList = new List<Trait>() {
                            //            new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
                            //            new Trait { attri="mode", max = 2,min =0,value = new List<string>{ "auto", "heat", "cool","dry" } },
                            //            new Trait { attri = "fan",max = 3,min =0,value = new List<string>{ "low", "medium", "high" ,"auto"} },
                            //            new Trait { attri = "temperature", max = 32,min=16,value = new List<string>{"up","down" } },
                            //        },
                            //        roomIdList = new List<string>() { "0001" },
                            //        lastState = "制冷 中风 18°C",
                            //        bus_Data = new BusData
                            //        {
                            //            SubnetID = 42,
                            //            DeviceID = 8,
                            //            LoopID = 1,
                            //        },
                            //    });
                            //    instance.functionList.lights.Add(new Light()
                            //    {
                            //        sid = "12341212345678901234560202020002ABCD",
                            //        name = "调光灯",
                            //        propertList = new List<Trait>() {
                            //            new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "up","down"} },
                            //        },//"brightness",
                            //        roomIdList = new List<string>() { "0001" },
                            //        lastState = "20%",
                            //        bus_Data = new BusData
                            //        {
                            //            SubnetID = 111,
                            //            DeviceID = 2,
                            //            LoopID = 1,
                            //        },

                            });
                            instance.functionList.curtains.Add(new Curtain()
                            //    });
                            //    instance.functionList.curtains.Add(new Curtain()
                            //    {
                            //        sid = "12341212345678901234560303010003ABCD",
                            //        name = "窗帘模块",
                            //        roomIdList = new List<string>() { "0001" },
                            //        propertList = new List<Trait>() {
                            //            new Trait { attri="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
                            //        },// "curtain",
                            //        lastState = "开",
                            //        bus_Data = new BusData
                            //        {
                            //            SubnetID = 42,
                            //            DeviceID = 7,
                            //            LoopID = 1,
                            //        },
                            //    });
                            //    instance.functionList.curtains.Add(new Curtain()
                            //    {
                            //        sid = "12341212345678901234560303030011ABCD",
                            //        name = "开合帘",
                            //        roomIdList = new List<string>() { "0001" },
                            //        propertList = new List<Trait>() {
                            //            new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
                            //        },//"curtaintype",
                            //        lastState = "20%",
                            //        bus_Data = new BusData
                            //        {
                            //            SubnetID = 42,
                            //            DeviceID = 7,
                            //            LoopID = 11,
                            //        },
                            //    });
                            //    instance.functionList.curtains.Add(new Curtain()
                            //    {
                            //        sid = "12341212345678901234560503040012ABCD",
                            //        name = "卷帘",
                            //        roomIdList = new List<string>() { "0001" },
                            //        propertList = new List<Trait>() {
                            //            new Trait { attri="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
                            //            new Trait { attri="openLevel", max=100,min = 0, value= new List<string> { "percent" } },

                            //        },// "rollingshutter",
                            //        lastState = "20%",
                            //        bus_Data = new BusData
                            //        {
                            //            SubnetID = 42,
                            //            DeviceID = 7,
                            //            LoopID = 12,
                            //        },
                            //    });
                            //    instance.functionList.floorHeatings.Add(new FloorHeating()
                            //    {
                            //        sid = "12341212345678901234560404020004ABCD",
                            //        name = "地热",
                            //        roomIdList = new List<string>() { "0001" },
                            //        propertList = new List<Trait>() {
                            //            new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
                            //            new Trait { attri="mode", max = 2,min =0,value = new List<string>{ "ordinary", "day", "night","timer","away" } },
                            //            new Trait { attri = "temperature", max = 32,min=16,value = new List<string>{"up","down" } },
                            //        },//
                            //        lastState = "自动 25°C",
                            //        bus_Data = new BusData
                            //        {
                            //            SubnetID = 111,
                            //            DeviceID = 12,
                            //            LoopID = 1
                            //        }
                            //    });
                            //    instance.functionList.lights.Add(new Light()
                            //    {
                            //        sid = "12341212345678901234560202010005ABCD",
                            //        name = "吊灯",
                            //        propertList = new List<Trait>() {
                            //            new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
                            //        },//"on_off",
                            //        roomIdList = new List<string>() { "0001" },
                            //        bus_Data = new BusData
                            //        {
                            //            SubnetID = 42,
                            //            DeviceID = 6,
                            //            LoopID = 1,
                            //        },
                            //    });
                            //    instance.functionList.lights.Add(new Light()
                            //    {
                            //        sid = "12341212345678901234560202040006ABCD",
                            //        name = "RGB灯",
                            //        propertList = new List<Trait>() {
                            //            new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "on","off"} },
                            //            new Trait { attri="color", max=100,min = 0, value= new List<string> { "255", "255", "255" } },
                            //        },//"brightness,color",
                            //        roomIdList = new List<string>() { "0001" },
                            //        bus_Data = new BusData
                            //        {
                            //            SubnetID = 42,
                            //            DeviceID = 4,
                            //            LoopID = 1,
                            //        },
                            //    });


                            instance.functionList.fans.Add(new Fan()
                            {
                                sid = "12341212345678901234560303010003ABCD",
                                name = "窗帘模块",
                                sid = "12341212345678901234561010020006ABCD",
                                name = "风扇",
                                propertList = new List<Trait>() {
                                    new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
                                    new Trait { attri="openLevel", max=7,min = 0, value= new List<string> { "percent" } },
                                },//"brightness,color",
                                roomIdList = new List<string>() { "0001" },
                                trait = new List<Trait>() {
                                    new Trait { attri="on_off", max=2,min = 0, value= new List<string> { "on","off","stop"} },
                                },// "curtain",
                                lastState = "开",
                                bus_Data = new BusData
                                {
                                    SubnetID = 42,
                                    DeviceID = 7,
                                    LoopID = 1,
                                },
                            });
                            instance.functionList.curtains.Add(new Curtain()
                            {
                                sid = "12341212345678901234560303030011ABCD",
                                name = "开合帘",
                                roomIdList = new List<string>() { "0001" },
                                trait = new List<Trait>() {
                                    new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
                                },//"curtaintype",
                                lastState = "20%",
                                bus_Data = new BusData
                                {
                                    SubnetID = 42,
                                    DeviceID = 7,
                                    SubnetID = 142,
                                    DeviceID = 4,
                                    LoopID = 11,
                                },
                            });
                            instance.functionList.curtains.Add(new Curtain()


                            instance.functionList.tVs.Add(new TV()
                            {
                                sid = "12341212345678901234560503040012ABCD",
                                name = "卷帘",
                                sid = "12341212345678901234561010030006ABCD",
                                name = "电视",
                                propertList = new List<Trait>() {
                                    new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
                                },
                                roomIdList = new List<string>() { "0001" },
                                trait = new List<Trait>() {
                                    new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off","stop"} },
                                },// "rollingshutter",
                                lastState = "20%",
                                bus_Data = new BusData
                                {
                                    SubnetID = 42,
                                    DeviceID = 7,
                                    LoopID = 12,
                                    SubnetID = 142,
                                    DeviceID = 4,
                                    LoopID = 111,
                                },
                            });
                            instance.functionList.floorHeatings.Add(new FloorHeating()


                            instance.functionList.switchSockets.Add(new SwitchSocket()
                            {
                                sid = "12341212345678901234560404020004ABCD",
                                name = "地热",
                                roomIdList = new List<string>() { "0001" },
                                trait = new List<Trait>() {
                                sid = "12341212345678901234560101020006ABCD",
                                name = "插座",
                                propertList = new List<Trait>() {
                                    new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
                                    new Trait { attri="mode", max = 2,min =0,value = new List<string>{ "auto", "heat", "cool","dry" } },
                                    new Trait { attri = "temperature", max = 32,min=16,value = new List<string>{"up","down" } },
                                },//
                                lastState = ""
                            });
                            instance.functionList.lights.Add(new Light()
                            {
                                sid = "12341212345678901234560202010005ABCD",
                                name = "吊灯",
                                trait = new List<Trait>() {
                                    new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
                                },//"on_off",
                                },//"brightness,color",
                                roomIdList = new List<string>() { "0001" },
                                bus_Data = new BusData
                                {
@@ -245,22 +322,8 @@
                                    LoopID = 1,
                                },
                            });
                            instance.functionList.lights.Add(new Light()
                            {
                                sid = "12341212345678901234560202040006ABCD",
                                name = "RGB灯",
                                trait = new List<Trait>() {
                                    new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "on","off"} },
                                    new Trait { attri="color", max=100,min = 0, value= new List<string> { "255", "255", "255" } },
                                },//"brightness,color",
                                roomIdList = new List<string>() { "0001" },
                                bus_Data = new BusData
                                {
                                    SubnetID = 42,
                                    DeviceID = 4,
                                    LoopID = 1,
                                },
                            });


                            instance.SaveResidenceData();
                        }

@@ -330,14 +393,14 @@
                            switch (function.functionCategory)
                            {
                                case FunctionCategory.Light:
                                    Control.Send(CommandType_A.read, function);
                                    break;
                                case FunctionCategory.Electrical:
                                case FunctionCategory.SwitchDevice:
                                case FunctionCategory.Curtain:
                                    Control.Send(CommandType_A.read, function);
                                    break;
                                case FunctionCategory.Thermostat:
                                    Control.Send(CommandType_A.read, function);
                                    break;


                            }
                        }
                        else