From e96e11d6f8b965ea522c983e040d41e3b9ef105a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 21:33:19 +0800
Subject: [PATCH] 2020-05-18-4
---
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs
index 60a2c59..8674a16 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs
@@ -14,14 +14,6 @@
#region 鈻� 鍒濆鍖朹____________________________
/// <summary>
- /// 鍒嗙被鐣岄潰鐨勭┖璋冭澶囪鎺т欢
- /// </summary>
- /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param>
- public DeviceAcRowControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
- {
- }
-
- /// <summary>
/// 鍒濆鍖栨帶浠�
/// </summary>
/// <param name="i_device"></param>
@@ -69,12 +61,10 @@
//娣卞害鍗＄墖淇℃伅
this.frameTable.ButtonClickEvent += (sender, e) =>
{
- var acControl = new Phone.Device.AC.ACControl();
- UserView.HomePage.Instance.AddChidren(acControl);
- UserView.HomePage.Instance.PageIndex += 1;
- UserView.HomePage.Instance.ScrollEnabled = false;
- acControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);
- acControl.action += this.CardDetailInfoBackEvent;
+ //绌鸿皟绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
+ var form = new MainPage.ControlForm.DeviceAcDetailCardForm();
+ form.AddForm(i_device, HdlRoomLogic.Current.CurrentRoom, 965, 1457);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
@@ -104,7 +94,7 @@
//妫�娴嬭兘鍚﹀彂閫佽幏鍙栫姸鎬佸懡浠�
if (this.CheckCanSendStatuComand() == true)
{
- Device.DeviceLogic.ReadDeviceAttributeLogic.Instance.SendACStatuComand(this.device);
+ HdlDeviceAttributeLogic.Current.SendACStatuComand(this.device);
}
}
--
Gitblit v1.8.0