From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
index cd143e4..32ae141 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
@@ -67,10 +67,10 @@
#endregion
- #region 鈻� 鑾峰彇鐏厜閰嶇疆_______________________
+ #region 鈻� 鑾峰彇閰嶇疆淇℃伅_______________________
/// <summary>
- /// 鑾峰彇PIR浼犳劅鍣ㄧ殑銆愮伅鍏夐厤缃�戯紝閿欒鏃惰繑鍥瀗ull
+ /// 鑾峰彇PIR浼犳劅鍣ㄧ殑銆愰厤缃俊鎭�戯紝閿欒鏃惰繑鍥瀗ull
/// </summary>
/// <param name="iASZone"></param>
/// <returns></returns>
@@ -79,8 +79,8 @@
var data = await iASZone.GetPIRSensorParamateAsync();
if (data == null || data.configureParamates == null)
{
- //鑾峰彇浼犳劅鍣ㄧ伅鍏夎缃俊鎭け璐�
- string msg = Language.StringByID(R.MyInternationalizationString.uGetPirSensorLightSettionFail);
+ //鑾峰彇浼犳劅鍣ㄨ缃俊鎭け璐�
+ string msg = Language.StringByID(R.MyInternationalizationString.uGetPirSensorSettionFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, data);
@@ -92,21 +92,21 @@
#endregion
- #region 鈻� 璁剧疆鐏厜閰嶇疆_______________________
+ #region 鈻� 璁剧疆閰嶇疆淇℃伅_______________________
/// <summary>
- /// 璁剧疆PIR浼犳劅鍣ㄧ殑銆愮伅鍏夐厤缃��
+ /// 璁剧疆PIR浼犳劅鍣ㄧ殑銆愰厤缃俊鎭��
/// </summary>
/// <param name="iASZone">浼犳劅鍣ㄥ璞�</param>
/// <param name="configure">鐏厜閰嶇疆</param>
/// <returns></returns>
- public async Task<bool> SetPirSensorLightSettion(IASZone iASZone, IASZone.ConfigureParamates configure)
+ public async Task<bool> SetPirSensorSettion(IASZone iASZone, IASZone.ConfigureParamates configure)
{
var result = await iASZone.SetPIRSensorParamateAsync(configure);
if (result == null || result.responseData == null)
{
- //璁剧疆浼犳劅鍣ㄧ伅鍏夐厤缃け璐�
- string msg = Language.StringByID(R.MyInternationalizationString.uSetPirSensorLightSettionFail);
+ //璁剧疆浼犳劅鍣ㄩ厤缃俊鎭け璐�
+ string msg = Language.StringByID(R.MyInternationalizationString.uSetPirSensorSettionFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, result);
@@ -115,8 +115,8 @@
}
if (result.responseData.status != 0)
{
- //璁剧疆浼犳劅鍣ㄧ伅鍏夐厤缃け璐�
- string msg = Language.StringByID(R.MyInternationalizationString.uSetPirSensorLightSettionFail);
+ //璁剧疆浼犳劅鍣ㄩ厤缃俊鎭け璐�
+ string msg = Language.StringByID(R.MyInternationalizationString.uSetPirSensorSettionFail);
this.ShowErrorMsg(msg);
return false;
}
--
Gitblit v1.8.0