From f3e65daca7978b21b5888f49b1bf35e1a6e5d4fd Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 13 七月 2020 12:33:31 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
index 7778c60..5efe52a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -638,6 +638,7 @@
actiondevice.selecetddevicestateBtn.Text = state;
///缂栬緫
+ actiondevice.edit.Tag = i.ToString();
actiondevice.edit.MouseUpEventHandler += (sender, e) =>
{
switch (linkType)
@@ -646,21 +647,9 @@
case 8:
{
var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
- if (deviceinof.Type != DeviceType.ColorTemperatureLight)
- {
- var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
- this.AddChidren(flMain);
- CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_lockaction");
- }
- else
- {
- var nightlight = new Nightlight();
- UserView.HomePage.Instance.AddChidren(nightlight);
- UserView.HomePage.Instance.PageIndex += 1;
- nightlight.Show(deviceinof, true, "lockaction",actions);
- }
-
-
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+ this.AddChidren(flMain);
+ CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_lockaction", int.Parse(actiondevice.edit.Tag.ToString()));
}
break;
--
Gitblit v1.8.0