From e1ac4ab0e68024e6289e0b11756962d662749b04 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 三月 2021 17:15:23 +0800
Subject: [PATCH] Revert "Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC"
---
HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs | 111 -------------------------------------------------------
1 files changed, 0 insertions(+), 111 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs b/HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs
index 31bdbe3..0f0e916 100644
--- a/HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs
@@ -287,117 +287,6 @@
#endregion
- #region 鈻� 娣诲姞鍒楄〃娑堟伅鏄剧ず鎺т欢_______________
-
- /// <summary>
- /// 娣诲姞鍒楄〃娑堟伅鏄剧ず鎺т欢,杩斿洖鐨勬槸鏈�鍚庝竴涓帶浠剁殑搴曢儴鍧愭爣
- /// </summary>
- /// <param name="frameTable">妗屽竷瀹瑰櫒鎺т欢</param>
- /// <param name="i_msg">鏄剧ず鐨勬秷鎭�(鎹㈣璇蜂娇鐢ㄣ�恵0}銆戣繘琛屽垎鍓�)</param>
- /// <param name="i_fontSize">瀛椾綋澶у皬</param>
- /// <param name="i_fontColor">瀛椾綋棰滆壊</param>
- /// <param name="i_height">鎺т欢楂樺害(鐪熷疄鍊�)</param>
- /// <param name="i_yy">Y杞村垵濮嬪潗鏍�(鐪熷疄鍊�)</param>
- /// <param name="alignment">鏂囧瓧瀵归綈鏂瑰紡</param>
- /// <param name="special">
- /// <para>娉細闄や簡鏂板缓杩欎釜鍑芥暟鐨勫紑鍙戣�呬互澶栵紝閮戒笉寤鸿鎶婅繖涓�间笉璁剧疆涓簍rue</para>
- /// <para>璇存槑锛氫互鏈�闀跨殑鎺т欢鐨刋杞翠负鍩哄噯,鎵�鏈夋帶浠剁殑X杞撮兘鍙樻垚涓�鑷�</para>
- /// </param>
- /// <returns></returns>
- public int AddListMsgControls(FrameLayout frameTable, string i_msg, int i_fontSize, uint i_fontColor, int i_height,
- int i_yy, TextAlignment alignment = TextAlignment.Center, bool special = false)
- {
- var listMsg = i_msg.Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
- int defultWidth = this.bodyFrameLayout.Width - HdlControlResourse.XXLeft * 2;
-
- var listContr = new List<NormalViewControl>();
- int minXX = 10086;//鎺т欢闆嗗悎鏈�灏忕殑X杞�
- foreach (var strMsg in listMsg)
- {
- //娑堟伅鏄剧ず鎺т欢
- var btnMsg = new NormalViewControl(defultWidth, i_height, false);
- btnMsg.Y = i_yy;
- btnMsg.Gravity = Gravity.CenterHorizontal;
- btnMsg.TextAlignment = alignment;
- btnMsg.TextColor = i_fontColor;
- btnMsg.TextSize = i_fontSize;
- btnMsg.Text = strMsg;
-
- //鐗规畩澶勭悊
- if (special == true && alignment == TextAlignment.Center)
- {
- //璁剧疆瀹冪殑鐪熷疄瀹藉害(瀵箂pecial鍙橀噺鏈夌敤)
- int realWidth = btnMsg.GetRealWidthByText();
- btnMsg.Width = realWidth > defultWidth ? defultWidth : realWidth;
- }
- frameTable.AddChidren(btnMsg);
-
- //鏀堕泦鎺т欢
- listContr.Add(btnMsg);
-
- //璁板綍鎺т欢闆嗗悎X杞存渶灏忕殑鍊�
- if (btnMsg.X < minXX) { minXX = btnMsg.X; }
-
- //涓よ涔嬮棿鐨勯棿璺濅负4
- i_yy = btnMsg.Bottom + Application.GetRealHeight(4);
- }
- //鐗规畩澶勭悊
- if (special == true && alignment == TextAlignment.Center)
- {
- foreach (var contr in listContr)
- {
- //浠ユ渶闀跨殑鎺т欢鐨刋杞翠负鍩哄噯,鎵�鏈夋帶浠剁殑X杞撮兘鍙樻垚涓�鑷�
- contr.X = minXX;
- }
- }
-
- return i_yy - Application.GetRealHeight(4);
- }
-
- #endregion
-
- #region 鈻� 娣诲姞搴曢儴鐐瑰嚮鎸夐挳鎺т欢_______________
-
- /// <summary>
- /// 娣诲姞搴曢儴鐐瑰嚮鎸夐挳鎺т欢
- /// </summary>
- /// <param name="i_text">鏄剧ず鐨勬枃鏈�</param>
- /// <returns></returns>
- public BottomClickButton AddBottomClickButton(string i_text)
- {
- //瀹瑰櫒鎺т欢
- var frameBack = new FrameLayout();
- frameBack.Height = Application.GetRealHeight(76);
- frameBack.Gravity = Gravity.BottomCenter;
- bodyFrameLayout.AddChidren(frameBack);
- //鐒跺悗鍦ㄩ《閮ㄦ坊鍔犱竴涓湁杈规鐨勪笢瑗�
- var frameLine = new FrameLayout();
- frameLine.Height = Application.GetRealHeight(50);
- frameLine.BorderWidth = 1;
- frameLine.BackgroundColor = UI.CSS.CSS_Color.MainBackgroundColor;
- frameLine.BorderColor = UI.CSS.CSS_Color.DividingLineColor;
- frameLine.SetCornerWithSameRadius(Application.GetRealHeight(24), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
- frameBack.AddChidren(frameLine);
- //鏈�鍚庡啀鏁翠釜鐧借壊鐨勪笢瑗块伄浣忓畠鐨勪笅閮�
- var frameWite = new FrameLayout();
- frameWite.Height = frameBack.Height - Application.GetRealHeight(24 - 10);//闇�瑕佽秴杩囧畠
- frameWite.Width = frameBack.Width + Application.GetRealWidth(6);
- frameWite.X = -Application.GetRealWidth(3);
- frameWite.Y = Application.GetRealHeight(24);
- frameWite.BackgroundColor = UI.CSS.CSS_Color.MainBackgroundColor;
- frameBack.AddChidren(frameWite);
-
- //鎸夐挳
- var btnOk = new BottomClickButton(220);
- btnOk.Gravity = Gravity.Center;
- btnOk.Text = i_text;
- frameBack.AddChidren(btnOk);
-
- return btnOk;
- }
-
- #endregion
-
#region 鈻� 涓�鑸殑鏂规硶_________________________
/// <summary>
--
Gitblit v1.8.0