请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -93,12 +93,12 @@
            //容器

            bodyFrameLayout = new FrameLayout();

            bodyFrameLayout.BackgroundColor = UserCenterColor.Current.DialogBackColor;



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

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

            {

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

            }

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