Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs

@@ -230,7 +230,7 @@
                //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>

@@ -240,7 +240,7 @@
        {

            var btnShadow = new PicViewControl(this.Width, Application.GetMinRealAverage(45), false);

            btnShadow.X = this.X;

            btnShadow.Y = this.Bottom - 1;

            btnShadow.Y = this.Bottom;

            btnShadow.UnSelectedImagePath = "Item/BottomShadow.png";

            this.Parent.AddChidren(btnShadow);

        }