From 3f87bf0ae7394cdd7d52428f1f6b4361434c7cc4 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期五, 15 五月 2020 13:28:33 +0800 Subject: [PATCH] hhhhhhhhh --- ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs index 8674a16..3ea4dc9 100755 --- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs +++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs @@ -17,9 +17,9 @@ /// 鍒濆鍖栨帶浠� /// </summary> /// <param name="i_device"></param> - public override void InitControl(CommonDevice i_device) + public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom) { - base.InitControl(i_device); + base.InitControl(i_device, i_nowSelectRoom); //娣诲姞璺宠浆娣卞害鍗$墖淇℃伅浜嬩欢 this.AddDetailInfoEvent(i_device); @@ -63,7 +63,7 @@ { //绌鸿皟绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈� var form = new MainPage.ControlForm.DeviceAcDetailCardForm(); - form.AddForm(i_device, HdlRoomLogic.Current.CurrentRoom, 965, 1457); + form.AddForm(i_device, this.nowSelectRoom, 965, 1457); form.FormCloseEvent += this.CardDetailInfoBackEvent; }; } -- Gitblit v1.8.0