From bfb9e8297311985a2614f73ce288051ecbf9f8b5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 04 十一月 2021 11:52:02 +0800
Subject: [PATCH] 2021-11-04-01
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 15 +++++++++++++--
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 13 +++++++++++--
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 3 +++
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 2 +-
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 3 +++
5 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index fa3e9d5..01a0587 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -67,6 +67,9 @@
//鏂伴
case SPK.AirFreshStandard:
case SPK.HvacAirFresh:
+ //鎻掑骇
+ case SPK.PanelSocket:
+ case SPK.ElectricSocket:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index cc30118..61973d1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -153,7 +153,10 @@
//鏂伴
case SPK.AirFreshStandard:
case SPK.HvacAirFresh:
- {//寮�鍏崇伅
+ //鎻掑骇
+ case SPK.PanelSocket:
+ case SPK.ElectricSocket:
+ {//寮�鍏崇伅
foreach (var dic in dicList)
{
@@ -909,7 +912,10 @@
{
case SPK.AirSwitch:
case SPK.LightSwitch:
- {//寮�鍏崇伅
+ //鎻掑骇
+ case SPK.PanelSocket:
+ case SPK.ElectricSocket:
+ {//寮�鍏�
foreach (var dic in dicList)
{
@@ -1357,6 +1363,9 @@
{
switch (device.spk)
{
+ //鎻掑骇
+ case SPK.PanelSocket:
+ case SPK.ElectricSocket:
//寮�鍏崇伅鍏�
case SPK.AirSwitch:
case SPK.LightSwitch:
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 5790cc2..52305af 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -324,6 +324,8 @@
strPath = "FunctionIcon/Icon/electricalbreaker.png";
}
break;
+ case SPK.PanelSocket:
+ case SPK.ElectricSocket:
case SPK.LightSwitch:
case SPK.LightRGB:
case SPK.LightRGBW:
@@ -401,7 +403,10 @@
|| device.spk == SPK.LightCCT
|| device.spk == SPK.LightRGB
|| device.spk == SPK.LightRGBW
- || device.spk == SPK.AirSwitch);
+ || device.spk == SPK.AirSwitch
+ || device.spk == SPK.PanelSocket
+ || device.spk == SPK.ElectricSocket
+ );
if (lightjosn != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.Lights));
@@ -475,7 +480,9 @@
functionTypeList.Add(SPK.LightRGB);
functionTypeList.Add(SPK.LightRGBW);
functionTypeList.Add(SPK.LightCCT);
- functionTypeList.Add(SPK.AirSwitch);
+ functionTypeList.Add(SPK.AirSwitch);
+ functionTypeList.Add(SPK.PanelSocket);
+ functionTypeList.Add(SPK.ElectricSocket);
}
else if (deviceType == Language.StringByID(StringId.Curtain))
{
@@ -567,6 +574,8 @@
deviceTypeList.Add(SPK.SensorTVOC);
deviceTypeList.Add(SPK.SensorHcho);
deviceTypeList.Add(SPK.AirSwitch);
+ deviceTypeList.Add(SPK.PanelSocket);
+ deviceTypeList.Add(SPK.ElectricSocket);
}
break;
@@ -584,6 +593,8 @@
deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat);
deviceTypeList.Add(SPK.AirFreshStandard); deviceTypeList.Add(SPK.HvacAirFresh);
deviceTypeList.Add(SPK.AirSwitch);
+ deviceTypeList.Add(SPK.PanelSocket);
+ deviceTypeList.Add(SPK.ElectricSocket);
}
break;
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index b3bde6e..e6f0701 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -50,6 +50,9 @@
//寮�鍏崇伅鍏�
case SPK.AirSwitch:
case SPK.LightSwitch:
+ //鎻掑骇
+ case SPK.PanelSocket:
+ case SPK.ElectricSocket:
{
#region 鐣岄潰
///寮�鍏�
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index da007cf..fcc0b5e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -879,7 +879,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.SubheadingFontSize,
};
- btnClose.MouseUpEventHandler = (sender, e) => {
+ btnClose.MouseUpEventHandler = (sender1, e1) => {
dialog.Close();
};
bodyView.AddChidren(btnClose);
--
Gitblit v1.8.0