From 71c7ad13169695913282962a460858e13b6c0969 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 29 十二月 2020 14:33:49 +0800
Subject: [PATCH] 2020-12-29-1
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/SelectedDeviceView.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/SelectedDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/SelectedDeviceView.cs
index 99849fd..b960e83 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/SelectedDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/SelectedDeviceView.cs
@@ -17,8 +17,8 @@
/// </summary>
public Button iconBtn = new Button
{
- Width = Application.GetMinRealAverage(81),
- Height = Application.GetMinRealAverage(81),
+ Width = Application.GetRealWidth(81),
+ Height = Application.GetRealWidth(81),
X = Application.GetRealWidth(104),
Y = Application.GetRealHeight(25),
// UnSelectedImagePath = "ZigeeLogic/time.png",
@@ -50,7 +50,7 @@
/// </summary>
public Button deviceNameBtn = new Button
{
- Y = Application.GetRealHeight(20),
+ Y = Application.GetRealHeight(18),
Height = Application.GetRealHeight(50),
Width = Application.GetRealWidth(400),
TextAlignment = TextAlignment.CenterLeft,
@@ -64,7 +64,7 @@
/// </summary>
public Button regionNameBtn = new Button
{
- Y = Application.GetRealHeight(10 + 70),
+ Y = Application.GetRealHeight(6+ 70),
Width = Application.GetRealWidth(400),
TextAlignment = TextAlignment.CenterLeft,
Height = Application.GetRealHeight(50),
@@ -89,8 +89,9 @@
public Button lineBtn = new Button
{
Width = Application.GetRealWidth(800),
- Y=Application.GetRealHeight(130-5),
- Height =Application.GetRealHeight(5),
+ // Y=Application.GetRealHeight(130-5),
+ Height =1,//Application.GetRealHeight(5),
+ X = Application.GetRealWidth(222),
BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
};
@@ -122,8 +123,8 @@
stateRow.AddChidren(regionNameBtn);
stateRow.AddChidren(ordinaryBtn);
stateRow.AddChidren(selecetddevicestateBtn);
- // lineBtn.Y = stateRow.Height - 1;
- stateRow.AddChidren(lineBtn);
+ lineBtn.Y = selecetdFrameLayout.Height - 1;
+ selecetdFrameLayout.AddChidren(lineBtn);
}
}
--
Gitblit v1.8.0