From 737c036a39176fd2085ce82b7c60391da8cb508c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 19:17:47 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
index 32ae141..fa3b51a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
@@ -92,6 +92,31 @@
#endregion
+ #region 鈻� 鑾峰彇閰嶇疆淇℃伅_______________________
+
+ /// <summary>
+ /// 鑾峰彇PIR浼犳劅鍣ㄧ殑銆恖ux鍊笺�戯紝閿欒鏃惰繑鍥�-1
+ /// </summary>
+ /// <param name="iASZone"></param>
+ /// <returns></returns>
+ public async Task<int> GetPirSensorLux(IASZone iASZone)
+ {
+ var data = await iASZone.GetPirLuxAbilitySizeAsync();
+ if (data == null || data.pirLux == -1)
+ {
+ //鑾峰彇浼犳劅鍣ㄤ寒搴﹀�煎け璐�
+ string msg = Language.StringByID(R.MyInternationalizationString.uGetPirSensorLuxFail);
+ //鎷兼帴涓娿�愮綉鍏冲洖澶嶈秴鏃躲�戠殑Msg
+ msg = UserCenterLogic.CombineGatewayTimeOutMsg(msg, data);
+
+ this.ShowErrorMsg(msg);
+ return -1;
+ }
+ return data.pirLux;
+ }
+
+ #endregion
+
#region 鈻� 璁剧疆閰嶇疆淇℃伅_______________________
/// <summary>
--
Gitblit v1.8.0