From d78515ac4ac8cf4a1785d9df18058d6724f12b79 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 14 一月 2021 19:34:59 +0800
Subject: [PATCH] 合并xm2021-01-13 wjc2021-02-06
---
ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
index 2ba15ac..992f447 100755
--- 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,
};
@@ -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),
@@ -422,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);
@@ -450,7 +450,7 @@
deviceFramelayout.AddChidren(deviceRow);
var devicename = new Button
{
- Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(common),
+ Text = LocalDevice.Current.GetDeviceEpointName(common),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
--
Gitblit v1.8.0