From ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:15:59 +0800
Subject: [PATCH] Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
old mode 100755
new mode 100644
index adb30ba..0a23bc1
--- 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)
@@ -176,8 +184,8 @@
/// Changeds the IS cene status.
/// </summary>
/// <param name="scene">Scene.</param>
- public void ChangedISceneStatus(Scene scene)
- {
+ public void ChangedISceneStatus(Scene scene)
+ {
//throw new NotImplementedException();
}
#endregion
@@ -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