From 2450c12c825ad4d78d1572da2fa421706db2df2f Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 18 六月 2020 16:01:14 +0800 Subject: [PATCH] 新代码 --- ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs | 21 +++++---------------- 1 files changed, 5 insertions(+), 16 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs index 9e3b374..0fda2b2 100755 --- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs +++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs @@ -71,22 +71,11 @@ { Common.CommonPage.Instance.IsDrawerLockMode = true; - //濡傛灉鏄疢ini澶滅伅 - if (Common.LocalDevice.Current.IsMiniLight(i_device) == true) - { - var form = new ControlForm.DeviceMiniLightDetailCardForm(); - form.RowOrCardControl = this; - form.AddForm(i_device, this.nowSelectRoom, 965, 1466); - form.FormCloseEvent += this.CardDetailInfoBackEvent; - } - else - { - //褰╃伅,璋冨厜鍣ㄧ被鍨嬬殑娣卞害鍗$墖鐣岄潰 - var form = new ControlForm.DeviceColorLightDetailCardForm(); - form.RowOrCardControl = this; - form.AddForm(i_device, this.nowSelectRoom, 965, 1316); - form.FormCloseEvent += this.CardDetailInfoBackEvent; - } + //褰╃伅,璋冨厜鍣ㄧ被鍨嬬殑娣卞害鍗$墖鐣岄潰 + var form = new ControlForm.DeviceColorLightDetailCardForm(); + form.RowOrCardControl = this; + form.AddForm(i_device, this.nowSelectRoom, 965, 1316); + form.FormCloseEvent += this.CardDetailInfoBackEvent; }; } -- Gitblit v1.8.0