From 160785587667cc0d927f85e44c139ec9dde13a9e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 25 十一月 2019 14:30:13 +0800
Subject: [PATCH] 原来的 IOS 工程舍弃（注：没有合并其他组员的代码）
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs
index e67e3d1..bed3e57 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetySensorStatuControl.cs
@@ -35,8 +35,10 @@
public SafetySensorStatuControl()
{
this.Height = Application.GetRealHeight(256);
+ this.Width = Application.GetRealWidth(968);
+ this.Gravity = Gravity.CenterHorizontal;
this.BackgroundColor = UserCenterColor.Current.White;
- this.Radius = 6;
+ this.Radius = 8;
}
/// <summary>
@@ -48,7 +50,7 @@
//鍖哄煙
var btnArea = new NormalViewControl(400, 49, true);
btnArea.Y = Application.GetRealHeight(40);
- btnArea.X = Application.GetRealWidth(104);
+ btnArea.X = Application.GetRealWidth(46);
btnArea.TextSize = 12;
btnArea.TextColor = UserCenterColor.Current.TextGrayColor3;
btnArea.Text = Common.Room.CurrentRoom.GetRoomNameByDevice(device);
@@ -56,7 +58,7 @@
//鐘舵��
var btnStatu = new NormalViewControl(200, 49, true);
btnStatu.Y = btnArea.Y;
- btnStatu.X = this.Width - Application.GetRealWidth(200 + 101);
+ btnStatu.X = this.Width - Application.GetRealWidth(200 + 46);
btnStatu.TextSize = 12;
btnStatu.TextAlignment = TextAlignment.CenterRight;
btnStatu.TextColor = UserCenterColor.Current.TextGrayColor1;
@@ -65,18 +67,18 @@
//绾�
var btnLine = new NormalViewControl(Application.GetRealWidth(876), 2, false);
btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
- btnLine.X = Application.GetRealWidth(104);
+ btnLine.X = Application.GetRealWidth(46);
btnLine.Y = Application.GetRealHeight(104);
this.AddChidren(btnLine);
//璁惧鍚嶇О
var btnDeviceName = new NormalViewControl(400, 58, true);
- btnDeviceName.X = Application.GetRealWidth(104);
+ btnDeviceName.X = Application.GetRealWidth(46);
btnDeviceName.Y = Application.GetRealHeight(141);
btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device);
this.AddChidren(btnDeviceName);
//鍦ㄧ嚎鐘舵��
btnOnline = new NormalViewControl(200, 58, true);
- btnOnline.X = this.Width - Application.GetRealWidth(200 + 101);
+ btnOnline.X = this.Width - Application.GetRealWidth(200 + 46);
btnOnline.Y = btnDeviceName.Y;
btnOnline.TextAlignment = TextAlignment.CenterRight;
this.SetOnlineStatu(device.IsOnline == 1);
@@ -124,7 +126,7 @@
{
//鍥炬爣
btnMsgIcon = new IconViewControl(58);
- btnMsgIcon.X = Application.GetRealWidth(922);
+ btnMsgIcon.X = Application.GetRealWidth(864);
btnMsgIcon.Y = Application.GetRealHeight(141);
btnMsgIcon.UnSelectedImagePath = "Item/Tips.png";
this.AddChidren(btnMsgIcon);
@@ -132,7 +134,7 @@
btnMsg = new NormalViewControl(400, 58, true);
btnMsg.TextAlignment = TextAlignment.CenterRight;
btnMsg.TextColor = 0xfff34747;
- btnMsg.X = Application.GetRealWidth(910 - 400);
+ btnMsg.X = this.Width - Application.GetRealWidth(400 + 115);
btnMsg.Y = Application.GetRealHeight(141);
this.AddChidren(btnMsg);
}
--
Gitblit v1.8.0