From b8d7b4fa382f7c779fb9e81a9f049d94a9083fa3 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 16 十一月 2021 18:41:01 +0800
Subject: [PATCH] 2021-11-16-01
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 223b059..cb26d92 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -135,7 +135,8 @@
//鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬�
switch (device.spk)
{
- //寮�鍏崇伅鍏� light.Switch
+ //寮�鍏崇伅鍏�
+ case SPK.AirSwitch:
case SPK.LightDimming:
case SPK.LightRGB:
case SPK.LightRGBW:
@@ -152,7 +153,10 @@
//鏂伴
case SPK.AirFreshStandard:
case SPK.HvacAirFresh:
- {//寮�鍏崇伅
+ //鎻掑骇
+ case SPK.PanelSocket:
+ case SPK.ElectricSocket:
+ {//寮�鍏崇伅
foreach (var dic in dicList)
{
@@ -517,6 +521,31 @@
}
}
break;
+ case "8":
+ {
+ inputView.btnIcon.UnSelectedImagePath = "LogicIcon/location.png";
+ foreach (var dic in dicList)
+ {
+ string strtext = "";
+ string value = dic["value"];
+ switch (value)
+ {
+ case "arrive":
+ {
+ strtext = Language.StringByID(StringId.daoda);
+ }
+ break;
+ case "leave":
+ {
+ strtext = Language.StringByID(StringId.likai);
+ }
+ break;
+ }
+ inputView.btnText.TextID = StringId.likiadaoda;
+ inputView.btnState.Text = strtext;
+ }
+ }
+ break;
case "9":
{
inputView.btnIcon.UnSelectedImagePath = "LogicIcon/changesinoutdoor.png";
@@ -847,6 +876,13 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
break;
+
+ case "8":
+ {
+ AddInputType addInputType = new AddInputType();
+ addInputType.LocationView(thisView,true);
+ }
+ break;
case "9":
{
@@ -906,8 +942,12 @@
//鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬�
switch (device.spk)
{
+ case SPK.AirSwitch:
case SPK.LightSwitch:
- {//寮�鍏崇伅
+ //鎻掑骇
+ case SPK.PanelSocket:
+ case SPK.ElectricSocket:
+ {//寮�鍏�
foreach (var dic in dicList)
{
@@ -1355,7 +1395,11 @@
{
switch (device.spk)
{
+ //鎻掑骇
+ case SPK.PanelSocket:
+ case SPK.ElectricSocket:
//寮�鍏崇伅鍏�
+ case SPK.AirSwitch:
case SPK.LightSwitch:
{
foreach (var dic in dicList)
@@ -1922,6 +1966,7 @@
//鍖哄埆涓嶅悓璁惧锛屾樉绀轰笉鍚岃澶囩姸鎬�
switch (device.spk)
{
+ case SPK.AirSwitch:
case SPK.LightSwitch:
{//寮�鍏崇伅
--
Gitblit v1.8.0