From 0ab9960587ececb5d3e13e7fb062e2f67308f9e7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:33:03 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android,没调用拒接接口问题。

---
 HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs |   91 ++++++++++++++++++++++++++++++---------------
 1 files changed, 61 insertions(+), 30 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..11911e0 100644
--- a/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs
@@ -16,7 +16,26 @@
         /// <summary>
         /// 鐢婚潰鐨処D(鑷姩缂栧彿,鍞竴涓婚敭,鍜屽悇椤甸潰骞舵棤浠讳綍閫昏緫鍏崇郴,浣嗘槸瀹冪殑鐢ㄥ澶х潃鍛�)
         /// </summary>
-        public string FormID = string.Empty;
+        public string FormID = string.Empty;
+        /// <summary>
+        /// 宸︽粦浣胯兘
+        /// </summary>
+        private bool m_ScrollLeftEnabled = true;
+        /// <summary>
+        /// 宸︽粦浣胯兘(鐣岄潰鍏抽棴鏃�,搴曞眰浼氳繕鍘�,鏃犻渶鍐嶅鐞�)
+        /// </summary>
+        public bool ScrollLeftEnabled
+        {
+            get { return m_ScrollLeftEnabled; }
+            set
+            {
+                if (MainPage.BasePageView.ScrollEnabled != value)
+                {
+                    MainPage.BasePageView.ScrollEnabled = value;
+                    this.m_ScrollLeftEnabled = value;
+                }
+            }
+        }
 
         #endregion
 
@@ -51,19 +70,6 @@
         public virtual void AddForm(params object[] parameter)
         {
             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
@@ -195,19 +201,6 @@
         #endregion
 
         #region 鈻� 涓�鑸殑鏂规硶_________________________
-
-        /// <summary>
-        /// 鏄剧ず淇℃伅妗�
-        /// </summary>
-        /// <param name="msgType">淇℃伅绫诲瀷</param>
-        /// <param name="msg">淇℃伅</param>
-        /// <param name="action">鍗曞嚮纭鍚庢墽琛岀殑鍥炶皟鍑芥暟</param>
-        /// <param name="buttonText">鎸夐挳鐨勬枃鏈�</param>
-        /// <param name="i_waitTime">绛夊緟鏃堕棿,鍗曚綅涓虹,璁剧疆纭鎸夐挳鍦ㄥ闀挎椂闂村悗鎵嶈兘澶熺偣鍑�</param>
-        public void ShowMassage(ShowMsgType msgType, string msg, Action action = null, string buttonText = null, int i_waitTime = -1)
-        {
-            HdlMessageLogic.Current.ShowMassage(msgType, msg, action, buttonText, i_waitTime);
-        }
 
         /// <summary>
         /// 鍒ゆ柇褰撳墠姝e湪娲诲姩鐨勭晫闈㈡槸鍚︽槸褰撳墠杩欎釜鐣岄潰
@@ -226,6 +219,42 @@
         public int GetPictrueRealSize(int i_size)
         {
             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;
+        }
+
+        /// <summary>
+        /// 鑾峰彇鏂囨湰鐨勭湡瀹炲搴�
+        /// </summary>
+        /// <param name="i_text">闇�瑕佽绠楃殑鏂囨湰</param>
+        /// <param name="i_size">瀛椾綋澶у皬</param>
+        /// <param name="i_isBold">鏄惁鏄矖浣�</param>
+        /// <returns></returns>
+        public int GetTextRealWidth(string i_text, int i_size, bool i_isBold = false)
+        {
+            //瀹氫箟涓�涓复鏃剁殑鎺т欢
+            var btnTemp = new ButtonCtrBase();
+            btnTemp.TextSize = i_size;
+            btnTemp.IsBold = i_isBold;
+            btnTemp.Text = i_text;
+
+            return btnTemp.GetRealWidthByText();
         }
 
         #endregion
@@ -287,9 +316,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