From 98ceb6bd2021f9ff136cda27eef28676dd7b5d92 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 21 五月 2020 13:24:02 +0800
Subject: [PATCH] 最后的版本

---
 ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs |   76 ++++++++++++++++++++-----------------
 1 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
index d0417ce..f7b2221 100755
--- a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
@@ -188,13 +188,16 @@
         /// <param name="parameter">鍚姩鍙傛暟锛氬弬鏁扮敱鎸囧畾鐢婚潰鐨凷howForm鍑芥暟鎵�鎸囧畾</param>
         public override void AddForm(params object[] parameter)
         {
+            //鐣岄潰鍔犺浇涓�
+            ControlCommonResourse.IsFormAdding = true;
+
             base.AddForm(parameter);
 
-            //妫�娴嬭兘鍚﹁拷鍔犵敾闈�
-            if (UserCenterLogic.CheckCanAddForm(this) == false)
-            {
-                return;
-            }
+            //妫�娴嬭兘鍚﹁拷鍔犵敾闈� 2020.05.14鑸嶅純
+            //if (UserCenterLogic.CheckCanAddForm(this) == false)
+            //{
+            //    return;
+            //}
 
             UserView.HomePage.Instance.AddChidren(this);
             UserView.HomePage.Instance.PageIndex += 1;
@@ -204,6 +207,9 @@
 
             //鎵цShowForm()鏂规硶
             this.LoadShowFormMethod(parameter);
+
+            //鐣岄潰鍔犺浇缁撴潫
+            ControlCommonResourse.IsFormAdding = false;
         }
 
         #endregion
@@ -225,9 +231,38 @@
             this.m_parameter = null;
             //娓呯┖bodyFrame
             this.ClearBodyFrame();
-        }
+        }
 
         #endregion
+
+        #region 鈻� 娣诲姞甯姪鎺т欢_______________________
+
+        /// <summary>
+        /// 娣诲姞鏌ョ湅甯姪鎺т欢
+        /// </summary>
+        /// <returns></returns>
+        public NormalViewControl AddHelpControl()
+        {
+            //鏌ョ湅甯姪
+            var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
+            btnHelp.Y = Application.GetRealHeight(1388);
+            btnHelp.TextSize = 12;
+            btnHelp.TextAlignment = TextAlignment.Center;
+            btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
+            btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
+            bodyFrameLayout.AddChidren(btnHelp);
+            //搴曠嚎
+            int lineWidth = btnHelp.GetRealWidthByText();
+            var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
+            btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
+            btnLine.Gravity = Gravity.CenterHorizontal;
+            btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
+            bodyFrameLayout.AddChidren(btnLine);
+
+            return btnHelp;
+        }
+
+        #endregion
 
         #region 鈻� 鏄剧ず閲嶆柊鍔犺浇_______________________
 
@@ -289,35 +324,6 @@
         {
         }
 
-        #endregion
-
-        #region 鈻� 娣诲姞甯姪鎺т欢_______________________
-
-        /// <summary>
-        /// 娣诲姞鏌ョ湅甯姪鎺т欢
-        /// </summary>
-        /// <returns></returns>
-        public NormalViewControl AddHelpControl()
-        {
-            //鏌ョ湅甯姪
-            var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
-            btnHelp.Y = Application.GetRealHeight(1388);
-            btnHelp.TextSize = 12;
-            btnHelp.TextAlignment = TextAlignment.Center;
-            btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
-            btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
-            bodyFrameLayout.AddChidren(btnHelp);
-            //搴曠嚎
-            int lineWidth = btnHelp.GetRealWidthByText();
-            var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
-            btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
-            btnLine.Gravity = Gravity.CenterHorizontal;
-            btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
-            bodyFrameLayout.AddChidren(btnLine);
-
-            return btnHelp;
-        }
-
         #endregion
 
         #region 鈻� 鏄剧ず娌℃湁鏁版嵁鐨勫浘鍍忔樉绀虹壒鏁坃________

--
Gitblit v1.8.0