From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs | 106 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 85 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
index 4319b59..6c3fb2b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
@@ -35,6 +35,14 @@
/// 鎺т欢鐨勭偣鍑讳簨浠�(姝や簨浠惰璁ゅ彲涓烘墽琛屾寜閽寜涓嬩簨浠讹紝鍙桟anClick灞炴�ф帶鍒�)
/// </summary>
public Action<Button, MouseEventArgs> ButtonClickEvent = null;
+ /// <summary>
+ /// 搴曢儴闃村奖鎺т欢1
+ /// </summary>
+ private Button btnBottomShadowView1 = null;
+ /// <summary>
+ /// 搴曢儴闃村奖鎺т欢2
+ /// </summary>
+ private Button btnBottomShadowView2 = null;
#endregion
@@ -133,13 +141,11 @@
}
catch (Exception ex)
{
- //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost));
+ //鍑虹幇鏈煡閿欒
+ var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
alert.Show();
//Log鍑哄姏
- string msg = ex.Message + "\r\n";
- msg += ex.TargetSite.ToString();
- HdlLogLogic.Current.WriteLog(-1, msg);
+ HdlLogLogic.Current.WriteLog(ex);
}
}
}
@@ -220,30 +226,88 @@
int byteLength = 0;
for (int i = 0; i < i_text.Length; i++)
{
- int length = Encoding.UTF8.GetBytes(i_text[i].ToString()).Length;
- if (length == 1)
- {
- //鑻辨枃
- byteLength += length;
- continue;
- }
- //涓枃(鏆傛椂鐢ㄤ腑鏂囧搴�)
- byteLength += Encoding.GetEncoding("gb2312").GetBytes(i_text[i].ToString()).Length;
+ byteLength += Encoding.UTF8.GetBytes(i_text[i].ToString()).Length;
+ //int length = Encoding.UTF8.GetBytes(i_text[i].ToString()).Length;
+ //if (length == 1)
+ //{
+ // //鑻辨枃
+ // byteLength += length;
+ // continue;
+ //}
+ ////涓枃(鏆傛椂鐢ㄤ腑鏂囧搴�)
+ //byteLength += Encoding.GetEncoding("gb2312").GetBytes(i_text[i].ToString()).Length;
}
int realWidth = byteLength * (int)textSize;
- return Application.GetRealWidth(realWidth);
+ return Application.GetRealWidth(realWidth + 20);
}
/// <summary>
/// 娣诲姞搴曢儴闃村奖鐗规晥(纭繚鎷ユ湁鐖舵帶浠跺悗鎵嶈皟鐢�)
/// </summary>
- public void AddBottomShadow()
+ /// <param name="view">涓哄摢涓帶浠舵坊鍔犻槾褰辩壒鏁�,鐪佺暐鏃�,涓哄綋鍓嶆帶浠舵坊鍔�</param>
+ /// <param name="average">娣诲姞鐨勯槾褰辩壒鏁堟槸鍚︽寜骞冲潎鍊艰缃珮瀹藉害</param>
+ public void AddBottomShadow(View view = null, bool average = false)
{
- var btnShadow = new PicViewControl(this.Width, Application.GetMinRealAverage(45), false);
- btnShadow.X = this.X;
- btnShadow.Y = this.Bottom - 1;
- btnShadow.UnSelectedImagePath = "Item/BottomShadow.png";
- this.Parent.AddChidren(btnShadow);
+ //闇�瑕佹墿澶х殑楂樺害
+ int heightValue = 21;
+ //闇�瑕佹墿澶х殑瀹藉害
+ int widthValue = 15;
+ //鏈�澶ч珮搴�
+ int maxHeight = 0;
+ if (average == false)
+ {
+ heightValue = Application.GetRealHeight(heightValue);
+ widthValue = Application.GetRealWidth(widthValue);
+ maxHeight = Application.GetRealHeight(460);
+ }
+ else
+ {
+ heightValue = Application.GetMinRealAverage(heightValue);
+ widthValue = Application.GetMinRealAverage(widthValue);
+ maxHeight = Application.GetMinRealAverage(460);
+ }
+ if (view == null)
+ {
+ //鐪佺暐鏃�,鎸囧畾涓哄綋鍓嶆帶浠�
+ view = this;
+ }
+ //鍏堢Щ闄�
+ this.btnBottomShadowView1?.RemoveFromParent();
+ this.btnBottomShadowView2?.RemoveFromParent();
+
+ int realHeight = view.Height + heightValue * 2;
+ if (realHeight <= maxHeight)
+ {
+ //闃村奖鎺т欢
+ this.btnBottomShadowView1 = new Button();
+ btnBottomShadowView1.UnSelectedImagePath = "Item/BottomShadow.png";
+ btnBottomShadowView1.Height = realHeight;
+ btnBottomShadowView1.Width = view.Width + widthValue * 2;
+ btnBottomShadowView1.X = view.X - widthValue;
+ btnBottomShadowView1.Y = view.Y;
+ view.Parent.AddChidren(btnBottomShadowView1);
+ view.BringToFront();
+ }
+ else
+ {
+ //瓒呰繃鏈�澶ф椂,鐗规畩澶勭悊
+ this.btnBottomShadowView1 = new Button();
+ btnBottomShadowView1.UnSelectedImagePath = "Item/BottomShadow.png";
+ btnBottomShadowView1.Height = view.Height - heightValue * 2;
+ btnBottomShadowView1.Width = view.Width + widthValue * 2;
+ btnBottomShadowView1.X = view.X - widthValue;
+ btnBottomShadowView1.Y = view.Y + heightValue * 2;
+ view.Parent.AddChidren(btnBottomShadowView1);
+
+ this.btnBottomShadowView2 = new Button();
+ btnBottomShadowView2.UnSelectedImagePath = "Item/BottomShadow.png";
+ btnBottomShadowView2.Height = maxHeight;
+ btnBottomShadowView2.Width = view.Width + widthValue * 2;
+ btnBottomShadowView2.X = view.X - widthValue;
+ btnBottomShadowView2.Y = view.Bottom - maxHeight + heightValue * 2;
+ view.Parent.AddChidren(btnBottomShadowView2);
+ view.BringToFront();
+ }
}
#endregion
--
Gitblit v1.8.0