From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。

---
 ZigbeeApp/Shared/Phone/CommonForm/DialogCommonForm.cs |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/CommonForm/DialogCommonForm.cs b/ZigbeeApp/Shared/Phone/CommonForm/DialogCommonForm.cs
index 6a2f0d2..05bff9a 100755
--- a/ZigbeeApp/Shared/Phone/CommonForm/DialogCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/CommonForm/DialogCommonForm.cs
@@ -21,6 +21,10 @@
         /// </summary>
         public bool CloseFormByClickBack = true;
         /// <summary>
+        /// 璋冪敤AddForm鍑芥暟鏃�,鏄惁鑷姩璋冪敤ShowForm鍑芥暟,,榛樿鑷姩璋冪敤
+        /// </summary>
+        public bool AutoLoadShowFormMethord = true;
+        /// <summary>
         /// 鍘熸潵鐨勬粦鍔ㄦ爣璇�
         /// </summary>
         private bool oldScrollEnabled = false;
@@ -43,14 +47,14 @@
             bodyFrameLayout.BackgroundColor = UserCenterColor.Current.DialogBackColor;
             this.AddChidren(bodyFrameLayout);
 
-            if (CloseFormByClickBack == true)
+            bodyFrameLayout.MouseUpEventHandler += (sender, e) =>
             {
-                bodyFrameLayout.MouseUpEventHandler += (sender, e) =>
+                if (CloseFormByClickBack == true)
                 {
                     //鍏抽棴鑷韩
                     this.CloseForm();
-                };
-            }
+                }
+            };
         }
 
         #endregion
@@ -82,8 +86,11 @@
             //鍒濆鍖栫晫闈㈡鏋�
             this.InitForm();
 
-            //鎵цShowForm()鏂规硶
-            this.LoadShowFormMethod(parameter);
+            if (this.AutoLoadShowFormMethord == true)
+            {
+                //鎵цShowForm()鏂规硶
+                this.LoadShowFormMethod(parameter);
+            }
         }
 
         #endregion

--
Gitblit v1.8.0