From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs
index 4e3a521..1ec9341 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs
+++ b/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;
--
Gitblit v1.8.0