From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期五, 12 六月 2020 09:22:04 +0800
Subject: [PATCH] 2020.06.12
---
ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs b/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs
index 2c9bbd6..7c70c74 100755
--- a/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs
@@ -4,7 +4,7 @@
namespace Shared.Phone.Category
{
- public class SelectHouseForm : FrameLayout
+ public class SelectHouseForm : UserCenter.FrameLayoutBase
{
public Action<string> HouseAction;
@@ -33,8 +33,8 @@
{
X = Application.GetRealWidth(35),
Y = Application.GetRealHeight(256),
- Width = Application.GetMinRealAverage(449),
- Height = Application.GetMinRealAverage(773),
+ Width = this.GetPictrueRealSize(449),
+ Height = this.GetPictrueRealSize(773),
UnSelectedImagePath = "Floor/SelectFloor_Left_4.png"
};
dialog.AddChidren(bg);
@@ -43,16 +43,16 @@
{
X = Application.GetRealWidth(35),
Y = Application.GetRealHeight(256+23),
- Width = Application.GetMinRealAverage(449),
- Height = Application.GetMinRealAverage(773 - 23)
+ Width = this.GetPictrueRealSize(449),
+ Height = this.GetPictrueRealSize(773 - 23)
};
dialog.AddChidren(changeHomeFL);
var changeHomeBtn = new Button()
{
X = Application.GetRealWidth(80),
- Width = Application.GetMinRealAverage(350),
- Height = Application.GetMinRealAverage(150),
+ Width = this.GetPictrueRealSize(350),
+ Height = this.GetPictrueRealSize(150),
TextColor = ZigbeeColor.Current.GXCTextBlackColor,
TextID = R.MyInternationalizationString.ChangeHome,
TextAlignment = TextAlignment.CenterLeft,
@@ -64,8 +64,8 @@
var scrolView = new VerticalScrolViewLayout()
{
Y = changeHomeBtn.Bottom,
- Width = Application.GetMinRealAverage(449),
- Height = Application.GetMinRealAverage(600),
+ Width = this.GetPictrueRealSize(449),
+ Height = this.GetPictrueRealSize(600),
VerticalScrollBarEnabled = false
};
changeHomeFL.AddChidren(scrolView);
@@ -76,21 +76,21 @@
if (houseCount > 5)
{
bg.UnSelectedImagePath = $"Floor/SelectFloor_Left_5.png";
- bg.Height = Application.GetMinRealAverage(150 * 6 + 23);
- changeHomeFL.Height = Application.GetMinRealAverage(150 * 6);
- scrolView.Height = Application.GetMinRealAverage(150 * 5);
+ bg.Height = this.GetPictrueRealSize(150 * 6 + 23);
+ changeHomeFL.Height = this.GetPictrueRealSize(150 * 6);
+ scrolView.Height = this.GetPictrueRealSize(150 * 5);
}
else
{
bg.UnSelectedImagePath = $"Floor/SelectFloor_Left_{houseCount}.png";
- bg.Height = Application.GetMinRealAverage(150 * (houseCount + 1) + 23);
- changeHomeFL.Height = Application.GetMinRealAverage(150 * (houseCount + 1));
- scrolView.Height = Application.GetMinRealAverage(150 * houseCount);
+ bg.Height = this.GetPictrueRealSize(150 * (houseCount + 1) + 23);
+ changeHomeFL.Height = this.GetPictrueRealSize(150 * (houseCount + 1));
+ scrolView.Height = this.GetPictrueRealSize(150 * houseCount);
}
foreach (var housePath in Config.Instance.HomeFilePathList)
{
- var home = House.GetHouseByFilePath(housePath);
+ var home = UserCenter.HdlResidenceLogic.Current.GetHouseByFilePath(housePath);
if (home == null)
{
continue;
@@ -107,8 +107,8 @@
private void AddFloor(VerticalScrolViewLayout verticalScrolView, House house)
{
var frow = new Device.CommonForm.LeftIconButtonRow(449, 150);
- frow.Width = Application.GetMinRealAverage(449);
- frow.Height = Application.GetMinRealAverage(150);
+ frow.Width = this.GetPictrueRealSize(449);
+ frow.Height = this.GetPictrueRealSize(150);
frow.Tag = house.FileName;
frow.Init("Item/House.png", "Item/HouseSelected.png", house.Name);
verticalScrolView.AddChidren(frow);
@@ -128,7 +128,7 @@
private void SelectFloor_MouseUpEvent(object sender, MouseEventArgs mouseEventArgs)
{
(sender as Device.CommonForm.LeftIconButtonRow).IsSelected = true;
- var home = House.GetHouseByFilePath((sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString());
+ var home = UserCenter.HdlResidenceLogic.Current.GetHouseByFilePath((sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString());
RemoveView();
HouseAction?.Invoke(home.Id);
}
--
Gitblit v1.8.0