From 9904031f5291daaf56985146bb671f25e18ebbdf Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 02 四月 2020 19:51:31 +0800 Subject: [PATCH] 最新代码 --- ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs index 60a2c59..89474f2 100755 --- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs +++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs @@ -69,12 +69,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; }; } -- Gitblit v1.8.0