From c0021397eeb8335d6d1f20990c71533c3d94e7af Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 10 一月 2020 17:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
index 183fa8d..5fcf1b2 100644
--- a/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Curtain/RollerShadeControl.cs
@@ -13,7 +13,7 @@
/// <summary>
/// The action.
/// </summary>
- public Action action;
+ public Action<DeviceUI,Common.Room> action;
/// <summary>
/// 鏀惰棌鎸夐挳
@@ -246,8 +246,8 @@
{
UserView.HomePage.Instance.ScrollEnabled = true;
ZigBee.Device.ZbGateway.StatusList.Remove(this);
- //action();
- //action = null;
+ action(device,room);
+ action = null;
RemoveUpdateControlDeviceStatuAction();
if (IsDrawerLockMode)
{
@@ -298,8 +298,7 @@
}
}
- var de = Shared.Common.Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName);
- if (de == null)
+ if (Common.Room.CurrentRoom.IsCollectInRoom(device.FileName) == false)
{
collectionBtn.IsSelected = false;
}
@@ -464,7 +463,7 @@
}
SetCurtainType(itemView, (device.CommonDevice as Rollershade).WcdType);
-
+
var roomBG = new Button
{
Y = Application.GetRealHeight(1178 - 50),
@@ -654,9 +653,9 @@
UserView.HomePage.Instance.AddChidren(detailInfo);
UserView.HomePage.Instance.PageIndex += 1;
detailInfo.Show(device, room);
- detailInfo.action = () =>
+ detailInfo.EditAction += (curDev,curRoom) =>
{
- Show(device, room);
+ Show(curDev, curRoom);
};
}
@@ -843,6 +842,37 @@
ProgressBtn.Text = mProgress + "%";
}
+
+ /// <summary>
+ /// 娣诲姞杩涘害鎸夐挳
+ /// </summary>
+ private void InitProgressBtnForCurtain(FrameLayout layout)
+ {
+ ProgressBtnX = curtainSeekBar.X - Application.GetMinReal(20);
+ ProgressBtn = new Button()
+ {
+ X = ProgressBtnX,
+ Y = curtainSeekBar.Y + curtainSeekBar.Height / 2 - Application.GetMinReal(180),
+ Width = Application.GetMinReal(135),
+ Height = Application.GetMinReal(104),
+ UnSelectedImagePath = "Item/ProgressBubbles.png",
+ Visible = false,
+ TextSize = 14,
+ IsBold = true,
+ TextColor = ZigbeeColor.Current.GXCTextWhiteColor
+ };
+ layout.AddChidren(ProgressBtn);
+ }
+
+ /// <summary>
+ /// OnProgressButtonMove
+ /// </summary>
+ private void OnProgressButtonMoveForCurtain(int mProgress)
+ {
+ ProgressBtn.X = ProgressBtnX + curtainSeekBar.NowProgressX- Application.GetMinReal(5);
+ ProgressBtn.Text = mProgress + "%";
+ }
+
#endregion
#region 鈼� 鏀惰棌鍒颁富椤礯______________________
--
Gitblit v1.8.0