From 5da99fed2eb0d08b6338064da5f998891252c7b8 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 16:39:59 +0800
Subject: [PATCH] 2020-05-18-2
---
ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
index 0f453b8..a6cf276 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
@@ -52,7 +52,7 @@
{
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(184 + 200 + 280 + 40),
- Height = Application.GetRealHeight(1920 - 40 - 184 - 280 - 200),
+ Height = Application.GetRealHeight(Method.H - 40 - 184 - 280 - 200),
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
};
@@ -245,7 +245,7 @@
};
fra.AddChidren(roomnameBtn);
- if (i == 0)//
+ if (i == 0)//榛樿閫変腑绗竴涓埧闂�
{
roombjButton.IsSelected = false;
roombjButton = roombjBtn;
@@ -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",
@@ -343,7 +343,17 @@
TextSize = 10,
};
deviceRowLayout.AddChidren(devicetypename);
-
+
+
+ //if (i == 0)//榛樿閫変腑绗竴涓澶囩被鍨�
+ //{
+ // devicetypeButton.IsSelected = false;
+ // devicetypeButton = backgroundColor;
+ // backgroundColor.IsSelected = true;
+ // var list = Method.GetDeviceType(devicetypename.Text);
+ // ConditionDeviceView(list, devicelist);
+ //}
+
EventHandler<MouseEventArgs> devicetypeclick = (sender13, e13) =>
{
devicetypeButton.IsSelected = false;
@@ -360,6 +370,7 @@
}
///鏄剧ず鎴块棿鎵�鏈夎澶�
ConditionDeviceView(new List<DeviceType>(), devicelist);
+
}
/// <summary>
@@ -394,7 +405,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 +422,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 +436,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