From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceFreshAirCardControl.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceFreshAirCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceFreshAirCardControl.cs
index 9fc1779..1bed2cc 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceFreshAirCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceFreshAirCardControl.cs
@@ -7,16 +7,16 @@
/// 鏂伴鍗＄墖鐨勬帶浠�
/// </summary>
public class DeviceFreshAirCardControl : DeviceCardCommon
- {
+ {
#region 鈻� 鍒濆鍖朹____________________________
-
+
/// <summary>
/// 鍒濆鍖栨帶浠�
/// </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);
@@ -71,7 +71,8 @@
//鏂伴绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
var form = new MainPage.ControlForm.DeviceFreshAirDetailCardForm();
- form.AddForm(i_device, HdlRoomLogic.Current.CurrentRoom, 965, 1374);
+ form.RowOrCardControl = this;
+ form.AddForm(i_device, this.nowSelectRoom, 965, 1374);
form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
--
Gitblit v1.8.0