From 07466c19110693e3e439a7d7c8ad0bc21d9b3287 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 29 四月 2020 09:14:01 +0800
Subject: [PATCH] 优化代码，更改门锁需求接口
---
ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectHouse.cs b/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs
similarity index 71%
rename from ZigbeeApp/Shared/Phone/Device/Category/SelectHouse.cs
rename to ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs
index 37dc7ef..1383415 100755
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectHouse.cs
+++ b/ZigbeeApp/Shared/Phone/Category/SelectHouseForm.cs
@@ -2,9 +2,9 @@
using System.Collections.Generic;
using Shared.Common;
-namespace Shared.Phone.Device.Category
+namespace Shared.Phone.Category
{
- public class SelectHouse : 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,16 +76,16 @@
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)
@@ -106,9 +106,9 @@
/// <param name="verticalScrolView"></param>
private void AddFloor(VerticalScrolViewLayout verticalScrolView, House house)
{
- var frow = new CommonForm.LeftIconButtonRow(449, 150);
- frow.Width = Application.GetMinRealAverage(449);
- frow.Height = Application.GetMinRealAverage(150);
+ var frow = new Device.CommonForm.LeftIconButtonRow(449, 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);
@@ -127,8 +127,8 @@
/// <param name="mouseEventArgs"></param>
private void SelectFloor_MouseUpEvent(object sender, MouseEventArgs mouseEventArgs)
{
- (sender as CommonForm.LeftIconButtonRow).IsSelected = true;
- var home = House.GetHouseByFilePath((sender as CommonForm.LeftIconButtonRow).Tag.ToString());
+ (sender as Device.CommonForm.LeftIconButtonRow).IsSelected = true;
+ var home = House.GetHouseByFilePath((sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString());
RemoveView();
HouseAction?.Invoke(home.Id);
}
--
Gitblit v1.8.0