From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
index 1d249da..0fda2b2 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.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);
@@ -73,7 +73,8 @@
//褰╃伅,璋冨厜鍣ㄧ被鍨嬬殑娣卞害鍗＄墖鐣岄潰
var form = new ControlForm.DeviceColorLightDetailCardForm();
- form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, 1316);
+ form.RowOrCardControl = this;
+ form.AddForm(i_device, this.nowSelectRoom, 965, 1316);
form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
--
Gitblit v1.8.0