From 6144d4267f92db9be96a7003f4352732bfe9bb3b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 19 三月 2020 17:49:31 +0800
Subject: [PATCH] 2020-03-19-1
---
ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
index 342da8f..2b1f119 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
@@ -59,14 +59,14 @@
public void Show(string Name)
{
#region 涓婇潰鐨勫竷灞�浠ｇ爜
- UserView.HomePage.Instance.ScrollEnabled = false;
+ UserView.HomePage.Instance.ScrollEnabled = false;//閿佷綇宸︽粦
this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
TopView view = new TopView();
this.AddChidren(view.TopRowView(true));
view.toptitleNameBtn.Text = Name;
view.clickBtn.MouseDownEventHandler += (sender, e) =>
{
- UserView.HomePage.Instance.ScrollEnabled = true;
+ UserView.HomePage.Instance.ScrollEnabled = true;//鎭㈠宸︽粦
RemoveFromParent();
};
view.foolrnameBtn.Text = Config.Instance.Home.GetCurrentFloorName;
@@ -151,8 +151,8 @@
var btnfoolricon = new Button
{
- Width = Application.GetRealWidth(81),
- Height = Application.GetRealHeight(81),
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
UnSelectedImagePath = "Floor/Floor.png",
Gravity = Gravity.CenterVertical,
};
@@ -287,7 +287,7 @@
/// <param name="devicelist">Devicelist.</param>
void AllDeviceTypeView(List<CommonDevice> devicelist)
{
- var devicetypelist = Method.GetDeviceTypeList(IfType, devicelist);
+ var devicetypelist = Method.GetDeviceTypeList(devicelist);
devicetypehorizontalScrol.RemoveAll();
for (int i = 0; i < devicetypelist.Count; i++)
{
@@ -324,8 +324,8 @@
var devicetypeicon = new Button
{
- Width = Application.GetRealWidth(84),
- Height = Application.GetRealHeight(84),
+ Width = Application.GetMinRealAverage(84),
+ Height = Application.GetMinRealAverage(84),
X = Application.GetRealWidth(46),
Y = Application.GetRealHeight(30),
UnSelectedImagePath =Method.GetDeviceTypeIcon(devicetype),
@@ -390,8 +390,8 @@
middle.AddChidren(deviceFramelayout);
var bjFramelayout = new FrameLayout
{
- Width = Application.GetRealWidth(112),
- Height = Application.GetRealHeight(112),
+ Width = Application.GetMinRealAverage(112),
+ Height = Application.GetMinRealAverage(112),
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(30 + 9),
// Radius = (uint)Application.GetRealHeight(56),
@@ -400,8 +400,8 @@
deviceFramelayout.AddChidren(bjFramelayout);
var deviceIconBtn = new Button
{
- Width = Application.GetRealWidth(82),
- Height = Application.GetRealHeight(82),
+ Width = Application.GetMinRealAverage(82),
+ Height = Application.GetMinRealAverage(82),
Gravity = Gravity.Center,
};
bjFramelayout.AddChidren(deviceIconBtn);
--
Gitblit v1.8.0