From 23532fa8ad34c89b6d24b01eaef6475fd0aad898 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 15 四月 2020 18:08:24 +0800
Subject: [PATCH] ???????
---
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs
index a5ac473..533c332 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs
@@ -60,13 +60,11 @@
//娣卞害鍗＄墖淇℃伅
this.ButtonClickEvent += (sender, e) =>
{
- var rollerShadeControl = new Phone.Device.Curtain.RollerShadeControl();
- UserView.HomePage.Instance.AddChidren(rollerShadeControl);
- UserView.HomePage.Instance.PageIndex += 1;
- UserView.HomePage.Instance.ScrollEnabled = false;
- rollerShadeControl.IsDrawerLockMode = true;
- rollerShadeControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);
- rollerShadeControl.action += this.CardDetailInfoBackEvent;
+ Common.CommonPage.Instance.IsDrawerLockMode = true;
+ //绐楀笜绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
+ var form = new ControlForm.DeviceCurtainDetailCardForm();
+ form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, 1316);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
@@ -81,7 +79,7 @@
/// <returns></returns>
public override bool CheckIsOpenStatu(CommonDevice i_device)
{
- return ((Rollershade)i_device).WcdCurrentPositionLiftPercentage > 10;
+ return ((Rollershade)i_device).WcdCurrentPositionLiftPercentage > 0;
}
#endregion
--
Gitblit v1.8.0