From 39eb1c016f49275bb8449fba9286619670f39a42 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 19 四月 2021 09:35:59 +0800
Subject: [PATCH] 合并温居城代码
---
HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs b/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs
index 86e2b4e..06422ea 100644
--- a/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs
@@ -53,19 +53,6 @@
return;
}
- /// <summary>
- /// 娣诲姞鎸囧畾鐢婚潰锛屽苟绉婚櫎褰撳墠鐢婚潰锛屽惎鍔ㄥ弬鏁扮敱鎸囧畾鐢婚潰鐨凷howForm鍑芥暟鎵�鎸囧畾
- /// </summary>
- /// <param name="form">鐩爣鐣岄潰</param>
- /// <param name="parameter">鍚姩鍙傛暟锛氬弬鏁扮敱鎸囧畾鐢婚潰鐨凷howForm鍑芥暟鎵�鎸囧畾</param>
- public void AddFormAndCloseNowForm(CommonFormBase form, params object[] parameter)
- {
- //绉婚櫎褰撳墠鐢婚潰
- this.CloseForm();
- //娣诲姞鐢婚潰
- form.AddForm(parameter);
- }
-
#endregion
#region 鈻� 鍏抽棴鐣岄潰___________________________
@@ -228,6 +215,24 @@
return Application.GetRealWidth(i_size);
}
+ /// <summary>
+ /// 鑾峰彇鍥剧墖閲岄潰,瀛愭帶浠舵枃鏈殑楂樺害
+ /// </summary>
+ /// <param name="i_height">楂樺害</param>
+ /// <returns></returns>
+ public int GetPicChidrenTextHeight(int i_height)
+ {
+ int value1 = Application.GetRealHeight(i_height);
+ int value2 = Application.GetRealWidth(i_height);
+ //褰撳搴︽瘮鐜囧ぇ浜庨珮搴︽椂锛岀敤瀹藉害
+ if (value2 > value1)
+ {
+ return value2;
+ }
+ //鍚﹀垯,鑰冭檻鍒版樉绀哄畬鍏ㄧ殑闂,闇�瑕佷娇鐢ㄩ珮搴︽瘮鐜�
+ return value1;
+ }
+
#endregion
#region 鈻� 鍙嶅皠鏂规硶___________________________
@@ -287,9 +292,11 @@
return myMethod.Invoke(form, parameter);
}
catch (Exception ex)
- {
- //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- HdlMessageLogic.Current.ShowAppProgramIsError(ex);
+ {
+#if DEBUG
+ //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
+ HdlMessageLogic.Current.ShowAppProgramIsError(ex);
+#endif
return null;
}
}
--
Gitblit v1.8.0