From a2d26f15b940c853faaf6d6959b16a6d919cb800 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 27 十一月 2019 19:26:30 +0800
Subject: [PATCH] 请合并最新的代码(完成门锁功能)

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
index 0a8b19e..fece7db 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/TopRightMenuControl.cs
@@ -89,10 +89,14 @@
             //鍒楄〃鎺т欢
             this.listView = new VerticalListControl();
             listView.Height = frameTable.Height;
-            if (rowCount == 5 && titleText != null)
+            if (rowCount == 5)
             {
                 //杩炲甫鏍囬,鍙兘鏄剧ず5琛�
                 listView.Height = frameTable.Height - Application.GetRealHeight(RowHeight);
+            }
+            if (titleText != null)
+            {
+                //鎷ユ湁鏍囬
                 listView.Y = Application.GetRealHeight(RowHeight);
             }
             listView.Radius = frameTable.Radius;

--
Gitblit v1.8.0