From dee21bf452a8979d0515d13e534fbb69ed9715dd Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 01 九月 2020 15:33:13 +0800
Subject: [PATCH] 上传一个版本
---
ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/AirConditionerModeForm.cs | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/AirConditionerModeForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/AirConditionerModeForm.cs
index e0c6eb5..365b2d7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/AirConditionerModeForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/AirConditionerModeForm.cs
@@ -107,27 +107,32 @@
btnOk.TextID = R.MyInternationalizationString.uSave;
bodyFrameLayout.AddChidren(btnOk);
btnOk.ButtonClickEvent += (sender, e) =>
- {
- if (this.oldReportValue == this.reportValue)
- {
+ {
+ if (this.oldReportValue == this.reportValue)
+ {
//鏁版嵁鐩稿悓,涓嶉渶瑕佷慨鏀�
this.CloseForm();
- return;
- }
- //灏嗕簩杩涘埗杞崲涓哄崄杩涘埗
- var data = Convert.ToInt32(this.fixValue + this.reportValue, 2);
- var result = HdlDeviceAirConditionerLogic.Current.SetAcModeSupport(deviceAc, data);
- if (result == true)
- {
- //鏇存敼缂撳瓨
- for (int i = 0; i < this.reportValue.Length; i++)
- {
- deviceAc.listSupportMode[i] = Convert.ToInt32(reportValue[i].ToString());
- }
- deviceAc.ReSave();
- this.CloseForm();
- }
- };
+ return;
+ }
+ //灏嗕簩杩涘埗杞崲涓哄崄杩涘埗
+ var data = Convert.ToInt32(this.fixValue + this.reportValue, 2);
+ var result = HdlDeviceAirConditionerLogic.Current.SetAcModeSupport(deviceAc, data);
+ if (result == true)
+ {
+ //鏇存敼缂撳瓨
+ for (int i = 0; i < this.reportValue.Length; i++)
+ {
+ deviceAc.listSupportMode[i] = Convert.ToInt32(reportValue[i].ToString());
+ }
+ deviceAc.ReSave();
+ this.CloseForm();
+ }
+ };
+ //濡傛灉鏄睍绀烘ā鏉�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnOk.CanClick = false;
+ }
});
});
}
@@ -174,6 +179,11 @@
this.reportValue = reportValue.Substring(0, div) + "0" + reportValue.Substring(div + 1);
}
};
+ //濡傛灉鏄睍绀烘ā鏉�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ rowFrame.CanClick = false;
+ }
}
#endregion
@@ -186,9 +196,9 @@
private void ReadAirConditionerModeSupport()
{
//濡傛灉鏄櫄鎷熶綇瀹�
- if (Common.Config.Instance.Home.IsVirtually == true)
+ if (Common.Config.Instance.Home.IsVirtually == true || Common.Config.Instance.Home.IsShowTemplate == true)
{
- var data = ModelData.DeviceModelDataLogic.Current.GetAcModeSupport(deviceAc);
+ var data = TemplateData.TemplateDeviceDataLogic.Current.GetAcModeSupport(deviceAc);
//杞崲涓轰簩杩涘埗
var value = Convert.ToString(data, 2).PadLeft(16, '0');
//杩欎簲涓缃槸鏀惧湪鍚庨潰鐨�
--
Gitblit v1.8.0