From 8615f80ef3a66cb115298510c625db4cb2ba6f8e Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期四, 02 七月 2020 12:08:14 +0800 Subject: [PATCH] 2020-07-02-1 --- ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | 18 +++--------------- 1 files changed, 3 insertions(+), 15 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs index 345478d..5efe52a 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs @@ -647,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",int.Parse(actiondevice.edit.Tag.ToString())); - } - 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