From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/Common/Logic/HdlDevicePirSensorLogic.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs b/ZigbeeApp/Shared/Phone/Common/Logic/HdlDevicePirSensorLogic.cs
similarity index 94%
rename from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
rename to ZigbeeApp/Shared/Phone/Common/Logic/HdlDevicePirSensorLogic.cs
index 5c90c36..fe2b52f 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Logic/HdlDevicePirSensorLogic.cs
@@ -5,7 +5,7 @@
using System.Threading.Tasks;
using Newtonsoft.Json.Linq;
-namespace Shared.Phone.UserCenter
+namespace Shared.Phone
{
/// <summary>
/// PIR浼犳劅鍣ㄧ殑閫昏緫
@@ -50,7 +50,7 @@
}
var data = await iASZone.GetPIRLightAbilitySizeAsync();
//鍏遍�氶敊璇娴�
- string error = HdlCheckLogic.Current.CheckCommonErrorCode(data);
+ string error = HdlCheckLogic.Current.CheckGatewayErrorCode(data);
if (error != null)
{
this.ShowErrorMsg(error);
@@ -62,7 +62,7 @@
//鑾峰彇浼犳劅鍣ㄥ厜鎰熺瓑绾уけ璐�
string msg = Language.StringByID(R.MyInternationalizationString.uGetPirSensorLightPerceptionRegulationFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, data);
+ msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, data);
this.ShowErrorMsg(msg);
return -1;
@@ -88,7 +88,7 @@
//鑾峰彇浼犳劅鍣ㄨ缃俊鎭け璐�
string msg = Language.StringByID(R.MyInternationalizationString.uGetPirSensorSettionFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, data);
+ msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, data);
this.ShowErrorMsg(msg);
return null;
@@ -115,7 +115,7 @@
//鑾峰彇浼犳劅鍣ㄤ寒搴﹀�煎け璐�
string msg = Language.StringByID(R.MyInternationalizationString.uGetPirSensorLuxFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, data);
+ msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, data);
if (mode == ShowErrorMode.YES)
{
this.ShowErrorMsg(msg);
@@ -133,7 +133,7 @@
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.GetPirSensorLightSettion(device.DeviceAddr, 200);
+ return HdlTemplateDeviceDataLogic.Current.GetPirSensorLightSettion(device.DeviceAddr, 200);
}
var sendData = this.GetPirSensorParamateCommadText(device.DeviceAddr);
var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway2(device, sendData, "0302", 34, 9);
@@ -198,7 +198,7 @@
//璁剧疆浼犳劅鍣ㄩ厤缃俊鎭け璐�
string msg = Language.StringByID(R.MyInternationalizationString.uSetPirSensorSettionFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
- msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
+ msg = HdlCommonLogic.Current.CombineGatewayTimeOutMsg(msg, result);
this.ShowErrorMsg(msg);
return false;
@@ -225,7 +225,7 @@
//濡傛灉鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.SetPirSensorLightSettion(device.DeviceAddr, 200, configureParamates, null);
+ return HdlTemplateDeviceDataLogic.Current.SetPirSensorLightSettion(device.DeviceAddr, 200, configureParamates, null);
}
//鍙戦�佹暟鎹�
var sendData = this.GetPirSensorSettionCommandText(device.DeviceAddr, configureParamates);
@@ -240,7 +240,7 @@
tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
//娣诲姞缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.SetPirSensorLightSettion(device.DeviceAddr, 200, configureParamates, result.JsonData[0]);
+ HdlTemplateDeviceDataLogic.Current.SetPirSensorLightSettion(device.DeviceAddr, 200, configureParamates, result.JsonData[0]);
return new CommonDevice.ResponseAllData { responseData = tempD };
}
@@ -440,7 +440,7 @@
{
Application.RunOnMainThread(() =>
{
- var contr = new UserCenter.ShowMsgControl(ShowMsgType.Tip, msg);
+ var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
contr.Show();
});
}
--
Gitblit v1.8.0