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/HdlDevicePirSensorLogic.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Logic/HdlDevicePirSensorLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
similarity index 96%
rename from ZigbeeApp/Shared/Phone/Common/Logic/HdlDevicePirSensorLogic.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
index 768aacc..5c90c36 100644
--- a/ZigbeeApp/Shared/Phone/Common/Logic/HdlDevicePirSensorLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
@@ -5,7 +5,7 @@
using System.Threading.Tasks;
using Newtonsoft.Json.Linq;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// PIR浼犳劅鍣ㄧ殑閫昏緫
@@ -50,7 +50,7 @@
}
var data = await iASZone.GetPIRLightAbilitySizeAsync();
//鍏遍�氶敊璇娴�
- string error = HdlCheckLogic.Current.CheckGatewayErrorCode(data);
+ string error = HdlCheckLogic.Current.CheckCommonErrorCode(data);
if (error != null)
{
this.ShowErrorMsg(error);
@@ -62,7 +62,7 @@
//鑾峰彇浼犳劅鍣ㄥ厜鎰熺瓑绾уけ璐�
string msg = Language.StringByID(R.MyInternationalizationString.uGetPirSensorLightPerceptionRegulationFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, data);
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, data);
this.ShowErrorMsg(msg);
return -1;
@@ -88,7 +88,7 @@
//鑾峰彇浼犳劅鍣ㄨ缃俊鎭け璐�
string msg = Language.StringByID(R.MyInternationalizationString.uGetPirSensorSettionFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, data);
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, data);
this.ShowErrorMsg(msg);
return null;
@@ -115,7 +115,7 @@
//鑾峰彇浼犳劅鍣ㄤ寒搴﹀�煎け璐�
string msg = Language.StringByID(R.MyInternationalizationString.uGetPirSensorLuxFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, data);
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, data);
if (mode == ShowErrorMode.YES)
{
this.ShowErrorMsg(msg);
@@ -198,7 +198,7 @@
//璁剧疆浼犳劅鍣ㄩ厤缃俊鎭け璐�
string msg = Language.StringByID(R.MyInternationalizationString.uSetPirSensorSettionFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
this.ShowErrorMsg(msg);
return false;
@@ -440,7 +440,7 @@
{
Application.RunOnMainThread(() =>
{
- var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
+ var contr = new UserCenter.ShowMsgControl(ShowMsgType.Tip, msg);
contr.Show();
});
}
--
Gitblit v1.8.0