From 136b9e2fc48249a5ff89874f1080ba94130e7a9e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 19 五月 2020 11:12:29 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DevicePmSensorRowControl.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DevicePmSensorRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DevicePmSensorRowControl.cs
old mode 100755
new mode 100644
index 11f00ed..646eb3c
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/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,7 @@
{
//PM2.5浼犳劅鍣ㄧ被鍨嬬殑娣卞害鍗＄墖鐣岄潰
var form = new MainPage.ControlForm.DevicePmSensorDetailCardForm();
- form.AddForm(i_device, HdlRoomLogic.Current.CurrentRoom, 965, 1374);
+ form.AddForm(i_device, this.nowSelectRoom, 965, 1374);
form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
@@ -47,10 +47,10 @@
public override void SendStatuComand()
{
//妫�娴嬭兘鍚﹀彂閫佽幏鍙栫姸鎬佸懡浠�
- if (this.CheckCanSendStatuComand() == true)
- {
- HdlDeviceAttributeLogic.Current.SendFreshAirStatuComand(this.device);
- }
+ //if (this.CheckCanSendStatuComand() == true)
+ //{
+ HdlDeviceAttributeLogic.Current.SendPmSensorComand(this.device);
+ //}
}
#endregion
--
Gitblit v1.8.0