From 2bec9c838d2d688025698de8ec1de401ffd7dd1f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 11 八月 2020 14:13:55 +0800 Subject: [PATCH] 20200811 --- HDL_ON/DAL/Server/HttpServerRequest.cs | 31 ++++++++----------------------- 1 files changed, 8 insertions(+), 23 deletions(-) diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs index 71b3b30..c297ae7 100644 --- a/HDL_ON/DAL/Server/HttpServerRequest.cs +++ b/HDL_ON/DAL/Server/HttpServerRequest.cs @@ -919,23 +919,8 @@ /// <summary> /// 鍔熻兘ID - /// 鍘傚晢浠g爜 2bytes; 01 HDL - /// 閫氳鏂瑰紡 1byte ; 01 HDL Bus; 02 Zigbee;03 KNX;04 Z-Wave - /// 浜у搧GUID 8bytes - /// 浜у搧绫诲埆 1byte ; 01 璋冨厜鍣�;02缁х數鍣�;03骞叉帴鐐规ā鍧�;04浼犳劅鍣�;05闈㈡澘 - /// 鐗╂ā鍨嬬被鍨�2bytes 01 寮�鍏崇被 --01寮�鍏�;02鎻掑骇 - /// 02 鐓ф槑 --01寮�鍏崇被;02璋冨厜绫�;03鑹叉俯;04LED - /// 03 閬槼 --01绐楀笜鐢垫満;02鐧惧彾绐�;03寮�鍚堝笜;04鍗峰笜 - /// 04 鎭掓俯鍣� --01绌鸿皟;02鍦版殩;03姣涚粏绌鸿皟 - /// 05 鏂伴 - /// 06 褰遍煶 - /// 07 闊充箰 - /// 08 鑳芥簮 - /// 09 瀹夐槻 - /// 閫氶亾鍙� 2bytes - /// Key_id 2bytes /// </summary> - /// "00010112345678901234560101230123AABB"; + /// "03010112345678901234560101230123AABB"; var buffer = Guid.NewGuid().ToByteArray(); string guid = ""; if (buffer != null) @@ -973,7 +958,7 @@ } DB_ResidenceData.residenceData.functionList.lights.Add(new Light() { - sid = "000101" + guid + "0102010001AABB", + sid = "030101" + guid + "0102010001AABB", name = ss.GetValue("Name").ToString(), function = new List<Trait>() { new Trait { attri="on_off", max=100,min = 0, value= new List<string> { "on","off"} }, @@ -999,7 +984,7 @@ } DB_ResidenceData.residenceData.functionList.lights.Add(new Light() { - sid = "000101" + guid + "0202020001AABB", + sid = "030101" + guid + "0202020001AABB", name = ss.GetValue("Name").ToString(), function = new List<Trait>() { new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "up","down"} }, @@ -1026,7 +1011,7 @@ } DB_ResidenceData.residenceData.functionList.lights.Add(new Light() { - sid = "000101" + guid + "0202040001AABB", + sid = "030101" + guid + "0202040001AABB", name = ss.GetValue("Name").ToString(), function = new List<Trait>() { new Trait { attri="brightness", max=100,min = 0, value= new List<string> { "on","off"} }, @@ -1055,7 +1040,7 @@ } DB_ResidenceData.residenceData.functionList.aCs.Add(new AC() { - sid = "000101" + guid + "0204010001AABB", + sid = "030101" + guid + "0204010001AABB", name = ss.GetValue("Name").ToString(), function = new List<Trait>() { new Trait { attri="on_off", max=1,min = 0, value= new List<string> { "on","off"} }, @@ -1085,7 +1070,7 @@ } DB_ResidenceData.residenceData.functionList.curtains.Add(new Curtain() { - sid = "000101" + guid + "0203010001AABB", + sid = "030101" + guid + "0203010001AABB", name = ss.GetValue("Name").ToString(), roomIdList = roomIds, //roomIdList = new List<string>() { roomSid }, @@ -1111,7 +1096,7 @@ } DB_ResidenceData.residenceData.functionList.curtains.Add(new Curtain() { - sid = "000101" + guid + "0203040001AABB", + sid = "030101" + guid + "0203040001AABB", name = ss.GetValue("Name").ToString(), roomIdList = roomIds, //roomIdList = new List<string>() { roomSid }, @@ -1137,7 +1122,7 @@ } DB_ResidenceData.residenceData.functionList.curtains.Add(new Curtain() { - sid = "000101" + guid + "0203030001AABB", + sid = "030101" + guid + "0203030001AABB", name = ss.GetValue("Name").ToString(), roomIdList = roomIds, //roomIdList = new List<string>() { roomSid }, -- Gitblit v1.8.0