From b02e8275a21dc06bf54b66273485d44e007a2616 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 20 七月 2020 14:50:17 +0800
Subject: [PATCH] 新代码
---
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DevicePmSensorRowControl.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DevicePmSensorRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DevicePmSensorRowControl.cs
old mode 100644
new mode 100755
similarity index 76%
rename from ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DevicePmSensorRowControl.cs
rename to ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DevicePmSensorRowControl.cs
index 0adb49e..3e5886c
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DevicePmSensorRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DevicePmSensorRowControl.cs
@@ -12,9 +12,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);
@@ -32,7 +32,8 @@
{
//PM2.5浼犳劅鍣ㄧ被鍨嬬殑娣卞害鍗＄墖鐣岄潰
var form = new MainPage.ControlForm.DevicePmSensorDetailCardForm();
- form.AddForm(i_device, HdlRoomLogic.Current.CurrentRoom, 965, 1374);
+ form.RowOrCardControl = this;
+ form.AddForm(i_device, this.nowSelectRoom, 965, 1374);
form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
@@ -47,10 +48,10 @@
public override void SendStatuComand()
{
//妫�娴嬭兘鍚﹀彂閫佽幏鍙栫姸鎬佸懡浠�
- //if (this.CheckCanSendStatuComand() == true)
- //{
- HdlDeviceAttributeLogic.Current.SendFreshAirStatuComand(this.device);
- //}
+ if (this.CheckCanSendStatuComand() == true)
+ {
+ HdlDeviceAttributeLogic.Current.SendFreshAirStatuComand(this.device);
+ }
}
#endregion
--
Gitblit v1.8.0