From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceAirConditionerLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
similarity index 98%
rename from ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceAirConditionerLogic.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
index 02d04c0..98dc9ef 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceAirConditionerLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using ZigBee.Device;
 
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
 {
     /// <summary>
     /// 绌鸿皟鐨勯�昏緫
@@ -46,7 +46,7 @@
         {
             var result = await device.Open();
             //妫�娴嬬綉鍏宠繑鍥炵殑鍏遍�氶敊璇姸鎬佺爜
-            string error = HdlCheckLogic.Current.CheckGatewayErrorCode(result);
+            string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);
             if (error != null)
             {
                 this.ShowTipMsg(error);
@@ -57,7 +57,7 @@
                 //鎵撳紑绌鸿皟澶辫触
                 string msg = Language.StringByID(R.MyInternationalizationString.uOpenAirConditionerFail);
                 //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
-                msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
+                msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
                 this.ShowTipMsg(msg);
                 return false;
             }
@@ -84,7 +84,7 @@
         {
             var result = await device.Close();
             //妫�娴嬬綉鍏宠繑鍥炵殑鍏遍�氶敊璇姸鎬佺爜
-            string error = HdlCheckLogic.Current.CheckGatewayErrorCode(result);
+            string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);
             if (error != null)
             {
                 this.ShowTipMsg(error);
@@ -95,7 +95,7 @@
                 //鍏抽棴绌鸿皟澶辫触
                 string msg = Language.StringByID(R.MyInternationalizationString.uCloseAirConditionerFail);
                 //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
-                msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
+                msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
                 this.ShowTipMsg(msg);
                 return false;
             }
@@ -141,7 +141,7 @@
                 //璁剧疆绌鸿皟妯″紡澶辫触
                 string msg = Language.StringByID(R.MyInternationalizationString.uSetAcModeFail);
                 //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
-                msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
+                msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
                 this.ShowTipMsg(msg); ;
                 return false;
             }
@@ -193,7 +193,7 @@
                 //璁剧疆绌鸿皟鎽嗛澶辫触
                 string msg = Language.StringByID(R.MyInternationalizationString.uSetAirConditionerSwingFunctionFail);
                 //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
-                msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
+                msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
                 this.ShowTipMsg(msg);
                 return false;
             }

--
Gitblit v1.8.0