Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -38,7 +38,7 @@
            this.Width = Application.GetRealWidth(968);

            this.Gravity = Gravity.CenterHorizontal;

            this.BackgroundColor = UserCenterColor.Current.White;

            this.Radius = 8;

            this.Radius = (uint)Application.GetRealHeight(17);

        }



        /// <summary>

@@ -65,7 +65,7 @@
            btnStatu.TextID = R.MyInternationalizationString.uStatu;

            this.AddChidren(btnStatu);

            //线

            var btnLine = new NormalViewControl(Application.GetRealWidth(876), 2, false);

            var btnLine = new NormalViewControl(Application.GetRealWidth(876), ControlCommonResourse.BottomLineHeight, false);

            btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;

            btnLine.X = Application.GetRealWidth(46);

            btnLine.Y = Application.GetRealHeight(104);