From 0726154a7663e206e289e62f3f3fd7da4137a361 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 12 十月 2023 13:51:36 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index a9274cb..8472433 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -22,6 +22,10 @@
/// </summary>
private Button btnDelay =null;
/// <summary>
+ /// 褰撳墠璁惧
+ /// </summary>
+ private Function device;
+ /// <summary>
/// 瀹氫箟涓�涓褰曢�変腑璁惧鐘舵�佸垪琛紱
/// </summary>
private List<Dictionary<string, string>> dicSateteList = new List<Dictionary<string, string>>();
@@ -32,6 +36,7 @@
public void Show(Entity.Function device, int index, bool edit)
{
#region 鐣岄潰甯冨眬
+ this.device = device;
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
LogicView.TopView topView = new LogicView.TopView();
this.AddChidren(topView.FLayoutView());
@@ -180,7 +185,8 @@
};
break;
- //寮�鍏崇伅鍏�
+ //寮�鍏崇伅鍏�
+ case SPK.OtherCommon:
case SPK.AirSwitch:
case SPK.LightSwitch:
case SPK.ElectricSocket:
@@ -1091,6 +1097,7 @@
}
break;
}
+
//鐣岄潰鏄剧ず閫変腑鍊�
button.TextID = id;
selectedState = device.spk + "_" + value;
@@ -1111,6 +1118,15 @@
if (button.Name == "colorful")
{
key = "colorful";
+ }
+
+ }
+ break;
+ case SPK.ElectricalTvHisense:
+ {
+ if ("on" == value)
+ {
+ key = "wol";
}
}
@@ -1301,6 +1317,22 @@
/// <returns></returns>
private void AddDictionaryList(string key, Dictionary<string, string> dictionary)
{
+
+ if (this.device.spk == SPK.ElectricalTvHisense)
+ {
+ //鐗规畩澶勭悊
+ if (key == "on_off")
+ {
+ key = "wol";
+ }
+ else if (key == "wol")
+ {
+ key = "on_off";
+ }
+
+ }
+
+
int indexValue = -1;
for (int i = 0; i < dicSateteList.Count; i++)
{
@@ -1326,7 +1358,8 @@
dicSateteList.Add(dictionary);
}
- }
+ }
+
/// <summary>
/// 娣诲姞鐩爣
/// </summary>
--
Gitblit v1.8.0