From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs b/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs
index 9c92d25..29e69c7 100755
--- a/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs
@@ -4,7 +4,7 @@
namespace Shared.Phone.Category
{
- public class SelectFloorForm : FrameLayout
+ public class SelectFloorForm : UserCenter.FrameLayoutBase
{
public Action<string> FloorAction;
@@ -43,8 +43,8 @@
{
X = Application.GetRealWidth(x),
Y = Application.GetRealHeight(y),
- 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);
@@ -53,16 +53,16 @@
{
X = Application.GetRealWidth(x),
Y = Application.GetRealHeight(y + 23),
- Width = Application.GetMinRealAverage(449),
- Height = Application.GetMinRealAverage(773 - 23)
+ Width = this.GetPictrueRealSize(449),
+ Height = this.GetPictrueRealSize(773 - 23)
};
dialog.AddChidren(backgroundFL);
var tip = 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,
TextAlignment = TextAlignment.CenterLeft,
TextID = R.MyInternationalizationString.SelectFloor,
@@ -74,8 +74,8 @@
var floorLayout = new VerticalScrolViewLayout
{
Y = tip.Bottom,
- Width = Application.GetMinRealAverage(449),
- Height = Application.GetMinRealAverage(600),
+ Width = this.GetPictrueRealSize(449),
+ Height = this.GetPictrueRealSize(600),
VerticalScrollBarEnabled = false
};
backgroundFL.AddChidren(floorLayout);
@@ -97,16 +97,16 @@
if (floorCount > 5)
{
bg.UnSelectedImagePath = $"Floor/SelectFloor_{directStr}_5.png";
- bg.Height = Application.GetMinRealAverage(150*6+23);
- backgroundFL.Height = Application.GetMinRealAverage(150 * 6);
- floorLayout.Height = Application.GetMinRealAverage(150 * 5);
+ bg.Height = this.GetPictrueRealSize(150*6+23);
+ backgroundFL.Height = this.GetPictrueRealSize(150 * 6);
+ floorLayout.Height = this.GetPictrueRealSize(150 * 5);
}
else
{
bg.UnSelectedImagePath = $"Floor/SelectFloor_{directStr}_{floorCount}.png";
- bg.Height = Application.GetMinRealAverage(150 * (floorCount + 1)+23);
- backgroundFL.Height = Application.GetMinRealAverage(150 * (floorCount + 1));
- floorLayout.Height = Application.GetMinRealAverage(150 * floorCount);
+ bg.Height = this.GetPictrueRealSize(150 * (floorCount + 1)+23);
+ backgroundFL.Height = this.GetPictrueRealSize(150 * (floorCount + 1));
+ floorLayout.Height = this.GetPictrueRealSize(150 * floorCount);
}
foreach (var floor in Config.Instance.Home.FloorDics)
@@ -123,8 +123,8 @@
private void AddFloor(VerticalScrolViewLayout verticalScrolView, KeyValuePair<string, string> floor,bool isLast=false)
{
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 = floor.Key;
frow.Init("Floor/Floor.png", "Floor/FloorSelected.png", floor.Value);
verticalScrolView.AddChidren(frow);
--
Gitblit v1.8.0