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/HdlSceneLogic.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlSceneLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
similarity index 98%
rename from ZigbeeApp/Shared/Phone/Common/Logic/HdlSceneLogic.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
index c015ade..7dd4fc8 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlSceneLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
@@ -5,7 +5,7 @@
using System.Threading.Tasks;
using ZigBee.Device;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// 鍦烘櫙鐨勯�昏緫
@@ -268,7 +268,7 @@
//娣诲姞鍦烘櫙澶辫触
string msg1 = Language.StringByID(R.MyInternationalizationString.AddSceneFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg1 = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg1, result);
+ msg1 = UserCenterLogic.CombineGatewayTimeOutMsg(msg1, result);
this.ShowTipMsg(msg1);
return null;
}
@@ -569,7 +569,7 @@
//鍒濆鍖栨墽琛岀洰鏍囧け璐�
string msg1 = Language.StringByID(R.MyInternationalizationString.uInitAdjustTargetFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg1 = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg1, result);
+ msg1 = UserCenterLogic.CombineGatewayTimeOutMsg(msg1, result);
this.ShowTipMsg(msg1);
return false;
}
@@ -611,7 +611,7 @@
}
var result1 = await Scene.RenameSceneAsync(scene.Id, newName);
//鍏遍�氶敊璇娴�
- string error = HdlCheckLogic.Current.CheckGatewayErrorCode(result1);
+ string error = HdlCheckLogic.Current.CheckCommonErrorCode(result1);
if (error != null)
{
this.ShowErrorMsg(error);
@@ -622,7 +622,7 @@
//淇敼鍦烘櫙鍚嶇О澶辫触
string msg1 = Language.StringByID(R.MyInternationalizationString.uEditorSceneNameFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg1 = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg1, result1);
+ msg1 = UserCenterLogic.CombineGatewayTimeOutMsg(msg1, result1);
this.ShowTipMsg(msg1);
return false;
}
@@ -925,7 +925,7 @@
//鎺у埗鍦烘櫙澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.ControlSceneFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
HdlThreadLogic.Current.RunMain(() =>
{
//璇ュ満鏅鍦ㄥ欢鏃讹紝璇风◢鍚�
@@ -994,7 +994,7 @@
//鑾峰彇鎵ц鐩爣澶辫触
string msg = Language.StringByID(R.MyInternationalizationString.uGetAdjustTargetFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
this.ShowTipMsg(msg);
return null;
--
Gitblit v1.8.0