From dee21bf452a8979d0515d13e534fbb69ed9715dd Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期二, 01 九月 2020 15:33:13 +0800 Subject: [PATCH] 上传一个版本 --- ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs index 69f42ef..8966fec 100755 --- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs +++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs @@ -271,6 +271,13 @@ //绛夊緟缃戝叧鍥炲鍚庝細閲嶆柊鍒锋柊,涓嶇劧涓�鐩存槸鍏抽棴鐘舵�� isOpen = false; } + //濡傛灉鏄紶鎰熷櫒绫�,鍒欓粯璁ゆ槸鍏崇殑鏁堟灉 + if (this.device.Type == DeviceType.PMSensor || this.device.Type == DeviceType.IASZone + || this.device.Type == DeviceType.TemperatureSensor) + { + isOpen = false; + } + this.SetRowOpenStatu(isOpen); } @@ -443,6 +450,15 @@ this.ResponeResult = 1; } + /// <summary> + /// 鎺ユ敹缃戝叧鍥炲鐨勭姸鎬�(true:宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍥炲 false:杩樻病鏈夋帴鏀跺埌缃戝叧鍥炲) + /// </summary> + /// <returns></returns> + public bool ReceiveResponeResultStatu() + { + return this.ResponeResult == 1; + } + #endregion #region 鈻� 鏄剧ず浣庣數閲廮________________________ @@ -545,7 +561,7 @@ /// <summary> /// 鍒囨崲鍗$墖鐘舵�佺壒鏁� /// </summary> - private void SwitchRowStatuAppeal(bool isOpen) + public void SwitchRowStatuAppeal(bool isOpen) { if (this.btnDeviceName.IsSelected == isOpen) { -- Gitblit v1.8.0