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/DeviceRelayRowControl.cs | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceRelayRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceRelayRowControl.cs
index 30bc99c..69a2494 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceRelayRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceRelayRowControl.cs
@@ -68,11 +68,24 @@
//娣卞害鍗＄墖淇℃伅
this.frameTable.ButtonClickEvent += (sender, e) =>
{
- var lightControl = new Phone.Device.Light.OnOffControl();
- UserView.HomePage.Instance.AddChidren(lightControl);
- UserView.HomePage.Instance.PageIndex += 1;
- lightControl.Show(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom);
- lightControl.action += this.CardDetailInfoBackEvent;
+ int backHeight = 0;
+ if (i_device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ {
+ backHeight = 1290;
+ }
+ else if (i_device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ backHeight = 1290;
+ }
+ else
+ {
+ backHeight = 1316;
+ }
+
+ //缁х數鍣ㄧ被鍨嬬殑娣卞害鍗＄墖鐣岄潰(鍚┖姘斿紑鍏�)
+ var form = new MainPage.ControlForm.DeviceRelayDetailCardForm();
+ form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, backHeight);
+ form.FormCloseEvent += this.CardDetailInfoBackEvent;
};
}
--
Gitblit v1.8.0