From f3e65daca7978b21b5888f49b1bf35e1a6e5d4fd Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 13 七月 2020 12:33:31 +0800
Subject: [PATCH] 新版本

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
index 0063924..cea4fbb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
@@ -18,11 +18,11 @@
         /// <summary>
         /// 妗屽竷鎺т欢
         /// </summary>
-        private FrameLayout m_frameTable = null;
+        private NormalFrameLayout m_frameTable = null;
         /// <summary>
         /// 妗屽竷鎺т欢(杩欎釜涓滆タ涓嶈兘鍒狅紝鍥犱负鏈変簺鐣岄潰闇�瑕佷粬鐨勬甯�)
         /// </summary>
-        public FrameLayout frameTable
+        public NormalFrameLayout frameTable
         {
             get
             {
@@ -65,10 +65,10 @@
             {
                 return;
             }
-            this.m_frameTable = new FrameLayout();
+            this.m_frameTable = new NormalFrameLayout();
             this.m_frameTable.Width = this.Width;
             this.m_frameTable.Height = this.Height;
-            this.AddChidren(this.m_frameTable);
+            base.AddChidren(this.m_frameTable);
         }
 
         #endregion
@@ -76,25 +76,25 @@
         #region 鈻� 娣诲姞瀛愭帶浠禵________________________
 
         /// <summary>
-        /// 娣诲姞Frame瀛愭帶浠�
+        /// 娣诲姞Frame瀛愭帶浠�(娉ㄦ剰,瀹冩槸寰�涓嬪姞鎺т欢,鍙細鏀瑰彉鍧愭爣,妗屽竷澶у皬浼氬鍔�)
         /// </summary>
         /// <param name="view"></param>
-        public void AddChidrenFrame(FrameLayout frame)
+        public override void AddChidren(View view)
         {
             //鍒濆鍖栨甯冩帶浠�
             this.InitFrameTable();
 
             //鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
-            int value = this.GetLocationMostLastViewBottom(this.m_frameTable);
+            int value = this.GetLocationMostLastViewBottom(this.frameTable);
             if (value != -1)
             {
-                frame.Y = value + rowSpace;
+                view.Y = value + rowSpace;
             }
-            this.m_frameTable.AddChidren(frame);
+            this.frameTable.AddChidren(view);
             //璋冩暣妗屽竷楂樺害
-            if (this.m_frameTable.Height < frame.Bottom)
+            if (this.frameTable.Height < view.Bottom)
             {
-                this.m_frameTable.Height = frame.Bottom;
+                this.frameTable.Height = view.Bottom;
             }
         }
 
@@ -125,10 +125,16 @@
         /// 璋冩暣瀛怓rameLayout鐨勭湡瀹為珮搴�
         /// </summary>
         /// <param name="frame"></param>
-        public void AdjustChidrenFrameRealHeight(FrameLayout frame)
+        /// <param name="minHeight">鏈�灏忛珮搴�</param>
+        public void AdjustChidrenFrameRealHeight(FrameLayout frame, int minHeight = -1)
         {
             //鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
             int value = this.GetLocationMostLastViewBottom(frame);
+            if (minHeight != -1 && value < minHeight)
+            {
+                //娌℃湁瓒呰繃鏈�灏忛珮搴�
+                return;
+            }
             if (value != -1)
             {
                 //璋冩暣妗屽竷楂樺害
@@ -148,11 +154,11 @@
             }
 
             //鑾峰彇鍧愭爣搴曢儴鏈�涓嬮潰鐨勯偅涓帶浠剁殑搴曢儴鍧愭爣
-            int value = this.GetLocationMostLastViewBottom(this.m_frameTable);
+            int value = this.GetLocationMostLastViewBottom(this.frameTable);
             if (value != -1)
             {
                 //璋冩暣妗屽竷楂樺害
-                this.m_frameTable.Height = value;
+                this.frameTable.Height = value;
             }
             else
             {
@@ -174,7 +180,7 @@
             this.AdjustTableHeight();
 
             var btnTemp = new BottomClickButton();
-            if (btnTemp.Yaxis >= this.m_frameTable.Height + correctionsValue)
+            if (btnTemp.Yaxis >= this.frameTable.Height + correctionsValue)
             {
                 //娌℃湁瓒呰繃
                 return;
@@ -185,7 +191,7 @@
 
             this.frameBackTemp = new FrameLayout();
             frameBackTemp.Height = ControlCommonResourse.BodyFrameHeight - btnTemp.Yaxis + Application.GetRealHeight(23);
-            this.AddChidrenFrame(frameBackTemp);
+            this.AddChidren(frameBackTemp);
 
             this.rowSpace = oldRowSpace;
         }

--
Gitblit v1.8.0