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/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameCaptionInputControl.cs |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameCaptionInputControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameCaptionInputControl.cs
index 7ae3ee6..5de7ea0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameCaptionInputControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameCaptionInputControl.cs
@@ -22,7 +22,7 @@
         /// <summary>
         /// 杈撳叆妗嗘帶浠�(鍙栧�兼垨鑰呰幏鍙栧�煎彲浠ヤ娇鐢ㄣ�怲ext銆戝睘鎬�,铏界劧杩欎釜涔熷彲浠ュ彇)
         /// </summary>
-        public TextInputExControl txtInput = null;
+        public TextInputControl txtInput = null;
         /// <summary>
         /// 鏍囬鎺т欢
         /// </summary>
@@ -37,7 +37,7 @@
         /// </summary>
         /// <param name="i_caption">鏍囬鏂囨湰</param>
         /// <param name="i_text">杈撳叆妗嗙殑鍊�</param>
-        /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param>
+        /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
         public FrameCaptionInputControl(string i_caption, string i_text, int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
         {
             this.UseClickStatu = false;
@@ -47,7 +47,8 @@
             btnCaption.Gravity = Gravity.CenterVertical;
             btnCaption.Text = i_caption + "锛�";
 
-            txtInput = new TextInputExControl(700, true);
+            txtInput = new TextInputControl(700, true);
+            txtInput.UseFocusColor = true;
             txtInput.X = Application.GetRealWidth(294);
             txtInput.Gravity = Gravity.CenterVertical;
             txtInput.Text = i_text;
@@ -71,5 +72,22 @@
         }
 
         #endregion
+
+        #region 鈻� 娣诲姞搴曠嚎___________________________
+
+        /// <summary>
+        /// <para>娣诲姞搴曠嚎(濡傛灉宸﹁竟鏈夊浘鏍囷紝鍒欏厛娣诲姞鍥炬爣锛屽啀娣诲姞搴曠嚎)</para>
+        /// <para>瀹冪殑闀垮害涓猴細褰撳墠鎺т欢瀹藉害-宸﹀彸鍥哄畾闂磋窛-宸﹁竟鍥剧墖瀹藉害(濡傛灉鏈�)-鍙宠竟鐨勫亸绉婚噺</para>
+        /// </summary>
+        public override NormalViewControl AddBottomLine()
+        {
+            var btnLine = base.AddBottomLine();
+            //鑱斿姩绾跨殑鐘舵��
+            txtInput.btnLine = btnLine;
+
+            return btnLine;
+        }
+
+        #endregion
     }
 }

--
Gitblit v1.8.0