Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

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

@@ -368,7 +368,9 @@
                {

                    return null;

                }

                return form.GetType().InvokeMember(method, System.Reflection.BindingFlags.InvokeMethod, null, form, parameter);

                var myMethod = form.GetType().GetMethod(method);

                return myMethod.Invoke(form, parameter);

                //return form.GetType().InvokeMember(method, System.Reflection.BindingFlags.InvokeMethod, null, form, parameter);

            }
            catch (Exception ex)
            {

@@ -392,19 +394,6 @@
            System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();

            var form = (CommonFormBase)assembly.CreateInstance(fullName);

            form.AddForm(parameter);

        }



        #endregion



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


        /// <summary>

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

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

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

        {

            return -1;

        }

        #endregion