From 86325cf53601d57fff61b6bf77da9c7d341a9327 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 24 八月 2023 18:15:11 +0800
Subject: [PATCH] 2023年08月24日18:14:58
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 74 ++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 33 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 9c88669..faaa9d6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -164,6 +164,21 @@
#endregion
}
break;
+ case SPK.CommonSeries:
+ #region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView SerriesSwitchView = new LogicView.FunTypeView();
+ SerriesSwitchView.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(SerriesSwitchView.FLayoutView());
+
+ #endregion
+ ///寮�鍏崇偣鍑讳簨浠�
+ SerriesSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, SerriesSwitchView.btnState, 2);
+ };
+
+ break;
//寮�鍏崇伅鍏�
case SPK.AirSwitch:
case SPK.LightSwitch:
@@ -812,15 +827,15 @@
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 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.frameLayout.Y = volView.frameLayout.Bottom;
sourceView.btnText.TextID = StringId.xinhaoyuan;
fLayout.AddChidren(sourceView.FLayoutView());
@@ -833,22 +848,22 @@
{
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.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);
+ // //鐣岄潰鏄剧ず閫変腑鍊�
+ // volView.btnState.Text = value;
+ // //鏁版嵁灏佽
+ // AddDictionary("setvolume", value);//闊抽噺
+ //}, 0, 100);
- // BrightnessMethod(device, volView.btnState, volView.btnText.Text);
+ BrightnessMethod(device, volView.btnState, volView.btnText.Text);
- //};
+ };
///淇″彿婧愮偣鍑讳簨浠�
sourceView.btnClick.MouseUpEventHandler += (sender, e) =>
@@ -882,7 +897,7 @@
if (edit)
{
//鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
- GetEditDeviceState(device, index, switchView.btnState, sourceView.btnState, null, null);
+ GetEditDeviceState(device, index, switchView.btnState, volView.btnState, sourceView.btnState, null);
}
#endregion
@@ -1107,19 +1122,6 @@
}
break;
- case SPK.ElectricalTvHisense:
- {
- if (id == StringId.onLogic)
- {
- value = "1";
- }
- else
- {
- value = "0";
- }
- }
- break;
-
}
//鏁版嵁灏佽
@@ -1169,6 +1171,12 @@
}
}
break;
+ case SPK.ElectricalTvHisense:
+ {
+ keyVlaue = "set_volume";
+ }
+ break;
+
}
//鏁版嵁灏佽
AddDictionary(keyVlaue, brightnesValue);
--
Gitblit v1.8.0