合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

 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>