代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -90,11 +90,15 @@
                //圆形进度条临时关闭

                Common.CommonPage.Loading.Hide();

            }



            //容器

            bodyFrameLayout = new FrameLayout();

            bodyFrameLayout.BackgroundColor = UserCenterColor.Current.DialogBackColor;

            Common.CommonPage.Instance.AddChidren(bodyFrameLayout);



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

            if (nowForm != null && (nowForm is ViewGroup) == true)

            {

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

            }



            var frameBack = new FrameLayout();

            frameBack.Width = Application.GetRealWidth(674);