From a4d525d08da7b6fb985b0069c539c11b06306a9b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 16:28:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs
index 5da1d10..13a7e13 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceGeneralInformationForm.cs
@@ -39,9 +39,9 @@
var listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_deviceMac);
- var listView = new FrameListControl(12);
+ var listView = new VerticalListControl(12);
listView.BackgroundColor = UserCenterColor.Current.White;
- listView.Height = Application.GetRealHeight(876);
+ listView.Height = bodyFrameLayout.Height;
bodyFrameLayout.AddChidren(listView);
//璁惧鍚嶇О
@@ -94,6 +94,8 @@
listView.AddChidren(rowProtuct);
rowProtuct.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uManufacturerName), 300);
rowProtuct.AddMostRightView(listDevice[0].ManufacturerName, 600);
+
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
}
#endregion
--
Gitblit v1.8.0