合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

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

@@ -134,7 +134,7 @@
                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);

@@ -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);

        }