Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -133,8 +133,8 @@
                }

                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出力

                    HdlLogLogic.Current.WriteLog(ex);

@@ -230,7 +230,7 @@
                //byteLength += Encoding.GetEncoding("gb2312").GetBytes(i_text[i].ToString()).Length;

            }

            int realWidth = byteLength * (int)textSize;

            return Application.GetRealWidth(realWidth + 20);

            return Application.GetRealWidth(realWidth);

        }



        /// <summary>