From b186c02eb9e44268727b769be477d1956e97fbb0 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 09:08:05 +0800
Subject: [PATCH] 2019.1.2
---
ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs | 98 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 69 insertions(+), 29 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
index efe3f2e..f489595 100644
--- a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using Shared.Common;
using Shared.Phone.Device.CommonForm;
+using Shared.Phone.Device.DeviceLogic;
using Shared.Phone.UserView;
using ZigBee.Device;
@@ -79,6 +80,15 @@
/// </summary>
public bool IsDrawerLockMode;
+ /// <summary>
+ /// ProgressBtn
+ /// </summary>
+ Button ProgressBtn;
+ /// <summary>
+ /// ProgressBtnY
+ /// </summary>
+ int ProgressBtnY;
+
#endregion
#region 鈼� 鎺ュ彛___________________________
@@ -137,8 +147,6 @@
{
curtainSeekBar.Progress = rollerShade.WcdCurrentPositionLiftPercentage;
}
- //SeekBar.Progress = rollerShade.WcdCurrentPositionLiftPercentage;
- //seekBarTitle.Text = $"{SeekBar.Progress} %";
rollerShade.LastDateTime = DateTime.Now;
}
else if (common.DeviceStatusReport.AttriBute[0].AttributeId == 0)
@@ -274,8 +282,7 @@
{
UserHomeView.ReadStatus(rollerShade, () =>
{
- rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
- rollerShade.ReadWcdCurrentPositionLiftPercentage();
+ ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(device.CommonDevice);
});
}
else
@@ -283,8 +290,7 @@
//闃叉鐭椂闂村唴澶氭璇诲彇
if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
{
- rollerShade.ReadWcdCurrentPositionLiftPercentage();
- rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
+ ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(device.CommonDevice);
}
}
@@ -505,28 +511,12 @@
//upBtn.MouseUpEventHandler += Up;
//stopBtn.MouseUpEventHandler += Stop;
//downBtn.MouseUpEventHandler += Down;
- //SeekBar.ProgressChanged += SeekBar_ProgressChange;
- //collectionBtn.MouseUpEventHandler += Collection;
- //moreBtn.MouseUpEventHandler += More;
- //roomBtn.MouseUpEventHandler += BackToRoomHandler;
- //roomName.MouseUpEventHandler += BackToRoomHandler;
+ collectionBtn.MouseUpEventHandler += Collection;
}
#endregion
- #region 鈼� 鎺у埗___________________________
-
- /// <summary>
- /// 婊戞潯绉诲姩鍙戦�佸懡浠�
- /// </summary>
- /// <param name="sender">Sender.</param>
- /// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
- private void SeekBar_ProgressChange(object sender, int mouseEventArgs)
- {
- //seekBarTitle.Text = $"{SeekBar.Progress}%";
- //(device.CommonDevice as ZigBee.Device.Rollershade).WcdGoToTiltValue(SeekBar.Progress);
- }
-
+ #region 鈼� 鎺у埗__________________________
/// <summary>
/// 涓娿�佸紑
@@ -714,11 +704,36 @@
curtainRollSeekBar.Gravity = Gravity.CenterHorizontal;
curtainRollSeekBar.Progress = (device.CommonDevice as Rollershade).WcdCurrentPositionLiftPercentage;
layout.AddChidren(curtainRollSeekBar);
-
+ curtainRollSeekBar.IsProgressTextShow = false;
+ curtainRollSeekBar.CurtainPaddingTop = Application.GetRealHeight(110);
curtainRollSeekBar.OnStopTrackingTouchEvent += (sender, e) =>
{
(device.CommonDevice as Rollershade).WcdGoToTiltValue(curtainRollSeekBar.Progress);
};
+
+ curtainRollSeekBar.OnStartTrackingTouchEvent += (sender, e) =>
+ {
+ OnProgressButtonMove(curtainRollSeekBar.Progress);
+ ProgressBtn.Visible = true;
+ };
+
+ curtainRollSeekBar.OnStopTrackingTouchEvent += (sender, e) =>
+ {
+ ProgressBtn.Visible = false;
+ };
+
+ curtainRollSeekBar.OnProgressChangedEvent += (send2, e2) =>
+ {
+
+ OnProgressButtonMove(e2);
+
+ //鍒ゆ柇鏄惁300ms灞忚斀
+ //if (curtainRollSeekBar.IsProgressChangeDelay()) return;
+
+ //(device.CommonDevice as Rollershade).WcdGoToTiltValue(curtainRollSeekBar.Progress);
+ };
+
+ InitProgressBtn(layout);
}
else
{
@@ -726,16 +741,42 @@
curtainSeekBar.Width = Application.GetRealWidth(570);
curtainSeekBar.Height = Application.GetRealHeight(513);
curtainSeekBar.Gravity = Gravity.CenterHorizontal;
+ curtainSeekBar.Progress = (device.CommonDevice as Rollershade).WcdCurrentPositionLiftPercentage;
layout.AddChidren(curtainSeekBar);
curtainSeekBar.OnStopTrackingTouchEvent += (sender, e) =>
{
- (device.CommonDevice as Rollershade).WcdGoToTiltValue(curtainRollSeekBar.Progress);
+ (device.CommonDevice as Rollershade).WcdGoToTiltValue(curtainSeekBar.Progress);
};
}
}
+ /// <summary>
+ /// 娣诲姞杩涘害鎸夐挳
+ /// </summary>
+ private void InitProgressBtn(FrameLayout layout)
+ {
+ ProgressBtnY = curtainRollSeekBar.Y - Application.GetMinReal(204);
+ ProgressBtn = new Button()
+ {
+ Y = ProgressBtnY,
+ Width = Application.GetMinReal(135),
+ Height = Application.GetMinReal(104),
+ UnSelectedImagePath = "Item/ProgressBubbles.png",
+ Visible = false,
+ Gravity = Gravity.CenterHorizontal
+ };
+ layout.AddChidren(ProgressBtn);
+ }
+ /// <summary>
+ /// OnProgressButtonMove
+ /// </summary>
+ private void OnProgressButtonMove(int mProgress)
+ {
+ ProgressBtn.Y = ProgressBtnY + curtainRollSeekBar.NowProgressY;
+ ProgressBtn.Text = mProgress + "%";
+ }
#endregion
@@ -748,15 +789,14 @@
/// <param name="e">E.</param>
private void Collection(object sender, MouseEventArgs e)
{
- //collection
if (collectionBtn.IsSelected)
{
- Shared.Common.Room.Lists[0].DeleteDevice(device.FileName);
+ Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(device.FileName);
collectionBtn.IsSelected = false;
}
else
{
- Shared.Common.Room.Lists[0].AddDevice(device.FileName);
+ Common.Room.CurrentRoom.GetLoveRoom().AddDevice(device.FileName);
collectionBtn.IsSelected = true;
}
}
--
Gitblit v1.8.0