From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板：绑定温湿度传感器目标，和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs
index 2c022f5..652c833 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs
@@ -120,7 +120,7 @@
listText.Add(Language.StringByID(R.MyInternationalizationString.uReverseDirection));//鍙嶅悜
var form = new BottomItemSelectForm();
- form.AddForm(Language.StringByID(R.MyInternationalizationString.uDirectionSelect), listText, nowSelectNo);
+ form.AddForm(Language.StringByID(R.MyInternationalizationString.uDirectionSelect), listText, null, nowSelectNo);
form.FinishSelectEvent += (index) =>
{
//鍙樻洿鏂瑰悜
@@ -241,6 +241,11 @@
{
curtainDevice.CurtainUpDownStopControl(1);
};
+ //灞曠ず妯℃澘鎴栬�呰櫄鎷熶綇瀹�,鍒欐棤鏁�
+ if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)
+ {
+ frameIconback.CanClick = false;
+ }
//閲嶅啓鎺т欢鐐瑰嚮鏁堟灉
frameIconback.SelectStatuEvent += (select) =>
{
@@ -265,6 +270,11 @@
await HdlDeviceCurtainLogic.Current.CommitCurtainLimitPoint(curtainDevice, Rollershade.CurtainPrivateInstalledLimi.DownLimit, -1, -1);
});
};
+ //灞曠ず妯℃澘鎴栬�呰櫄鎷熶綇瀹�,鍒欐棤鏁�
+ if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)
+ {
+ frameText.CanClick = false;
+ }
//閲嶅啓鎺т欢鐐瑰嚮鏁堟灉
frameText.SelectStatuEvent += (select) =>
{
@@ -350,6 +360,11 @@
{
curtainDevice.CurtainUpDownStopControl(0);
};
+ //灞曠ず妯℃澘鎴栬�呰櫄鎷熶綇瀹�,鍒欐棤鏁�
+ if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)
+ {
+ frameIconback.CanClick = false;
+ }
//閲嶅啓鎺т欢鐐瑰嚮鏁堟灉
frameIconback.SelectStatuEvent += (select) =>
{
@@ -374,6 +389,11 @@
await HdlDeviceCurtainLogic.Current.CommitCurtainLimitPoint(curtainDevice, Rollershade.CurtainPrivateInstalledLimi.UpLimit, -1, -1);
});
};
+ //灞曠ず妯℃澘鎴栬�呰櫄鎷熶綇瀹�,鍒欐棤鏁�
+ if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)
+ {
+ frameText.CanClick = false;
+ }
//閲嶅啓鎺т欢鐐瑰嚮鏁堟灉
frameText.SelectStatuEvent += (select) =>
{
@@ -429,6 +449,11 @@
});
});
};
+ //灞曠ず妯℃澘鎴栬�呰櫄鎷熶綇瀹�,鍒欐棤鏁�
+ if (Config.Instance.Home.IsShowTemplate == true || Config.Instance.Home.IsVirtually == true)
+ {
+ rowReset.CanClick = false;
+ }
}
#endregion
@@ -441,10 +466,17 @@
/// <returns></returns>
private bool InitCurtainDefultData()
{
+ this.curtainData = new CurtainData();
+ //濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
+ if (Common.Config.Instance.Home.IsVirtually == true)
+ {
+ var data = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainLimitPoint(curtainDevice);
+ curtainData.Direction = data.Direction;
+ return true;
+ }
+
//寮�鍚繘搴︽潯
this.ShowProgressBar();
-
- this.curtainData = new CurtainData();
bool receiptData = false;
string mainkeys = LocalDevice.Current.GetDeviceMainKeys(curtainDevice);
--
Gitblit v1.8.0