From fb5f023820eb6783bd62d0d69d9afbd00cd3f426 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 07 十二月 2020 16:50:47 +0800
Subject: [PATCH] 2020-12-07-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 89 ++++++++++----------------------------------
1 files changed, 21 insertions(+), 68 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 88130a2..a8ec927 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -55,17 +55,22 @@
logicId = sOidBeginsWith + sTimeSpan;
- logicId += "0A";
- logicId += "0A01";
- //0A01 鐗╂ā鍨嬩负閫昏緫锛� 0001 琛ㄧず 1 鍙烽�昏緫鍔熻兘
- int iTopLogicId = 1;
+ logicId += "15";
+ logicId += "1501";
+ //1501 鐗╂ā鍨嬩负閫昏緫锛� 0001 琛ㄧず 1 鍙烽�昏緫鍔熻兘
+ int maxId = 1;
- Random random = new Random();
- iTopLogicId = random.Next(0, 255);
- iTopLogicId += random.Next(0, 255);
- logicId += iTopLogicId.ToString("X4");//閫昏緫鍙� 涓や釜byte
- logicId += "1100";
+ for (int i = 0; i < Logic.LogicList.Count; i++)
+ {
+ string s = Logic.LogicList[i].sid.Substring(20, 4);
+ int iThisSceneId = Convert.ToInt16(s, 16);
+ if (iThisSceneId > maxId)
+ maxId = iThisSceneId ;
+ }
+
+ logicId += (maxId+1).ToString("X4");//閫昏緫鍙� 涓や釜byte
+ logicId += "0000";
}
catch
{
@@ -73,58 +78,6 @@
}
return logicId;
}
- /// <summary>
- /// 鐢熸垚閫昏緫sid鏂规硶
- /// </summary>
- //public static string NewSid()
- //{
- // String sLogicid = "";
- // try
- // {
- // String sOidBeginsWith = "000101";//鍘傚晢 + 閫氳鏂瑰紡
-
- // //鐢熸垚4涓猙yte鏃堕棿鎴�
- // DateTime dt = DateTime.Now;
- // long sTimeSp = GateWay.ConvertDateTimeLong(dt);
- // string sTimeSpan = "";
- // GateWay.ConvertIntToByteArray(sTimeSp, ref sTimeSpan);
- // if (sTimeSpan.Length != 8) return sLogicid;
-
- // //闂撮殧10姣 閿欏紑鏃堕棿鎴�
- // HDLUDP.TimeBetwnNext(10);
-
- // sLogicid = sOidBeginsWith + sTimeSpan;
-
- // //1501 鐗╂ā鍨嬩负鑷姩鍖栵紝 0001 琛ㄧず 1 鍙疯嚜鍔ㄥ寲鍔熻兘
- // sLogicid += "15";
- // sLogicid += "1501";
-
-
- // //鑷姩鍖栧彿鑷
- // int iTopSceneId = 1;
- // if (myGateway.LogicResponse != null)
- // {
- // if (myGateway.LogicResponse.objects != null)
- // {
- // for (int i = 0; i < myGateway.LogicResponse.objects.Count; i++)
- // {
- // string ccc = myGateway.LogicResponse.objects[i].sid.Substring(myGateway.LogicResponse.objects[i].sid.Length - 8, 4);
- // int iThisSceneId = Convert.ToInt16(myGateway.LogicResponse.objects[i].sid.Substring(myGateway.LogicResponse.objects[i].sid.Length - 8, 4), 16);
- // if (iThisSceneId >= iTopSceneId)
- // iTopSceneId = iThisSceneId + 1;
- // }
- // }
- // }
- // sLogicid += iTopSceneId.ToString("X4");//鍦烘櫙鍙� 涓や釜byte
- // //澶х被灏忕被娌℃湁鐢ㄥ埌 鍥哄畾涓�0
- // sLogicid += "0000";
- // return sLogicid;
- // }
- // catch
- // {
- // return sLogicid;
- // }
- //}
/// <summary>
/// 灏佽Dictionary瀵硅薄
@@ -148,7 +101,7 @@
/// <returns></returns>
public static List<HDL_ON.Entity.Room> GetGatewayRoomList()
{
- return HDL_ON.Entity.DB_ResidenceData.rooms;
+ return HDL_ON.Entity.DB_ResidenceData.residenceData.Rooms;
}
/// <summary>
/// 鑾峰彇缃戝叧鎴块棿鍒楄〃
@@ -159,8 +112,8 @@
List<Entity.Room> roomList = new List<Entity.Room>();
Entity.Room room1 = new Entity.Room();
- room1.name = name;//榛樿涓�涓埧闂村悕涓�:鍏ㄩ儴鍖哄煙
- room1.sid = "鍏ㄩ儴鍖哄煙";//榛樿sid鐢ㄨ瘑鍒鎴块棿
+ room1.roomName = name;//榛樿涓�涓埧闂村悕涓�:鍏ㄩ儴鍖哄煙
+ room1.uid = "鍏ㄩ儴鍖哄煙";//榛樿sid鐢ㄨ瘑鍒鎴块棿
roomList.Add(room1);//榛樿娣诲姞鍒版埧闂村垪琛ㄩ噷
var roomLists = GetGatewayRoomList();
foreach (var room in roomLists)
@@ -271,11 +224,11 @@
List<HDL_ON.Entity.Function> lists = GetGatewayDeviceList();
foreach (var dev in lists)
{
- if (dev.roomIds.Find((id) => id == room.sid) != null)
+ if (dev.roomIds.Find((id) => id == room.uid) != null)
{
deviceLists.Add(dev);
}
- if (room.sid == "鍏ㄩ儴鍖哄煙")
+ if (room.uid == "鍏ㄩ儴鍖哄煙")
{
//鎴块棿鍚嶄负鍏ㄩ儴鍖哄煙鏃讹紝鏄剧ず缃戝叧鍏ㄩ儴璁惧
deviceLists = lists;
@@ -335,10 +288,10 @@
foreach (var dev in device.roomIds)
{
- var room = roomLists.Find((c) => c.sid == dev);
+ var room = roomLists.Find((c) => c.uid == dev);
if (room != null)
{
- roomName += room.floorName + "." + room.name + ",";
+ roomName += room.floorName + "." + room.roomName + ",";
}
}
--
Gitblit v1.8.0