From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
index fa3b51a..d30b259 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
@@ -90,16 +90,13 @@
return data.configureParamates;
}
- #endregion
-
- #region 鈻� 鑾峰彇閰嶇疆淇℃伅_______________________
-
/// <summary>
/// 鑾峰彇PIR浼犳劅鍣ㄧ殑銆恖ux鍊笺�戯紝閿欒鏃惰繑鍥�-1
/// </summary>
/// <param name="iASZone"></param>
+ /// <param name="mode"></param>
/// <returns></returns>
- public async Task<int> GetPirSensorLux(IASZone iASZone)
+ public async Task<int> GetPirSensorLux(IASZone iASZone, ShowErrorMode mode = ShowErrorMode.YES)
{
var data = await iASZone.GetPirLuxAbilitySizeAsync();
if (data == null || data.pirLux == -1)
@@ -108,8 +105,10 @@
string msg = Language.StringByID(R.MyInternationalizationString.uGetPirSensorLuxFail);
//鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, data);
-
- this.ShowErrorMsg(msg);
+ if (mode == ShowErrorMode.YES)
+ {
+ this.ShowErrorMsg(msg);
+ }
return -1;
}
return data.pirLux;
--
Gitblit v1.8.0