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/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs index a5ac473..8944a09 100755 --- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs +++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs @@ -60,13 +60,11 @@ //娣卞害鍗$墖淇℃伅 this.ButtonClickEvent += (sender, e) => { - var rollerShadeControl = new Phone.Device.Curtain.RollerShadeControl(); - UserView.HomePage.Instance.AddChidren(rollerShadeControl); - UserView.HomePage.Instance.PageIndex += 1; - UserView.HomePage.Instance.ScrollEnabled = false; - rollerShadeControl.IsDrawerLockMode = true; - rollerShadeControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom); - rollerShadeControl.action += this.CardDetailInfoBackEvent; + Common.CommonPage.Instance.IsDrawerLockMode = true; + //绐楀笜绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈� + var form = new ControlForm.DeviceCurtainDetailCardForm(); + form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, 1316); + form.FormCloseEvent += this.CardDetailInfoBackEvent; }; } -- Gitblit v1.8.0