From 8bdaa9078e89f2db165c27de9d4d87cb0a05e18b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 09 二月 2023 14:44:00 +0800
Subject: [PATCH] 修复全视通安卓版本无法监控的问题
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 0cb5dd3..7aeb9f2 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -55,12 +55,35 @@
#region 缂栬緫璁惧鐘舵��
switch (device.spk)
{
-
+ //鎻掑骇(鏈塙SB)
+ case SPK.PanelSocket:
+ {
+ #region 鐣岄潰
+ ///鎬绘帶寮�鍏�
+ LogicView.FunTypeView view1 = new LogicView.FunTypeView();
+ view1.btnText.TextID = StringId.zongkogkaiguan;
+ view1.btnState.Name = "鎬绘帶寮�鍏�";
+ fLayout.AddChidren(view1.FLayoutView());
+ ///璁惧寤舵椂iewv
+ DelayView(fLayout, view1.frameLayout.Bottom);
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///鎬绘帶寮�鍏崇偣鍑讳簨浠�
+ view1.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, view1.btnState, 2);
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditDeviceState(device, index, view1.btnState, null, null, null);
+ }
+ #endregion
+ }
+ break;
//寮�鍏崇伅鍏�
case SPK.AirSwitch:
case SPK.LightSwitch:
- //鎻掑骇
- case SPK.PanelSocket:
case SPK.ElectricSocket:
//鏈烘鎵�
case SPK.MechanicalArm:
@@ -718,7 +741,7 @@
break;
}
- outputDevice.status = dicSateteList;
+ outputDevice.status.AddRange(dicSateteList);
if (edit)
{
@@ -820,6 +843,17 @@
selectedState = device.spk + "_" + strValue;
//璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
string keyVlaue = "on_off";
+ switch (device.spk)
+ {
+ case SPK.PanelSocket:
+ {
+ if (button.Name == "鎬绘帶寮�鍏�")
+ {
+ keyVlaue = "on_off_master";
+ }
+ }
+ break;
+ }
//鏁版嵁灏佽
AddDictionary(keyVlaue, strValue);
});
@@ -923,7 +957,7 @@
if (dicList.Count != 0)
{
//鏈夋暟鎹噸鏂拌祴鍊�
- dicSateteList = dicList;
+ dicSateteList.AddRange(dicList);
}
if (this.btnDelay != null)
{
--
Gitblit v1.8.0