Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

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

@@ -25,7 +25,15 @@
            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),
            TextSize = 17,
        };
        public FrameLayout btnBackFrameLayout = new FrameLayout
        {
            X = Application.GetRealWidth(58),
@@ -57,17 +65,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);
        }