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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -53,7 +53,7 @@
        {

            this.frameTable = new FrameLayout();

            frameTable.Gravity = Gravity.CenterHorizontal;

            frameTable.Radius = 8;

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

            frameTable.Height= Application.GetRealHeight(260);

            frameTable.Width = Application.GetRealWidth(968);

            frameTable.BackgroundColor = UserCenterColor.Current.White;

@@ -136,7 +136,7 @@
                this.frameTable.AddChidren(btnMsg);

            }

            //添加底部阴影特效

            this.btnTime.AddBottomShadow(this.frameTable);

            this.frameTable.SetViewShadow(true);

        }



        #endregion

@@ -272,7 +272,7 @@
                this.Height = realHeight + Application.GetRealHeight(44);

            }

            //添加底部阴影特效

            this.btnTime.AddBottomShadow(this.frameTable);

            this.frameTable.SetViewShadow(true);



            return value;

        }

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