From 18a7f9f40e5fab3bee5d4ac3d8fd0273dea052d6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期日, 26 四月 2020 12:05:28 +0800
Subject: [PATCH] 先上传一个非最新的版本
---
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceCurtainRowControl.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceCurtainRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceCurtainRowControl.cs
index ef83e6e..8fc210c 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceCurtainRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceCurtainRowControl.cs
@@ -104,12 +104,10 @@
//娣卞害鍗＄墖淇℃伅
this.frameTable.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.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);
- rollerShadeControl.action += this.CardDetailInfoBackEvent;
+ //绐楀笜绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
+ var form = new MainPage.ControlForm.DeviceCurtainDetailCardForm();
+ form.AddForm(i_device, HdlRoomLogic.Current.CurrentRoom, 965, 1316);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
@@ -124,7 +122,7 @@
/// <returns></returns>
public override bool CheckIsOpenStatu(CommonDevice i_device)
{
- return ((Rollershade)i_device).WcdCurrentPositionLiftPercentage > 10;
+ return ((Rollershade)i_device).WcdCurrentPositionLiftPercentage > 0;
}
#endregion
@@ -139,7 +137,7 @@
//妫�娴嬭兘鍚﹀彂閫佽幏鍙栫姸鎬佸懡浠�
if (this.CheckCanSendStatuComand() == true)
{
- Device.DeviceLogic.ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(this.device);
+ HdlDeviceAttributeLogic.Current.SendCurtainStatuComand(this.device);
}
if (((Rollershade)this.device).WcdType == -1)
{
@@ -183,6 +181,7 @@
//鏃犻渶鍙樻洿
return;
}
+ this.WcdType = wcdType;
if (this.WcdType == 0)
{
btnOpen.UnSelectedImagePath = "RollerShade/Up.png";
--
Gitblit v1.8.0