20200811

wxr

2020-08-11 2bec9c838d2d688025698de8ec1de401ffd7dd1f

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -102,35 +102,35 @@
                        {
                            var s0 = new Scene()
                            {
                                sid = "12341212345678901234560A0A010001ABCD",
                                sid = "030101123456780A0A010001ABCD",
                                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 });
                            s0.bus_SceneData.Add("030101123456780202010002ABCD", new byte[] { 1, 0, 0, 0 });
                            s0.bus_SceneData.Add("030101123456780202020005ABCD", new byte[] { 1, 0, 0, 0 });
                            s0.bus_SceneData.Add("030101123456780202040006ABCD", new byte[] { 1, 0, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
                            s0.bus_SceneData.Add("030101123456780604010001ABCD", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 0, 0, 1, 28, 0 });
                            s0.bus_SceneData.Add("030101123456780303010003ABCD", new byte[] { 1, 2 });
                            DB_ResidenceData.residenceData.functionList.scenes.Add(s0);
                            var s1 = new Scene()
                            {
                                sid = "12341212345678901234560A0A00010002ABCD",
                                sid = "030101123456780A0A00010002ABCD",
                                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 });
                            s1.bus_SceneData.Add("030101123456780202010002ABCD", new byte[] { 1, 100, 0, 0 });
                            s1.bus_SceneData.Add("030101123456780202020005ABCD", new byte[] { 1, 100, 0, 0 });
                            s1.bus_SceneData.Add("030101123456780202040006ABCD", new byte[] { 1, 100, 254, 0, 0, 3, 255, 0, 0, 0, 0 });
                            s1.bus_SceneData.Add("030101123456780604010001ABCD", new byte[] { 1, 0, 32, 32, 32, 32, 32, 0, 1, 0, 1, 28, 0 });
                            s1.bus_SceneData.Add("030101123456780303010003ABCD", new byte[] { 1, 1 });
                            DB_ResidenceData.residenceData.functionList.scenes.Add(s1);
                            var s2 = new Scene()
                            {
                                sid = "12341212345678901234560A0A010004ABCD",
                                sid = "030101123456780A0A010004ABCD",
                                name = "电影场景",
                                sceneType = SceneType.MovieScene,
                                roomIdList = new List<string>() { "0001" },
@@ -138,7 +138,7 @@
                            DB_ResidenceData.residenceData.functionList.scenes.Add(s2);
                            var s3 = new Scene()
                            {
                                sid = "12341212345678901234560A0A010005ABCD",
                                sid = "030101123456780A0A010005ABCD",
                                name = "电影场景2",
                                sceneType = SceneType.MovieScene,
                                roomIdList = new List<string>() { "0001" },
@@ -153,7 +153,7 @@
                            instance.floors.Add(new Floor() { sid = "", name = "1 F" });
                            instance.functionList.aCs.Add(new AC()
                            {
                                sid = "12341212345678901234560604010001ABCD",
                                sid = "030101123456780604010001ABCD",
                                name = "空调",
                                function = new List<Trait>() {
                                        new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
@@ -172,7 +172,7 @@
                            });
                            instance.functionList.lights.Add(new Light()
                            {
                                sid = "12341212345678901234560202010002ABCD",
                                sid = "030101123456780202010002ABCD",
                                name = "调光灯",
                                function = new List<Trait>() {
                                        new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "up","down"} },
@@ -189,7 +189,7 @@
                            });
                            instance.functionList.curtains.Add(new Curtain()
                            {
                                sid = "12341212345678901234560303010003ABCD",
                                sid = "030101123456780303010003ABCD",
                                name = "窗帘模块",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
@@ -205,7 +205,7 @@
                            });
                            instance.functionList.curtains.Add(new Curtain()
                            {
                                sid = "12341212345678901234560303030011ABCD",
                                sid = "030101123456780303030011ABCD",
                                name = "开合帘",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
@@ -221,7 +221,7 @@
                            });
                            instance.functionList.curtains.Add(new Curtain()
                            {
                                sid = "12341212345678901234560503040012ABCD",
                                sid = "030101123456780503040012ABCD",
                                name = "卷帘",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
@@ -239,7 +239,7 @@
                            });
                            instance.functionList.floorHeatings.Add(new FloorHeating()
                            {
                                sid = "12341212345678901234560404020004ABCD",
                                sid = "030101123456780404020004ABCD",
                                name = "地热",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
@@ -257,7 +257,7 @@
                            });
                            instance.functionList.lights.Add(new Light()
                            {
                                sid = "12341212345678901234560202020005ABCD",
                                sid = "030101123456780202020005ABCD",
                                name = "吊灯",
                                function = new List<Trait>() {
                                        new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off"} },
@@ -272,7 +272,7 @@
                            });
                            instance.functionList.lights.Add(new Light()
                            {
                                sid = "12341212345678901234560202040006ABCD",
                                sid = "030101123456780202040006ABCD",
                                name = "RGB灯",
                                function = new List<Trait>() {
                                        new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "on","off"} },
@@ -290,7 +290,7 @@

                            instance.functionList.fans.Add(new Fan()
                            {
                                sid = "12341212345678901234561010020006ABCD",
                                sid = "030101123456781010020006ABCD",
                                name = "风扇",
                                function = new List<Trait>() {
                                    new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
@@ -308,7 +308,7 @@

                            instance.functionList.tVs.Add(new TV()
                            {
                                sid = "12341212345678901234561010030006ABCD",
                                sid = "030101123456781010030006ABCD",
                                name = "电视",
                                function = new List<Trait>() {
                                    new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
@@ -325,7 +325,7 @@

                            instance.functionList.switchSockets.Add(new SwitchSocket()
                            {
                                sid = "12341212345678901234560101020006ABCD",
                                sid = "030101123456780101020006ABCD",
                                name = "插座",
                                function = new List<Trait>() {
                                    new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} },
@@ -339,25 +339,25 @@
                                },
                            });

                            instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
                            {
                                sid = "1234121234567890123456100B010006ABCD",
                                name = "PM1.0",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
                                    new Trait { attri="values", max=1,min = 0, value= new List<string> { "135"} },
                                },
                                bus_Data = new BusData
                                {
                                    SubnetID = 111,
                                    DeviceID = 15,
                                    LoopID = 1,
                                },
                            });;
                            //instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
                            //{
                            //    sid = "03010112345678100B010006ABCD",
                            //    name = "PM1.0",
                            //    roomIdList = new List<string>() { "0001" },
                            //    function = new List<Trait>() {
                            //        new Trait { attri="values", max=1,min = 0, value= new List<string> { "135"} },
                            //    },
                            //    bus_Data = new BusData
                            //    {
                            //        SubnetID = 111,
                            //        DeviceID = 15,
                            //        LoopID = 1,
                            //    },
                            //});;

                            instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
                            {
                                sid = "1234121234567890123456100B060006ABCD",
                                sid = "03010112345678100B060006ABCD",
                                name = "PM2.5",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
@@ -372,7 +372,7 @@
                            });
                            //instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
                            //{
                            //    sid = "1234121234567890123456100B030006ABCD",
                            //    sid = "03010112345678100B030006ABCD",
                            //    name = "噪音",
                            //    roomIdList = new List<string>() { "0001" },
                            //    propertList = new List<Trait>() {
@@ -387,7 +387,7 @@
                            //});
                            //instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
                            //{
                            //    sid = "1234121234567890123456100B040006ABCD",
                            //    sid = "03010112345678100B040006ABCD",
                            //    name = "风力",
                            //    roomIdList = new List<string>() { "0001" },
                            //    propertList = new List<Trait>() {
@@ -402,7 +402,7 @@
                            //});
                            instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
                            {
                                sid = "1234121234567890123456100B070006ABCD",
                                sid = "03010112345678100B070006ABCD",
                                name = "CO2",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
@@ -417,7 +417,7 @@
                            });
                            instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
                            {
                                sid = "1234121234567890123456100B020006ABCD",
                                sid = "03010112345678100B020006ABCD",
                                name = "温度",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
@@ -432,7 +432,7 @@
                            });
                            instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
                            {
                                sid = "1234121234567890123456100B050006ABCD",
                                sid = "03010112345678100B050006ABCD",
                                name = "TVOC",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
@@ -447,7 +447,7 @@
                            });
                            instance.functionList.sensorsEnvironmentalScience.Add(new Sensor()
                            {
                                sid = "1234121234567890123456100B030006ABCD",
                                sid = "03010112345678100B030006ABCD",
                                name = "湿度",
                                roomIdList = new List<string>() { "0001" },
                                function = new List<Trait>() {
@@ -542,7 +542,7 @@
                    foreach (var function in functionList.functions)
                    {
                        System.Threading.Thread.Sleep(100);
                        if (function.bus_Data != null)
                        //if (function.bus_Data != null)
                        {
                            switch (function.functionCategory)
                            {
@@ -551,15 +551,9 @@
                                case FunctionCategory.SwitchDevice:
                                case FunctionCategory.Curtain:
                                case FunctionCategory.Thermostat:
                                    Control.Send(CommandType_A.read, function);
                                    Control.SendReadCommand(function);
                                    break;


                            }
                        }
                        else
                        {

                        }
                    }
                }