全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

@@ -72,27 +72,50 @@
        #region ■ 关闭界面___________________________



        /// <summary>

        /// 画面关闭之前(底层变更,不能重载CloseForm方法了)

        /// </summary>

        public virtual void CloseFormBefore()

        {

        }



        /// <summary>

        /// 画面关闭之后(新增)

        /// </summary>

        public virtual void CloseFormAfter()

        {

        }



        /// <summary>

        /// 画面关闭

        /// </summary>
        public virtual void CloseForm()
        {

            //Log出力

            HdlLogLogic.Current.WriteLog(1, this.FormID + " 界面关闭");

            try

            {

                //移除接受在线状态推送

                this.RemoveGatewayOnlinePush();

                //移除设备属性变更推送

                this.RemoveDeviceAttributePush();



            //移除接受在线状态推送

            this.RemoveGatewayOnlinePush();

            //移除设备属性变更推送

            this.RemoveDeviceAttributePush();

                //关闭进度条

                this.CloseProgressBar();



            //关闭进度条

            this.CloseProgressBar();

                //调用的是Base的移除控件函数

                //而不是调用this的移除控件函

                base.RemoveFromParent();



            //调用的是Base的移除控件函数

            //而不是调用this的移除控件函
            base.RemoveFromParent();



            //从列表中移除(防止画面二重添加)

            UserCenterLogic.RemoveActionForm(this);

                //从列表中移除(防止画面二重添加)

                UserCenterLogic.RemoveActionForm(this);

            }

            catch (Exception ex)

            {

                //出现未知错误

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

                //Log出力

                HdlLogLogic.Current.WriteLog(ex);

            }

        }

        /// <summary>
@@ -370,7 +393,6 @@
                }

                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)
            {