合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

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

@@ -325,8 +325,8 @@
            }

            rowFrame.AddChidren(btnMsg);

            //时间：时分秒

            var btnTime = new NormalViewControl(176, 58, true);

            btnTime.X = Application.GetRealWidth(772);

            var btnTime = new NormalViewControl(190, 58, true);

            btnTime.X = Application.GetRealWidth(758);

            btnTime.TextColor = UserCenterColor.Current.TextGrayColor3;

            btnTime.TextAlignment = TextAlignment.CenterRight;

            btnTime.Text = alarmInfo.Time;