From 94e4e5b9fd3da964c44b7b14227d6fe2bbb426d7 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 02 四月 2020 13:56:39 +0800
Subject: [PATCH] 2020-04-02-2
---
ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
index 0f453b8..5b5bf36 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
@@ -313,8 +313,8 @@
var backgroundColor = new Button
{
- Width = Application.GetRealWidth(156),
- Height = Application.GetRealHeight(180),
+ Width = Application.GetMinRealAverage(156),
+ Height = Application.GetMinRealAverage(180),
X = Application.GetRealWidth(10),
UnSelectedImagePath = "ZigeeLogic/deviceunselectedbackgroundcolor.png",
SelectedImagePath = "ZigeeLogic/deviceselectedbackgroundcolor.png",
@@ -394,7 +394,7 @@
Height = Application.GetMinRealAverage(112),
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(30 + 9),
- // Radius = (uint)Application.GetRealHeight(56),
+ Radius = (uint)Application.GetMinRealAverage(56),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
deviceFramelayout.AddChidren(bjFramelayout);
@@ -411,8 +411,9 @@
Y = Application.GetRealHeight(30),
Width = Application.GetRealWidth(850),
Height = Application.GetRealHeight(130),
- X = Application.GetRealWidth(176 + 10),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+ X = Application.GetRealWidth(176 + 25),
+ //LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+ LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
};
deviceFramelayout.AddChidren(deviceRow);
var devicename = new Button
@@ -424,6 +425,16 @@
TextSize = 14,
};
deviceRow.AddChidren(devicename);
+
+ var lineBtn = new Button
+ {
+ Y = deviceFramelayout.Height-1,
+ Height = 1,
+ Width = Application.GetRealWidth(850),
+ X = Application.GetRealWidth(176 + 25),
+ BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+ };
+ deviceFramelayout.AddChidren(lineBtn);
EventHandler<MouseEventArgs> devicclick = (sen, e) =>
{
clickbutton.IsSelected = false;
--
Gitblit v1.8.0