From 62d77d3bb8e7215d9da9ecf6f5aeda0b69f805f8 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 08 十二月 2020 18:57:15 +0800
Subject: [PATCH] 20201208
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 186 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 182 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 39cb9e7..1dbe612 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -73,6 +73,54 @@
}
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瀵硅薄
/// </summary>
@@ -95,7 +143,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>
/// 鑾峰彇缃戝叧鎴块棿鍒楄〃
@@ -123,8 +171,81 @@
/// <returns></returns>
public static List<HDL_ON.Entity.Function> GetGatewayDeviceList()
{
+ List<HDL_ON.Entity.Function> list = new List<Entity.Function>();
+ for (int i=0;i<10;i++) {
+ HDL_ON.Entity.Function function = new Entity.Function();
+ switch (i) {
+ case 0: {
+ function.sid = "1234560001212121020182";
+ function.name ="鐏厜";
+ list.Add(function);
+ }
+ break;
+ case 1: {
+
+ function.sid = "1234560001212121030182";
+ function.name = "绐楀笜";
+ list.Add(function);
+ } break;
+ case 2: {
+ function.sid = "1234560001212121040182";
+ function.name = "绌鸿皟";
+ list.Add(function);
+ } break;
+ case 3:
+ {
+ function.sid = "1234560001212121010282";
+ function.name = "RGBW";
+ list.Add(function);
+ }
+ break;
+ case 4:
+ {
- return HDL_ON.Entity.DB_ResidenceData.functionList.GetAllFunction();
+ function.sid = "1234560001212121010382";
+ function.name = "CCT鐏�";
+ list.Add(function);
+ }
+ break;
+ case 5:
+ {
+ function.sid = "1234560001212121010482";
+ function.name = "寮�鍚堝笜";
+ list.Add(function);
+ }
+ break;
+ case 6:
+ {
+ function.sid = "1234560001212121010582";
+ function.name = "鍗峰笜";
+ list.Add(function);
+ }
+ break;
+ case 7:
+ {
+ function.sid = "1234560001212121040282";
+ function.name = "鍦扮儹";
+ list.Add(function);
+ }
+ break;
+ case 8:
+ {
+ function.sid = "1234560001212121020282";
+ function.name = "璋冨叧";
+ list.Add(function);
+ }
+ break;
+ case 9:
+ {
+ function.sid = "1234560001212121020482";
+ function.name = "RGB";
+ list.Add(function);
+ }
+ break;
+ }
+ }
+ return list;
+ //return HDL_ON.Entity.DB_ResidenceData.functionList.GetAllFunction();
}
/// <summary>
/// 鑾峰彇缃戝叧鍦烘櫙鍒楄〃
@@ -229,8 +350,29 @@
switch (functionType)
{
case FunctionType.Relay:
+ case FunctionType.RGB:
+ case FunctionType.RGBW:
+ case FunctionType.CCT:
+ case FunctionType.Dimmer:
{
strPath = "LogicIcon/lightloguc.png";
+ }
+ break;
+ case FunctionType.Curtain:
+ case FunctionType.RollerCurtain:
+ case FunctionType.TrietexCurtain:
+ {
+ strPath = "LogicIcon/curtainlogic.png";
+ }
+ break;
+ case FunctionType.AC:
+ {
+ strPath = "LogicIcon/airconditionerlogic.png";
+ }
+ break;
+ case FunctionType.FloorHeating:
+ {
+ strPath = "LogicIcon/heatlogic.png";
}
break;
@@ -246,13 +388,13 @@
{
List<string> deviceStrTypeList = new List<string>();
deviceStrTypeList.Clear();
- var lightjosn = deviceList.Find((device) => device.functionType == FunctionType.Relay || device.functionType == FunctionType.Dimmer);
+ var lightjosn = deviceList.Find((device) => device.functionType == FunctionType.Relay || device.functionType == FunctionType.Dimmer|| device.functionType == FunctionType.CCT || device.functionType == FunctionType.RGB|| device.functionType == FunctionType.RGBW);
if (lightjosn != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.Lights));
}
- var curtainjosn = deviceList.Find((device) => device.functionType ==FunctionType.Curtain);
+ var curtainjosn = deviceList.Find((device) => device.functionType ==FunctionType.Curtain|| device.functionType == FunctionType.TrietexCurtain|| device.functionType == FunctionType.RollerCurtain);
if (curtainjosn != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.Curtain));
@@ -262,6 +404,11 @@
if (ac != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.AC));
+ }
+ var floorHeating = deviceList.Find((device) => device.functionType == FunctionType.FloorHeating);
+ if (ac != null)
+ {
+ deviceStrTypeList.Add(Language.StringByID(StringId.FloorHeating));
}
return deviceStrTypeList;
@@ -278,10 +425,23 @@
{
functionTypeList.Add(FunctionType.Relay);
functionTypeList.Add(FunctionType.Dimmer);
+ functionTypeList.Add(FunctionType.RGB);
+ functionTypeList.Add(FunctionType.RGBW);
+ functionTypeList.Add(FunctionType.CCT);
}
else if (deviceType == Language.StringByID(StringId.Curtain))
{
functionTypeList.Add(FunctionType.Curtain);
+ functionTypeList.Add(FunctionType.RollerCurtain);
+ functionTypeList.Add(FunctionType.TrietexCurtain);
+ }
+ else if (deviceType == Language.StringByID(StringId.AC))
+ {
+ functionTypeList.Add(FunctionType.AC);
+ }
+ else if (deviceType == Language.StringByID(StringId.FloorHeating))
+ {
+ functionTypeList.Add(FunctionType.FloorHeating);
}
return functionTypeList;
@@ -296,11 +456,29 @@
switch (if_type) {
case condition_if: {
deviceTypeList.Add(FunctionType.Relay);
+ deviceTypeList.Add(FunctionType.RGB);
+ deviceTypeList.Add(FunctionType.RGBW);
+ deviceTypeList.Add(FunctionType.Dimmer);
+ deviceTypeList.Add(FunctionType.CCT);
+ deviceTypeList.Add(FunctionType.Curtain);
+ deviceTypeList.Add(FunctionType.RollerCurtain);
+ deviceTypeList.Add(FunctionType.TrietexCurtain);
+ deviceTypeList.Add(FunctionType.AC);
+ deviceTypeList.Add(FunctionType.FloorHeating);
}
break;
case target_if:
{
deviceTypeList.Add(FunctionType.Relay);
+ deviceTypeList.Add(FunctionType.RGB);
+ deviceTypeList.Add(FunctionType.RGBW);
+ deviceTypeList.Add(FunctionType.Dimmer);
+ deviceTypeList.Add(FunctionType.CCT);
+ deviceTypeList.Add(FunctionType.Curtain);
+ deviceTypeList.Add(FunctionType.RollerCurtain);
+ deviceTypeList.Add(FunctionType.TrietexCurtain);
+ deviceTypeList.Add(FunctionType.AC);
+ deviceTypeList.Add(FunctionType.FloorHeating);
}
break;
}
--
Gitblit v1.8.0