From 3aba1c7fea5f0adb1b169e8060ce956188e80a2b Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 24 九月 2024 10:46:18 +0800
Subject: [PATCH] 删除解锁APP的模式
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 6706f8e..dd9844d 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -271,10 +271,6 @@
{
bodyView.divLinkStateTip.Visible = true;
}
- //else if ()
- //{
- // bodyView.divLinkStateTip.Visible = true;
- //}
else
{
bodyView.divLinkStateTip.Visible = false;
@@ -430,12 +426,28 @@
}
}
}
- else if(function.spk == SPK.SensorHelp)
+ else if (function.spk == SPK.SensorHelp)
{
var tempStatus = function.attributes.Find((sta) => sta.key == FunctionAttributeKey.AlarmStatus);
- if(tempStatus != null)
+ if (tempStatus != null)
{
state = tempStatus.curValue.ToString() == "alarm";
+ }
+ }
+ else if (function.spk == SPK.SensorPir || function.spk == SPK.SensorPirHold)
+ {
+ var tempStatus = function.attributes.Find((sta) => sta.key == "people_status");
+ if (tempStatus != null)
+ {
+ state = tempStatus.curValue.ToString() == "true";
+ }
+ }
+ else if (function.spk == SPK.SensorDryContact || function.spk == SPK.SensorDryContact2)
+ {
+ var tempStatus = function.attributes.Find((sta) => sta.key == "contact_status");
+ if (tempStatus != null)
+ {
+ state = tempStatus.curValue.ToString() == "open";
}
}
else
@@ -572,6 +584,7 @@
btnSwitch.IsSelected = !btnSwitch.IsSelected;
});
}
+
function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
Dictionary<string, string> d = new Dictionary<string, string>();
if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
@@ -681,7 +694,6 @@
d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
-
btnOpen.MouseUpEventHandler = (sender, e) =>
{
//if (!curtain.isOnline())//绂荤嚎涓嶅厑璁告搷浣�
@@ -695,9 +707,10 @@
// return;
//}
btnOpen.IsSelected = true;
+ Dictionary<string, string> d = new Dictionary<string, string>();
+
curtain.trait_on_off.curValue = "on";
curtain.SetAttrState(FunctionAttributeKey.Percent, 100);
- Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
--
Gitblit v1.8.0