From 3aa397ab145382935492b11c1f18c9634e69910b Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 10 十二月 2020 16:45:00 +0800
Subject: [PATCH] 请合并，门锁和晾衣架第一版代码
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
index 7f5192c..ea700d3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
@@ -78,12 +78,23 @@
frameLayoutDraw.Height = frameBack.Height - Application.GetRealHeight(181);
frameBack.AddChidren(frameLayoutDraw);
+ //璁＄畻瀹藉害浣跨敤
+ var btnTemp = new ButtonBase();
+ btnTemp.TextSize = 16;
+ btnTemp.IsBold = true;
+
+ btnTemp.TextID = R.MyInternationalizationString.uSecurityLog;
+ int frameLogWidth = btnTemp.GetRealWidthByText() + Application.GetRealWidth(30);
+
+ btnTemp.TextID = R.MyInternationalizationString.uSensorStatu;
+ int frameSensorWidth = btnTemp.GetRealWidthByText() + Application.GetRealWidth(30);
+
//瀹夐槻璁板綍(鐐瑰嚮鑼冨洿鏈夌偣灏忥紝闇�瑕佹墿澶у畠鐨勭偣鍑昏寖鍥�)
var frameLog = new FrameLayoutStatuControl();
frameLog.UseClickStatu = false;
frameLog.Height = Application.GetRealHeight(123);
- frameLog.Width = Application.GetRealWidth(273);
- frameLog.X = Application.GetRealWidth(259);
+ frameLog.Width = frameLogWidth;
+ frameLog.X = (frameBack.Width - frameLogWidth - frameSensorWidth) / 2;
frameLog.Y = Application.GetRealHeight(58);
frameBack.AddChidren(frameLog);
//鏍囬
@@ -96,7 +107,8 @@
//搴曠嚎
var btnLogLine = new NormalViewControl(40, 10, true);
btnLogLine.Y = Application.GetRealHeight(86);
- btnLogLine.X = btnLog.X + btnLog.Width / 2 - Application.GetRealWidth(40) / 2;
+ //btnLogLine.X = btnLog.X + btnLog.Width / 2 - Application.GetRealWidth(40) / 2;
+ btnLogLine.Gravity = Gravity.CenterHorizontal;
btnLogLine.Radius = (uint)Application.GetRealHeight(10) / 2;
btnLogLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
frameLog.AddChidren(btnLogLine, ChidrenBindMode.BindEvent);
@@ -106,7 +118,7 @@
var frameSensor = new FrameLayoutStatuControl();
frameSensor.UseClickStatu = false;
frameSensor.Height = frameLog.Height;
- frameSensor.Width = frameLog.Width;
+ frameSensor.Width = frameSensorWidth;
frameSensor.X = frameLog.Right;
frameSensor.Y = frameLog.Y;
frameBack.AddChidren(frameSensor);
@@ -123,7 +135,8 @@
var btnSensorLine = new NormalViewControl(40, 10, true);
btnSensorLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnSensorLine.Y = btnLogLine.Y;
- btnSensorLine.X = btnSensor.X + btnSensor.Width / 2 - Application.GetRealWidth(40) / 2;
+ //btnSensorLine.X = btnSensor.X + btnSensor.Width / 2 - Application.GetRealWidth(40) / 2;
+ btnSensorLine.Gravity = Gravity.CenterHorizontal;
btnSensorLine.Radius = (uint)Application.GetRealHeight(10) / 2;
frameSensor.AddChidren(btnSensorLine, ChidrenBindMode.BindEvent);
--
Gitblit v1.8.0