合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

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

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