From 8cefc1f93fc2db49465a5dd11ce94ed11267ea53 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 22 八月 2023 17:48:39 +0800
Subject: [PATCH] 2023年08月22日17:48:30
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 135 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 116 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 5508c06..9c88669 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -804,6 +804,90 @@
#endregion
}
break;
+ //娴蜂俊鐢佃
+ case SPK.ElectricalTvHisense:
+ {
+ #region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView switchView = new LogicView.FunTypeView();
+ switchView.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(switchView.FLayoutView());
+ /////闊抽噺
+ //LogicView.FunTypeView volView = new LogicView.FunTypeView();
+ //volView.frameLayout.Y = switchView.frameLayout.Bottom;
+ //volView.btnText.TextID = StringId.yinliang;
+ //fLayout.AddChidren(volView.FLayoutView());
+
+ ///淇″彿婧�
+ LogicView.FunTypeView sourceView = new LogicView.FunTypeView();
+ sourceView.frameLayout.Y = switchView.frameLayout.Bottom;
+ sourceView.btnText.TextID = StringId.xinhaoyuan;
+ fLayout.AddChidren(sourceView.FLayoutView());
+
+ ///璁惧寤舵椂iewv
+ DelayView(fLayout, sourceView.frameLayout.Bottom);
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ switchView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, switchView.btnState, 2);
+ };
+ /////闊抽噺鐐瑰嚮浜嬩欢
+ //volView.btnClick.MouseUpEventHandler += (sender, e) =>
+ //{
+ // selectedState = device.spk + "_volume";
+ // //new LogicView.TipPopView { }.InputBox(StringId.volumeMusic, volView.btnState.Text, (value) =>
+ // //{
+
+ // // //鐣岄潰鏄剧ず閫変腑鍊�
+ // // volView.btnState.Text = value;
+ // // //鏁版嵁灏佽
+ // // AddDictionary("volume", value);//闊抽噺
+ // //}, 0, 100);
+
+ // BrightnessMethod(device, volView.btnState, volView.btnText.Text);
+
+ //};
+
+ ///淇″彿婧愮偣鍑讳簨浠�
+ sourceView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ ///涔嬪墠鐨勭姸鎬佹枃鏈�
+ string currText = sourceView.btnState.Text;
+ //璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
+ string key = "signal";
+ selectedState = device.spk + "_" + key;
+ PublicInterface pif = new PublicInterface();
+ var sourceList = new List<string>();
+ sourceList.Add("HDML 1");
+ sourceList.Add("HDML 2");
+ sourceList.Add("HDML 3");
+ sourceList.Add("HDML 4");
+ sourceList.Add("Live TV");
+ sourceList.Add("PS");
+ sourceList.Add("AV");
+ pif.SingleSelectionShow(this, sourceList, Language.StringByID(StringId.xinhaoyuan), currText
+ , (valueStr) =>
+ {
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ sourceView.btnState.Text = valueStr;
+ string value = valueStr.Replace(" ", "_");
+ //鏁版嵁灏佽
+ AddDictionary(key, value);
+
+ });
+ };
+
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditDeviceState(device, index, switchView.btnState, sourceView.btnState, null, null);
+ }
+
+ #endregion
+ }
+ break;
}
#endregion
@@ -977,10 +1061,10 @@
FrameLayout frame = new FrameLayout { BackgroundColor = CSS.CSS_Color.viewTrans60lucence };
this.AddChidren(frame);
LogicView.SwitchView switchView = new LogicView.SwitchView();
- switchView.FLayoutView(frame, len, button.Text, (strValue) =>
+ switchView.FLayoutView(frame, len, button.Text, (value) =>
{
int id = 0;
- switch (strValue)
+ switch (value)
{
case "on":
{
@@ -1000,16 +1084,16 @@
}
//鐣岄潰鏄剧ず閫変腑鍊�
button.TextID = id;
- selectedState = device.spk + "_" + strValue;
+ selectedState = device.spk + "_" + value;
//璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
- string keyVlaue = "on_off";
+ string key = "on_off";
switch (device.spk)
{
case SPK.PanelSocket:
{
if (button.Name == "鎬绘帶寮�鍏�")
{
- keyVlaue = "on_off_master";
+ key = "on_off_master";
}
}
break;
@@ -1017,14 +1101,29 @@
{
if (button.Name == "colorful")
{
- keyVlaue = "colorful";
+ key = "colorful";
}
}
break;
+
+ case SPK.ElectricalTvHisense:
+ {
+ if (id == StringId.onLogic)
+ {
+ value = "1";
+ }
+ else
+ {
+ value = "0";
+ }
+ }
+ break;
+
}
+
//鏁版嵁灏佽
- AddDictionary(keyVlaue, strValue);
+ AddDictionary(key, value);
});
#endregion
}
@@ -1150,8 +1249,6 @@
}
-
-
/// <summary>
/// 鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
/// </summary>
@@ -1184,29 +1281,29 @@
/// <summary>
/// 娣诲姞閫変腑鏁版嵁
/// </summary>
- /// <param name="KeyValue">璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�</param>
- /// <param name="selectedValue">鐘舵�佸��</param>
- private void AddDictionary(string KeyValue, string selectedValue)
+ /// <param name="key">璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�</param>
+ /// <param name="value">鐘舵�佸��</param>
+ private void AddDictionary(string key, string value)
{
//鏁版嵁灏佽
Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.Current.dictionary(dic, "key", KeyValue);
- LogicMethod.Current.dictionary(dic, "value", selectedValue);
- AddDictionaryList(KeyValue, dic);
+ LogicMethod.Current.dictionary(dic, "key", key);
+ LogicMethod.Current.dictionary(dic, "value", value);
+ AddDictionaryList(key, dic);
}
/// <summary>
/// 鏇存柊鏁版嵁鍒楄〃
/// </summary>
- /// <param name="keyValue">璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�</param>
+ /// <param name="key">璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�</param>
/// <param name="dictionary">娣诲姞閫変腑鏁版嵁</param>
/// <returns></returns>
- private void AddDictionaryList(string keyValue, Dictionary<string, string> dictionary)
+ private void AddDictionaryList(string key, Dictionary<string, string> dictionary)
{
int indexValue = -1;
for (int i = 0; i < dicSateteList.Count; i++)
{
var dic = dicSateteList[i];
- if (dic.ContainsValue(keyValue))
+ if (dic.ContainsValue(key))
{
//鍒ゆ柇鏄惁瀛樺湪
indexValue = i;
@@ -1227,7 +1324,7 @@
dicSateteList.Add(dictionary);
}
- }
+ }
/// <summary>
/// 娣诲姞鐩爣
/// </summary>
--
Gitblit v1.8.0