From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
index b8c406b..888db58 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
@@ -72,10 +72,10 @@
#endregion
- #region 鈻� 鎵撳紑绌鸿皟___________________________
+ #region 鈻� 鍏抽棴绌鸿皟___________________________
/// <summary>
- /// 鎵撳紑绌鸿皟
+ /// 鍏抽棴绌鸿皟
/// </summary>
/// <param name="device">绌鸿皟瀵硅薄</param>
/// <returns></returns>
@@ -120,7 +120,7 @@
/// <returns></returns>
public async Task<bool> SetAcModeSupport(AC device, int data)
{
- var result = await HdlDeviceAttributeLogic.Current.WriteDeviceAttribute(device, 513, 4099, 25, data);
+ var result = await HdlDeviceAttributeLogic.Current.WriteDeviceAttribute(device, 513, 4099, 25, data.ToString());
//妫�娴嬬綉鍏宠繑鍥炵殑鍏遍�氶敊璇姸鎬佺爜
string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);
if (error != null)
@@ -141,9 +141,11 @@
{
//璁剧疆绌鸿皟妯″紡澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uSetAcModeFail);
- this.ShowTipMsg(msg); ;
+ this.ShowTipMsg(msg);
return false;
}
+ await HdlGatewayLogic.Current.UpLoadDeviceBackupDataToGateway(device, GatewayBackupEnum.A绌鸿皟鑷畾涔夋ā寮�, data);
+
return true;
}
--
Gitblit v1.8.0