From 2ed75b8b337048e5d75e6d9ec8307633134f02fd Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 10 十月 2019 11:33:04 +0800
Subject: [PATCH] 个人中心添加楼层和创建房间，实装二级验证
---
ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
index adb30ba..28f9330 100755
--- a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
@@ -119,6 +119,14 @@
seekBarTitle.Text = $"{SeekBar.Progress} %";
rollerShade.LastDateTime = DateTime.Now;
}
+ else if ((common as Rollershade).DeviceStatusReport.AttriBute[0].AttributeId == 0)
+ {
+ //绐楀笜绫诲瀷
+ var rollerShade = deviceUI.CommonDevice as Rollershade;
+ rollerShade.DeviceStatusReport = (common as Rollershade).DeviceStatusReport;
+ rollerShade.WcdType = (common as Rollershade).DeviceStatusReport.AttriBute[0].AttriButeData;
+ rollerShade.LastDateTime = DateTime.Now;
+ }
}
//***鏂版敼***璁惧鐘舵�佷笂鎶ヤ腑锛屽綋CluterID=3,璇佹槑璁惧鍦ㄧ嚎锛岀洿鎺ユ爣璁�
else if ((common as Rollershade).DeviceStatusReport.CluterID == 3)
@@ -205,6 +213,7 @@
UserView.HomePage.Instance.ScrollEnabled = true;
ZigBee.Device.ZbGateway.StatusList.Remove(this);
action();
+ action = null;
RemoveUpdateControlDeviceStatuAction();
base.RemoveFromParent();
}
@@ -433,7 +442,52 @@
{
collectionBtn.IsSelected = true;
}
+
+ if (rollerShade.WcdType == -1)
+ {
+ CommonPage.Loading.Start();
+ new System.Threading.Thread(() =>
+ {
+ ZigBee.Device.Rollershade.ReadWcdTypeAction(rollerShade, () =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (rollerShade.WcdType == 0)
+ {
+ downBtn.UnSelectedImagePath = "WindowCovering/RollerShadeDown.png";
+ downBtn.SelectedImagePath = "WindowCovering/RollerShadeDownSelected.png";
+ upBtn.UnSelectedImagePath = "WindowCovering/RollerShadeUp.png";
+ upBtn.SelectedImagePath = "WindowCovering/RollerShadeUpSelected.png";
+ }
+ else
+ {
+ downBtn.UnSelectedImagePath = "WindowCovering/RollerShadeClose.png";
+ downBtn.SelectedImagePath = "WindowCovering/RollerShadeCloseSelected.png";
+ upBtn.UnSelectedImagePath = "WindowCovering/RollerShadeOpen.png";
+ upBtn.SelectedImagePath = "WindowCovering/RollerShadeOpenSelected.png";
+ }
+ CommonPage.Loading.Hide();
+ });
+ });
+ })
+ { IsBackground = true }.Start();
+ }
+ else if(rollerShade.WcdType == 0)
+ {
+ downBtn.UnSelectedImagePath = "WindowCovering/RollerShadeDown.png";
+ downBtn.SelectedImagePath = "WindowCovering/RollerShadeDownSelected.png";
+ upBtn.UnSelectedImagePath = "WindowCovering/RollerShadeUp.png";
+ upBtn.SelectedImagePath = "WindowCovering/RollerShadeUpSelected.png";
+ }
+ else
+ {
+ downBtn.UnSelectedImagePath = "WindowCovering/RollerShadeClose.png";
+ downBtn.SelectedImagePath = "WindowCovering/RollerShadeCloseSelected.png";
+ upBtn.UnSelectedImagePath = "WindowCovering/RollerShadeOpen.png";
+ upBtn.SelectedImagePath = "WindowCovering/RollerShadeOpenSelected.png";
+ }
#endregion
+
BindEvent();
}
@@ -630,7 +684,6 @@
Shared.Common.Room.Lists[0].AddDevice(device.FileName);
collectionBtn.IsSelected = true;
}
- action?.Invoke();
}
#endregion
--
Gitblit v1.8.0