合并了全部的代码

黄学彪

2019-11-18 4ce5177289b1d34e467de9d8790836559cc5a09e

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/ProgressFormBar.cs

@@ -72,14 +72,6 @@
        /// </summary>

        private void InitProgressFormBar()

        {

            var nowForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);

            if (nowForm == null || (nowForm is ViewGroup) == false)

            {

                //这种情况应该不存在

                var alert = new ShowMsgControl(ShowMsgType.Error, "ERROR:Not Found The ActionForm!");

                alert.Show();

                return;

            }

            //安卓可以点击系统的返回键

            this.oldScrollEnabled = UserView.HomePage.Instance.ScrollEnabled;

            UserView.HomePage.Instance.ScrollEnabled = false;

@@ -94,7 +86,7 @@
            //容器

            bodyFrameLayout = new FrameLayout();

            bodyFrameLayout.BackgroundColor = UserCenterColor.Current.DialogBackColor;

            ((ViewGroup)nowForm).AddChidren(bodyFrameLayout);

            Common.CommonPage.Instance.AddChidren(bodyFrameLayout);



            var frameBack = new FrameLayout();

            frameBack.Width = Application.GetRealWidth(674);