请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs

@@ -12,7 +12,7 @@
        }
        #region ◆ 变量申明__________________________
        public FrameLayout topFrameLayout = new FrameLayout { Height = Application.GetRealHeight(184), BackgroundColor = ZigbeeColor.Current.XMTopFrameLayout };
        public FrameLayout midFrameLayout = new FrameLayout { Height = Application.GetRealHeight(1921 - 184), BackgroundColor = ZigbeeColor.Current.XMMidFrameLayout };
        public FrameLayout midFrameLayout = new FrameLayout { Height = Application.GetRealHeight(1925 - 184), BackgroundColor = ZigbeeColor.Current.XMMidFrameLayout };
        public FrameLayout bottomRadiusFrameLayout = new FrameLayout()
        {
            Height = Application.GetRealHeight(100),
@@ -25,7 +25,16 @@
            Y = Application.GetRealHeight(92),
            Height = Application.GetRealHeight(69),
        };

        public Button btnTitle = new Button
        {
            TextAlignment = TextAlignment.CenterLeft,
            TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
            X = Application.GetRealWidth(161),
            Width = Application.GetRealWidth(1080 - 161),
            Height = Application.GetRealWidth(69),
            IsBold = true,
            TextSize = 17,
        };
        public FrameLayout btnBackFrameLayout = new FrameLayout
        {
            X = Application.GetRealWidth(58),
@@ -35,8 +44,8 @@

        public Button btnBack = new Button
        {
            Height = Application.GetRealHeight(51),
            Width = Application.GetRealWidth(30),
            Height = Application.GetMinReal(51),
            Width = Application.GetMinReal(30),
            UnSelectedImagePath = "DoorLock/Left.png",
        };

@@ -57,17 +66,8 @@
            this.AddChidren(topFrameLayout);
            topFrameLayout.AddChidren(titleFrameLayout);
            topFrameLayout.AddChidren(btnTitleLine);
            var title = new Button()
            {
                TextAlignment = TextAlignment.CenterLeft,
                Text = titleText,
                TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
                X = Application.GetRealWidth(161),
                Width = Application.GetRealWidth(1080 - 161),
                Height = Application.GetRealWidth(69),
                TextSize = 17,
            };
            titleFrameLayout.AddChidren(title);
            titleFrameLayout.AddChidren(btnTitle);
            btnTitle.Text = titleText;
            titleFrameLayout.AddChidren(btnBackFrameLayout);
            btnBackFrameLayout.AddChidren(btnBack);
        }