From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
index 27098e8..50a8d03 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
@@ -61,7 +61,7 @@
this.ScrollEnabled = false;
this.WcdType = ((Rollershade)this.device).WcdType;
//璁剧疆鐘舵�佹枃瀛�
- this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
+ this.SetStatuText(HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));
if (WcdType == 0)
{
@@ -96,7 +96,7 @@
SeekBarOpenCurtain.Progress = 100;
}
//璁剧疆鐘舵�佹枃瀛�
- this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
+ this.SetStatuText(HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));
return;
}
//鍙戦�佺獥甯樺懡浠�
@@ -145,7 +145,7 @@
SeekBarOpenCurtain.Progress = 0;
}
//璁剧疆鐘舵�佹枃瀛�
- this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
+ this.SetStatuText(HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));
return;
}
//鍙戦�佺獥甯樺懡浠�
@@ -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);
}
@@ -395,16 +395,12 @@
/// <returns></returns>
public override bool CheckResponeResultStatu(ReceiveComandDiv comandDiv, CommonDevice report)
{
- if (comandDiv == ReceiveComandDiv.A鑺傜偣鎺у埗鍙嶉)
- {
- return true;
- }
- else if (comandDiv == ReceiveComandDiv.A璁惧灞炴�т笂鎶�)
+ if (comandDiv == ReceiveComandDiv.A璁惧灞炴�т笂鎶�)
{
HdlThreadLogic.Current.RunMain(() =>
{
//璁剧疆鐘舵�佹枃瀛�
- this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
+ this.SetStatuText(HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));
if (this.isProgressing == false)
{
//褰撹繘搴﹀�煎湪鎵嬪姩鍙樻洿涓椂,涓嶆帴鏀舵帹閫�
@@ -418,6 +414,7 @@
}
}
});
+ return true;
}
return false;
}
--
Gitblit v1.8.0