合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

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

@@ -282,9 +282,7 @@
                            this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost));



                            //Log出力

                            string errorMsg = ex.Message + "\r\n";

                            errorMsg += ex.TargetSite.ToString();

                            HdlLogLogic.Current.WriteLog(-1, errorMsg);

                            HdlLogLogic.Current.WriteLog(ex);

                        }

                        action = null;

                    };

@@ -378,9 +376,7 @@
                this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnknownErrorAndDataLost));



                //Log出力

                string msg = ex.Message + "\r\n";

                msg += ex.TargetSite.ToString();

                HdlLogLogic.Current.WriteLog(-1, msg);

                HdlLogLogic.Current.WriteLog(ex);



                return null;

            }
@@ -398,19 +394,6 @@
            form.AddForm(parameter);

        }



        #endregion



        #region ■ 界面重新激活事件___________________


        /// <summary>

        /// <para>自身的上层界面关闭后,它自身处于最上层时,触发的事件</para>

        /// <para>重写的时候返回值请返回1(返回值是给底层使用的)</para>

        /// </summary>
        public virtual int FormActionAgainEvent()

        {

            return -1;

        }

        #endregion

    }

}