From 122dc4312c72b2d2aaa50a2adf84165f5600b99a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 27 一月 2021 17:13:48 +0800
Subject: [PATCH] 2021-1-27-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 90 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 88 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 442b6f9..d4c9df7 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -23,7 +23,7 @@
{
MainPage.BasePageView.RemoveViewByTag("Logic");
}
-
+
/// <summary> Converts an array of bytes into a formatted string of hex digits (ex: E4 CA B2)</summary>
/// <param name="data"> The array of bytes to be translated into a string of hex digits. </param>
/// <returns> Returns a well formatted string of hex digits with spacing. </returns>
@@ -262,6 +262,7 @@
return roomName.TrimEnd(',');
}
+ #region 鍔ㄤ竴鏀瑰洓
/// <summary>
/// 鑾峰彇璁惧绫诲瀷鍥炬爣
/// </summary>
@@ -296,6 +297,19 @@
case SPK.FloorHeatStandard:
{
strPath = "LogicIcon/heatlogic.png";
+ }
+ break;
+ case SPK.SensorSmoke:
+ case SPK.SensorWater:
+ case SPK.SensorGas:
+ case SPK.SensorDryContact:
+ case SPK.SensorShanLan:
+ case SPK.SensorDuiShe:
+ case SPK.SensorPir:
+ case SPK.SensorDoorWindow:
+ case SPK.SensoruUtrasonic:
+ {
+ strPath = "LogicIcon/sensor.png";
}
break;
@@ -333,6 +347,21 @@
{
deviceStrTypeList.Add(Language.StringByID(StringId.FloorHeating));
}
+ var sensor = deviceList.Find((device) =>
+ device.spk == SPK.SensorWater
+ || device.spk == SPK.SensorGas
+ || device.spk == SPK.SensorSmoke
+ || device.spk == SPK.SensorDryContact
+ || device.spk == SPK.SensorShanLan
+ || device.spk == SPK.SensorDuiShe
+ || device.spk == SPK.SensorPir
+ || device.spk == SPK.SensorDoorWindow
+ || device.spk == SPK.SensoruUtrasonic
+ );
+ if (sensor != null)
+ {
+ deviceStrTypeList.Add(Language.StringByID(StringId.Sensor));
+ }
return deviceStrTypeList;
}
@@ -366,6 +395,19 @@
{
functionTypeList.Add(SPK.FloorHeatStandard);
}
+ else if (deviceType == Language.StringByID(StringId.Sensor))
+ {
+ functionTypeList.Add(SPK.SensorSmoke);
+ functionTypeList.Add(SPK.SensorWater);
+ functionTypeList.Add(SPK.SensorGas);
+ functionTypeList.Add(SPK.SensorDryContact);
+ functionTypeList.Add(SPK.SensorShanLan);
+ functionTypeList.Add(SPK.SensorDuiShe);
+ functionTypeList.Add(SPK.SensorPir);
+ functionTypeList.Add(SPK.SensorDoorWindow);
+ functionTypeList.Add(SPK.SensoruUtrasonic);
+
+ }
return functionTypeList;
}
@@ -390,6 +432,15 @@
deviceTypeList.Add(SPK.CurtainTrietex);
deviceTypeList.Add(SPK.AcStandard);
deviceTypeList.Add(SPK.FloorHeatStandard);
+ deviceTypeList.Add(SPK.SensorSmoke);
+ deviceTypeList.Add(SPK.SensorWater);
+ deviceTypeList.Add(SPK.SensorGas);
+ deviceTypeList.Add(SPK.SensorDryContact);
+ deviceTypeList.Add(SPK.SensorShanLan);
+ deviceTypeList.Add(SPK.SensorDuiShe);
+ deviceTypeList.Add(SPK.SensorPir);
+ deviceTypeList.Add(SPK.SensorDoorWindow);
+ deviceTypeList.Add(SPK.SensoruUtrasonic);
}
break;
case target_if:
@@ -409,6 +460,7 @@
}
return deviceTypeList;
}
+ #endregion
/// <summary>
/// 鏄剧ず鐨勮澶囧垪琛�
/// </summary>
@@ -421,9 +473,9 @@
for (int i = 0; i < deviceList.Count; i++)
{
var dev = deviceList[i];
+ //杩囨护鎺変笉闇�瑕佹樉绀虹殑璁惧
if (functionType.Contains(dev.spk))
{
- ///杩囨护鎺変笉闇�瑕佹樉绀虹殑璁惧
devList.Add(dev);
}
@@ -446,5 +498,39 @@
var list = GetShowDeviceList(functionTypeList, roomDeviceList);
return list;
}
+ /// <summary>
+ /// 缃戝叧ID(鑾峰彇鍢変箰缃戝叧ID)
+ /// </summary>
+ public static string GatewayId
+ {
+ get
+ {
+ if (Entity.DB_ResidenceData.Instance.HomeGateway == null)
+ {
+ return DriverLayer.Control.Ins.GatewayId;
+ }
+ return Entity.DB_ResidenceData.Instance.HomeGateway.gatewayId;
+ }
+ }
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public static string HomeId
+ {
+ get
+ {
+ return Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID;
+ }
+ }
+ /// <summary>
+ /// 鏄惁涓哄叾浠栦富鐢ㄦ埛鍒嗕韩杩囨潵鐨勪綇瀹�
+ /// </summary>
+ public static bool IsOthreShare
+ {
+ get
+ {
+ return Entity.DB_ResidenceData.Instance.CurrentRegion.IsOthreShare;
+ }
+ }
}
}
--
Gitblit v1.8.0