From 7952f847fbe8f506106587785fc097467f4b1801 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 27 九月 2023 11:52:31 +0800
Subject: [PATCH] 2023年09月27日11:52:00
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 13 ++++++++++---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 2 ++
HDL_ON/Common/Utlis.cs | 2 +-
HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs | 2 +-
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 3 ++-
5 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Common/Utlis.cs b/HDL_ON/Common/Utlis.cs
index ae49f82..7778dc5 100644
--- a/HDL_ON/Common/Utlis.cs
+++ b/HDL_ON/Common/Utlis.cs
@@ -42,7 +42,7 @@
}
}
string text = tag + "======" + url + "\r\n" + content;
- //Console.WriteLine(text);
+ Console.WriteLine(text);
#endif
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index f1ec56c..ff12c6b 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -1055,6 +1055,7 @@
}
}
break;
+ case SPK.OtherCommon:
case SPK.AirSwitch:
case SPK.LightSwitch:
//鎻掑骇
@@ -1715,6 +1716,7 @@
break;
case SPK.ElectricSocket:
//寮�鍏崇伅鍏�
+ case SPK.OtherCommon:
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 3031525..fd883fb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -189,7 +189,7 @@
list.AddRange(list2);
list.AddRange(FunctionList.List.groupControls);
#if DEBUG
- GetTestDevice(ref list, true);
+ //GetTestDevice(ref list, true);
#endif
return list;
}
@@ -371,7 +371,9 @@
return "FunctionIcon/DoorLock/DoorLock.png";
}
else if (SPK.SensorDryContact == device.spk
- || SPK.SensorDryContact2 == device.spk)
+ || SPK.SensorDryContact2 == device.spk
+ || SPK.OtherCommon == device.spk
+ )
{
return "LogicIcon/ganjiedian.png";
}
@@ -382,7 +384,7 @@
//LogicIcon/heatlogic.png"
return $"FunctionIcon/Icon/{device.IconName}.png";
- }
+ }
/// <summary>
/// 鑾峰彇璁惧绫诲瀷鍥炬爣(宸插純鐢� 2022骞�11鏈�25鏃�14:07:30)
/// </summary>
@@ -527,6 +529,7 @@
|| device.spk == SPK.LightCCT
|| device.spk == SPK.LightRGB
|| device.spk == SPK.LightRGBW
+ || device.spk == SPK.OtherCommon
);
if (lightjosn != null)
{
@@ -660,6 +663,7 @@
functionTypeList.Add(SPK.AirSwitch);
functionTypeList.Add(SPK.PanelSocket);
functionTypeList.Add(SPK.ElectricSocket);
+ functionTypeList.Add(SPK.OtherCommon);
}
//缇ゆ帶
else if (deviceType == Language.StringByID(StringId.GroupControl))
@@ -824,6 +828,7 @@
functionTypeList.Add(SPK.SensorPirHold);
functionTypeList.Add(SPK.ElectricalTvHisense);
functionTypeList.Add(SPK.SensorLight);
+ functionTypeList.Add(SPK.OtherCommon);
}
@@ -915,6 +920,7 @@
deviceTypeList.Add(SPK.MechanicalArm);
deviceTypeList.Add(SPK.AcIr);
deviceTypeList.Add(SPK.ElectricalTvHisense);
+ deviceTypeList.Add(SPK.OtherCommon);
}
break;
}
@@ -1233,6 +1239,7 @@
new Entity.Function { sid = "1234567890", name = "鍏夌収浼犳劅鍣�", spk = Entity.SPK.SensorLight },
new Entity.Function { sid = "1234567891", name = "骞茶妭鐐�", spk = Entity.SPK.SensorDryContact },
new Entity.Function { sid = "1234567892", name = "绱ф�ユ眰鍔╀紶鎰熷櫒", spk = Entity.SPK.SensorHelp },
+ new Entity.Function { sid = "12345678921", name = "閫氱敤寮�鍏�", spk = Entity.SPK.OtherCommon },
//new Entity.Function { sid = "12345678933456", name = "闂ㄩ攣", spk = Entity.SPK.DoorLock },
// new Entity.Function { sid = "1234567895444", name = "瑙嗛闂ㄩ攣", spk = Entity.SPK.VideoDoorLock },
//new Entity.Function { sid = "12345678968888", name = "浜轰綋瀛樺湪浼犳劅鍣�", spk = Entity.SPK.SensorPirHold },
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 93dd086..8472433 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -185,7 +185,8 @@
};
break;
- //寮�鍏崇伅鍏�
+ //寮�鍏崇伅鍏�
+ case SPK.OtherCommon:
case SPK.AirSwitch:
case SPK.LightSwitch:
case SPK.ElectricSocket:
diff --git a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
index 4f2258c..2fb6578 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs
@@ -302,7 +302,7 @@
return;
}
- if (!this.device.online)
+ if (!this.device.online&& key!= HisenseTVFunctionalAttributeConstant.wol)
{
//璁惧涓嶅湪绾挎帶鍒跺け璐�
Application.RunOnMainThread(() =>
--
Gitblit v1.8.0