合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/Base/CommonFormBase.cs

@@ -210,10 +210,10 @@
        {

        }



        #endregion
        #endregion



        #region ■ 一般的方法_________________________



        /// <summary>

        /// 显示信息框

        /// </summary>

@@ -243,7 +243,7 @@
                        catch (Exception ex)

                        {

                            //出现未知错误,数据丢失

                            this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost));

                            this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));



                            //Log出力

                            HdlLogLogic.Current.WriteLog(ex);

@@ -338,11 +338,9 @@
            catch (Exception ex)
            {

                //出现未知错误,数据丢失

                this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost));



                this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));

                //Log出力

                HdlLogLogic.Current.WriteLog(ex);



                return null;

            }
        }