From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
index 9c67d14..290933b 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
@@ -186,7 +186,6 @@
SeekBarSiphonateCurtain.Progress = (device as Rollershade).WcdCurrentPositionLiftPercentage;
frameWhiteBack.AddChidren(SeekBarSiphonateCurtain);
SeekBarSiphonateCurtain.IsProgressTextShow = false;
- SeekBarSiphonateCurtain.CurtainPaddingTop = Application.GetRealHeight(110);
//鍗峰笜鎺т欢閲岄潰鐨勯偅涓樉绀虹櫨鍒嗘瘮鐨勬帶浠�
int progressY = SeekBarSiphonateCurtain.Y - Application.GetMinReal(204);
@@ -366,19 +365,20 @@
/// <param name="comand"></param>
private void SetCurtainCommand(int comand)
{
+ //2020.07.20鍙樻洿:鏀惧紑闄愬埗,涓嶅啀绛夊緟缃戝叧鍥炲,涔熻兘鐐瑰嚮鎸夐挳
//鍦ㄦ病鏈夋帴鏀跺埌鍙嶉涔嬪墠,涓嶈兘鍐嶇偣鍑�
- this.btnClose.CanClick = false;
- this.btnOpen.CanClick = false;
- this.btnStop.CanClick = false;
+ //this.btnClose.CanClick = false;
+ //this.btnOpen.CanClick = false;
+ //this.btnStop.CanClick = false;
//妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
- this.StartCheckResponeResult(new List<ButtonBase>(), (result) =>
- {
- //鏃堕棿缁撴潫,鍙互鍐嶆鐐瑰嚮
- this.btnClose.CanClick = true;
- this.btnOpen.CanClick = true;
- this.btnStop.CanClick = true;
- });
+ //this.StartCheckResponeResult(new List<ButtonBase>(), (result) =>
+ //{
+ // //鏃堕棿缁撴潫,鍙互鍐嶆鐐瑰嚮
+ // this.btnClose.CanClick = true;
+ // this.btnOpen.CanClick = true;
+ // this.btnStop.CanClick = true;
+ //});
//鍙戦�佸懡浠�
((Rollershade)device).CurtainUpDownStopControl(comand);
}
--
Gitblit v1.8.0