From af4101b1d8461331bc3163b738fc75d4bf67c85c Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期二, 28 七月 2020 17:47:44 +0800 Subject: [PATCH] 2020-07-28-1 --- HDL_ON/Entity/DB_ResidenceData.cs | 530 +++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 337 insertions(+), 193 deletions(-) diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs index e94bcc2..9f4dfd5 100644 --- a/HDL_ON/Entity/DB_ResidenceData.cs +++ b/HDL_ON/Entity/DB_ResidenceData.cs @@ -11,24 +11,33 @@ } /// <summary> - /// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮� + /// 0:A鍗忚缃戝叧 + /// 1:bus缃戝叧 + /// 2:knx缃戝叧 /// </summary> - public int CurReginIndex = 0; + public int GatewayType = 0; /// <summary> /// 浣忓畢鍩虹淇℃伅 /// </summary> - public RegionInfoRes residecenInfo { + public RegionInfoRes residecenInfo + { get { - return MainPage.LoginUser.regionList[CurReginIndex]; + return MainPage.LoginUser.regionList.Find((obj) => obj.RegionID == CurReginID); } } /// <summary> + /// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮� + /// </summary> + public string CurReginID = ""; + + + /// <summary> /// 妤煎眰鍒楄〃 /// </summary> - public List<string> floors = new List<string>(); + public List<Floor> floors = new List<Floor>(); /// <summary> /// 鎴块棿鍒楄〃 @@ -82,201 +91,201 @@ } #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("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 (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" }; + var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "", 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 = "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.floors.Add(new Floor() { sid = "", name = "1 F" }); + 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 = "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, - // }, - // }); + },// "rollingshutter", + lastState = "20%", + bus_Data = new BusData + { + SubnetID = 42, + DeviceID = 17, + LoopID = 1, + }, + }); + 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() { sid = "12341212345678901234561010020006ABCD", name = "椋庢墖", - propertList = new List<Trait>() { + function = 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", @@ -294,7 +303,7 @@ { sid = "12341212345678901234561010030006ABCD", name = "鐢佃", - propertList = new List<Trait>() { + function = new List<Trait>() { new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} }, }, roomIdList = new List<string>() { "0001" }, @@ -311,7 +320,7 @@ { sid = "12341212345678901234560101020006ABCD", name = "鎻掑骇", - propertList = new List<Trait>() { + function = new List<Trait>() { new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} }, },//"brightness,color", roomIdList = new List<string>() { "0001" }, @@ -322,6 +331,135 @@ LoopID = 1, }, }); + + 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 = "1234121234567890123456100B060006ABCD", + name = "PM2.5", + roomIdList = new List<string>() { "0001" }, + function = new List<Trait>() { + new Trait { attri="values", max=1,min = 0, value= new List<string> { "22"} }, + }, + bus_Data = new BusData + { + SubnetID = 111, + DeviceID = 15, + LoopID = 1, + }, + }); + //instance.functionList.sensorsEnvironmentalScience.Add(new Sensor() + //{ + // sid = "1234121234567890123456100B030006ABCD", + // name = "鍣煶", + // roomIdList = new List<string>() { "0001" }, + // propertList = new List<Trait>() { + // new Trait { attri="values", max=1,min = 0, value= new List<string> { "120"} }, + // }, + // bus_Data = new BusData + // { + // SubnetID = 142, + // DeviceID = 4, + // LoopID = 111, + // }, + //}); + //instance.functionList.sensorsEnvironmentalScience.Add(new Sensor() + //{ + // sid = "1234121234567890123456100B040006ABCD", + // name = "椋庡姏", + // roomIdList = new List<string>() { "0001" }, + // propertList = new List<Trait>() { + // new Trait { attri="values", max=1,min = 0, value= new List<string> { "1.8"} }, + // }, + // bus_Data = new BusData + // { + // SubnetID = 142, + // DeviceID = 4, + // LoopID = 111, + // }, + //}); + instance.functionList.sensorsEnvironmentalScience.Add(new Sensor() + { + sid = "1234121234567890123456100B070006ABCD", + name = "CO2", + roomIdList = new List<string>() { "0001" }, + function = new List<Trait>() { + new Trait { attri="values", max=1,min = 0, value= new List<string> { "1352"} }, + }, + bus_Data = new BusData + { + SubnetID = 111, + DeviceID = 15, + LoopID = 1, + }, + }); + instance.functionList.sensorsEnvironmentalScience.Add(new Sensor() + { + sid = "1234121234567890123456100B020006ABCD", + name = "娓╁害", + roomIdList = new List<string>() { "0001" }, + function = new List<Trait>() { + new Trait { attri="values", max=1,min = 0, value= new List<string> { "28"} }, + }, + bus_Data = new BusData + { + SubnetID = 111, + DeviceID = 15, + LoopID = 1, + }, + }); + instance.functionList.sensorsEnvironmentalScience.Add(new Sensor() + { + sid = "1234121234567890123456100B050006ABCD", + name = "TVOC", + roomIdList = new List<string>() { "0001" }, + function = new List<Trait>() { + new Trait { attri="values", max=1,min = 0, value= new List<string> { "0.3"} }, + }, + bus_Data = new BusData + { + SubnetID = 111, + DeviceID = 15, + LoopID = 1, + }, + }); + instance.functionList.sensorsEnvironmentalScience.Add(new Sensor() + { + sid = "1234121234567890123456100B030006ABCD", + name = "婀垮害", + roomIdList = new List<string>() { "0001" }, + function = new List<Trait>() { + new Trait { attri="values", max=1,min = 0, value= new List<string> { "15"} }, + }, + bus_Data = new BusData + { + SubnetID = 111, + DeviceID = 15, + LoopID = 1, + }, + }); + + + + + + + instance.SaveResidenceData(); @@ -336,7 +474,8 @@ { MainPage.Log($"浣忓畢鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}"); } - instance.residenceImage = "Classification/Room/Roombg.png"; + if (instance!=null) { + instance.residenceImage = "Classification/Room/Roombg.png";} //鍒濆鍖栦綇瀹呭姛鑳芥暟鎹� InitRoomFunction(); @@ -344,8 +483,13 @@ return instance; } } - - + /// <summary> + /// 閫�鍑鸿处鍙锋竻绌烘暟鎹� + /// </summary> + public void EixtAccount() + { + instance = null; + } /// <summary> /// 浣忓畢鍥剧墖 -- Gitblit v1.8.0