From 81307af66465a6b5ba189b0fb9b347787f004a4e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 30 十二月 2020 16:14:15 +0800
Subject: [PATCH] 2020-12-30-1
---
ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
index 8bfa320..992f447 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
@@ -139,7 +139,7 @@
{
Width = Application.GetRealWidth(450),
- Height = Application.GetRealHeight(780),
+ Height = Application.GetRealWidth(780),
X = Application.GetRealWidth(1080 - 468 - 35),
Y = Application.GetRealHeight(184),
BackgroundImagePath = "Item/SelectFloor_Right.png",
@@ -179,8 +179,8 @@
var btnfoolricon = new Button
{
- Width = Application.GetMinRealAverage(81),
- Height = Application.GetMinRealAverage(81),
+ Width = Application.GetRealWidth(81),
+ Height = Application.GetRealWidth(81),
UnSelectedImagePath = "Floor/Floor.png",
Gravity = Gravity.CenterVertical,
};
@@ -264,7 +264,7 @@
roomTextButton = roomClickView.roomnameBtn;
roomClickView.roomnameBtn.IsSelected = true;
- var list = Method.GetDeviceUIList(room, deviceTypeList);
+ var list = Method.GetDeviceUIList(room, deviceTypeList, IfType);
AllDeviceTypeView(list);
}
@@ -297,7 +297,7 @@
roomTextButton = roomClickView.roomnameBtn;
roomClickView.roomnameBtn.IsSelected = true;
- var list = Method.GetDeviceUIList(room, deviceTypeList);
+ var list = Method.GetDeviceUIList(room, deviceTypeList, IfType);
AllDeviceTypeView(list);
};
roomClickView.roomnameBtn.MouseUpEventHandler += roomclick;
@@ -335,8 +335,8 @@
var backgroundColor = new Button
{
- Width = Application.GetMinRealAverage(150),
- Height = Application.GetMinRealAverage(173),
+ Width = Application.GetRealWidth(150),
+ Height = Application.GetRealWidth(173),
UnSelectedImagePath = "ZigeeLogic/deviceunselectedbackgroundcolor.png",
SelectedImagePath = "ZigeeLogic/deviceselectedbackgroundcolor.png",
};
@@ -345,8 +345,8 @@
var devicetypeicon = new Button
{
- Width = Application.GetMinRealAverage(84),
- Height = Application.GetMinRealAverage(84),
+ Width = Application.GetRealWidth(84),
+ Height = Application.GetRealWidth(84),
X = Application.GetRealWidth(35),
Y = Application.GetRealHeight(29),
UnSelectedImagePath =Method.GetDeviceTypeIcon(devicetype),
@@ -415,13 +415,6 @@
{
continue;
}
- if (IfType == "condition_mould")
- {
- if (common.IasDeviceType != 13)
- {//鑷姩鍖栨ā鏉垮彧鏀寔绾㈠浼犳劅鍣�
- continue;
- }
- }
var deviceFramelayout = new FrameLayout
{
Height = Application.GetRealHeight(160),
@@ -429,18 +422,18 @@
middle.AddChidren(deviceFramelayout);
var bjFramelayout = new FrameLayout
{
- Width = Application.GetMinRealAverage(112),
- Height = Application.GetMinRealAverage(112),
+ Width = Application.GetRealWidth(112),
+ Height = Application.GetRealWidth(112),
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(30 + 9),
- Radius = (uint)Application.GetMinRealAverage(56),
+ Radius = (uint)Application.GetRealWidth(56),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
deviceFramelayout.AddChidren(bjFramelayout);
var deviceIconBtn = new Button
{
- Width = Application.GetMinRealAverage(82),
- Height = Application.GetMinRealAverage(82),
+ Width = Application.GetRealWidth(82),
+ Height = Application.GetRealWidth(82),
Gravity = Gravity.Center,
};
bjFramelayout.AddChidren(deviceIconBtn);
--
Gitblit v1.8.0