From 77e7b5223dd04a6e036dc952efb38f2b770a6828 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 六月 2020 13:50:43 +0800
Subject: [PATCH] 2020--6-9

---
 HDL_ON/Entity/DB_ResidenceData.cs |  360 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 180 insertions(+), 180 deletions(-)

diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 61d1e8a..09efd12 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -82,194 +82,194 @@
                         }
 
 #if DEBUG
-                        //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("12341212345678901234560202010002ABCD", new byte[] { 1, 0, 0, 0 });
-                        //    s0.bus_SceneData.Add("12341212345678901234560202020005ABCD", 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("12341212345678901234560202010002ABCD", new byte[] { 1, 100, 0, 0 });
-                        //    s1.bus_SceneData.Add("12341212345678901234560202020005ABCD", 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 (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("12341212345678901234560202010002ABCD", new byte[] { 1, 0, 0, 0 });
+                            s0.bus_SceneData.Add("12341212345678901234560202020005ABCD", 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("12341212345678901234560202010002ABCD", new byte[] { 1, 100, 0, 0 });
+                            s1.bus_SceneData.Add("12341212345678901234560202020005ABCD", 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 = 0, backgroundImage = "Classification/Room/Roombg.png" };
                             instance.rooms.Add(r111);
                             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 = "12341212345678901234560202010002ABCD",
-                            //        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.aCs.Add(new AC()
+                            {
+                                sid = "12341212345678901234560604010001ABCD",
+                                name = "绌鸿皟",
+                                function = 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 = "12341212345678901234560202010002ABCD",
+                                name = "璋冨厜鐏�",
+                                function = 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()
-                            //    {
-                            //        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" } },
+                            });
+                            instance.functionList.curtains.Add(new Curtain()
+                            {
+                                sid = "12341212345678901234560303010003ABCD",
+                                name = "绐楀笜妯″潡",
+                                roomIdList = new List<string>() { "0001" },
+                                function = 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" },
+                                function = 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" },
+                                function = 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 = "12341212345678901234560202020005ABCD",
-                            //        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,
-                            //        },
-                            //    });
+                                    },// "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" },
+                                function = 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 = "12341212345678901234560202020005ABCD",
+                                name = "鍚婄伅",
+                                function = 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鐏�",
+                                function = 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()

--
Gitblit v1.8.0