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/HdlDeviceCurtainLogic.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceCurtainLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs
similarity index 95%
rename from ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceCurtainLogic.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs
index 657135a..bf9497a 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlDeviceCurtainLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs
@@ -7,7 +7,7 @@
using System.Threading.Tasks;
using ZigBee.Device;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// 绐楀笜鐨勯�昏緫
@@ -68,7 +68,7 @@
//鍒囨崲鎵嬫媺鎺у埗澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uChangeHandPullControlFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
this.ShowTipMsg(msg);
return false;
}
@@ -118,7 +118,7 @@
{
var result = this.SetCurtainDirectionAsync(rollershade, bolStatu);
//妫�娴嬬綉鍏宠繑鍥炵殑鍏遍�氶敊璇姸鎬佺爜
- string error = HdlCheckLogic.Current.CheckGatewayErrorCode(result);
+ string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);
if (error != null)
{
this.ShowTipMsg(error);
@@ -129,7 +129,7 @@
//绐楀笜鏂瑰悜璁剧疆澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uSetCurtainDirectionFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
this.ShowTipMsg(msg);
return false;
}
@@ -215,7 +215,7 @@
//璁剧疆绐楀笜闄愪綅鐐瑰け璐�
string msg = Language.StringByID(R.MyInternationalizationString.uCommitCurtainLimitFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
this.ShowTipMsg(msg);
return false;
}
@@ -298,7 +298,7 @@
//result = await HdlDeviceAttributeLogic.Current.WriteDeviceAttribute(rollershade, 258, 24, 65, sendData);
}
//妫�娴嬬綉鍏宠繑鍥炵殑鍏遍�氶敊璇姸鎬佺爜
- string error = HdlCheckLogic.Current.CheckGatewayErrorCode(result);
+ string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);
if (error != null)
{
this.ShowTipMsg(error);
@@ -309,7 +309,7 @@
//璁剧疆绐楀笜闄愪綅鐐瑰け璐�
string msg = Language.StringByID(R.MyInternationalizationString.uCommitCurtainLimitFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
this.ShowTipMsg(msg);
return false;
}
@@ -334,7 +334,7 @@
{
var result = await rollershade.DeleteCurtainLimitsAsync(limiType);
//妫�娴嬬綉鍏宠繑鍥炵殑鍏遍�氶敊璇姸鎬佺爜
- string error = HdlCheckLogic.Current.CheckGatewayErrorCode(result);
+ string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);
if (error != null)
{
this.ShowTipMsg(error);
@@ -345,7 +345,7 @@
//閲嶇疆绐楀笜闄愪綅鐐瑰け璐�
string msg = Language.StringByID(R.MyInternationalizationString.uDeleteCurtainLimitFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
this.ShowTipMsg(msg);
return false;
}
@@ -417,7 +417,7 @@
{
var result = await rollershade.RestoreCurtainLimitAsync();
//妫�娴嬬綉鍏宠繑鍥炵殑鍏遍�氶敊璇姸鎬佺爜
- string error = HdlCheckLogic.Current.CheckGatewayErrorCode(result);
+ string error = HdlCheckLogic.Current.CheckCommonErrorCode(result);
if (error != null)
{
this.ShowTipMsg(error);
@@ -428,7 +428,7 @@
//閲嶇疆绐楀笜澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uRestoreCurtainFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
this.ShowTipMsg(msg);
return false;
}
--
Gitblit v1.8.0