From c6b35c3138b944830b5336bf610f918154dd47c7 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期六, 12 十月 2019 15:45:10 +0800 Subject: [PATCH] 合并门锁,完成住宅管理 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSelectControl.cs | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSelectControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSelectControl.cs index b7c2442..0436869 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSelectControl.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSelectControl.cs @@ -70,14 +70,18 @@ /// 鍋氭垚涓�涓樉绀鸿澶囧洖璺�+鎴块棿鐨凴owLayout /// </summary> /// <param name="i_device">璁惧瀵硅薄</param> + /// <param name="autoSelect">褰撶偣鍑绘鎺т欢鏃�,鏄惁鑷姩璁剧疆閫夋嫨鐘舵��</param> /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param> - public DeviceSelectControl(CommonDevice i_device, int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis) + public DeviceSelectControl(CommonDevice i_device, bool autoSelect, int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis) { this.MainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(i_device); - this.ButtonClickEvent += (sender, e) => + if (autoSelect == true) { - this.IsSelected = Statu == StatuMode.SELECT ? false : true; - }; + this.ButtonClickEvent += (sender, e) => + { + this.IsSelected = Statu == StatuMode.SELECT ? false : true; + }; + } } /// <summary> @@ -108,7 +112,7 @@ btnSelect = this.AddMostRightEmptyIcon(58, 58); btnSelect.Visible = false; - btnSelect.UnSelectedImagePath = "Item/Tick.png"; + btnSelect.UnSelectedImagePath = "Item/ItemSelected.png"; } #endregion -- Gitblit v1.8.0