From 737c036a39176fd2085ce82b7c60391da8cb508c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 19:17:47 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/InformationEditorControl.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/InformationEditorControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/InformationEditorControl.cs
index 6535251..fc1c8a2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/InformationEditorControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/InformationEditorControl.cs
@@ -59,10 +59,10 @@
{
var btnFinish = new BottomClickButton();
//鍊熺敤Y杞村潗鏍�(璁╄繖涓尯鍩熶笉鑳界偣鍑昏彍鍗�)
- var frameBack = new FrameLayout();
- frameBack.Y = btnFinish.Yaxis;
- frameBack.Height = bodyFrameLayout.Height - btnFinish.Yaxis;
- bodyFrameLayout.AddChidren(frameBack);
+ //var frameBack = new FrameLayout();
+ //frameBack.Y = btnFinish.Yaxis;
+ //frameBack.Height = bodyFrameLayout.Height - btnFinish.Yaxis;
+ //bodyFrameLayout.AddChidren(frameBack);
if (listview.ChildrenCount > 0)
{
@@ -71,7 +71,8 @@
{
//淇冧娇琚尅浣忕殑鑿滃崟鑳藉鍚戜笂婊戝姩
var frameTemp = new FrameLayout();
- frameTemp.Height = frameBack.Height + Application.GetRealHeight(115);
+ //frameTemp.Height = frameBack.Height + Application.GetRealHeight(115);
+ frameTemp.Height = bodyFrameLayout.Height - btnFinish.Yaxis + Application.GetRealHeight(115);
listview.AddChidren(frameTemp);
}
}
--
Gitblit v1.8.0