From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs
index c30210e..bab9c6a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutControl.cs
@@ -24,6 +24,10 @@
         /// </summary>
         public bool UseClickStatu = true;
         /// <summary>
+        /// 鑳藉惁鐐瑰嚮
+        /// </summary>
+        public bool CanClick = true;
+        /// <summary>
         /// 鍘熸潵鐨勮儗鏅壊
         /// </summary>
         private uint oldBackColor = 0;
@@ -35,16 +39,12 @@
         /// 瀛愭帶浠禮杞村亸绉婚噺(鍏遍�氬畾涔夎�屽凡)
         /// </summary>
         public int chidrenYaxis = 0;
-
         /// <summary>
-        /// 鍦嗚搴�(瀹夊崜鍜孖OS鎴栬闇�瑕侀缂栬瘧)
+        /// 鍦嗚搴�
         /// </summary>
-        public uint RadiusEx
+        public int RadiusEx
         {
-            set
-            {
-                this.Radius = value;
-            }
+            set { this.Radius = (uint)Application.GetRealHeight(value); }
         }
 
         #endregion
@@ -61,14 +61,6 @@
 
             this.MouseUpEventHandler += ChildrenUpEvent;
             this.MouseDownEventHandler += ChildrenDownEvent;
-        }
-
-        /// <summary>
-        /// 鍋氭垚涓�涓櫘閫氱殑FrameLayout鎺т欢
-        /// </summary>
-        /// <param name="flage">娌″暐鐢ㄧ殑涓滆タ</param>
-        public FrameLayoutControl(bool flage)
-        {
         }
 
         #endregion
@@ -215,7 +207,7 @@
         /// <param name="e">E.</param>
         private void ChildrenDownEvent(object sender, MouseEventArgs e)
         {
-            if (this.UseClickStatu == false)
+            if (this.UseClickStatu == false|| this.CanClick == false)
             {
                 return;
             }
@@ -229,6 +221,11 @@
         /// <param name="e">E.</param>
         private void ChildrenUpEvent(object sender, MouseEventArgs e)
         {
+            if (this.CanClick == false)
+            {
+                //涓嶅厑璁哥偣鍑�
+                return;
+            }
             if (sender is FrameLayoutControl)
             {
                 //LOG鍑哄姏

--
Gitblit v1.8.0