From 15c5215e0a16207baace58b81f406acfd84b4de5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 28 八月 2020 16:00:26 +0800
Subject: [PATCH] V2.508281-beta 2020-08-28 1.搜索设备时，如果红外空调备注为空时，默认”AC“+回路号命名。 2.添加场景时，卷帘和开合帘提交改为百分比进度参数。 3.增加房间页面，长按设备名字，弹出修改备注。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs | 88 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs
index 4e53bb6..12465b5 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserAddSceneDevice.cs
@@ -1038,8 +1038,8 @@
}
title.Text = curtainmodel.Name;
Button btnOpenCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
UnSelectedImagePath = "Curtain/CurtainOpen.png",
SelectedImagePath = "Curtain/CurtainOpenSelected.png",
X = Application.GetRealWidth (20),
@@ -1057,8 +1057,8 @@
};
dialogBodyLayout.AddChidren (btnOpenLbl);
Button btnStopCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
X = Application.GetRealWidth ((480 - 124) / 2),
Y = btnOpenCurtain.Y,
UnSelectedImagePath = "Curtain/CurtainTimeOut.png",
@@ -1076,8 +1076,8 @@
};
dialogBodyLayout.AddChidren (btnStopLbl);
Button btnCloseCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
X = Application.GetRealWidth (480 - 124 - 35),
Y = btnOpenCurtain.Y,
UnSelectedImagePath = "Curtain/CurtainClose.png",
@@ -1178,8 +1178,8 @@
};
Button btnOpenCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
UnSelectedImagePath = "Curtain/CurtainOpen.png",
SelectedImagePath = "Curtain/CurtainOpenSelected.png",
X = Application.GetRealWidth (20),
@@ -1198,8 +1198,8 @@
};
dialogBodyLayout.AddChidren (btnOpenLbl);
Button btnStopCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
X = Application.GetRealWidth ((480 - 124) / 2),
Y = btnOpenCurtain.Y,
UnSelectedImagePath = "Curtain/CurtainTimeOut.png",
@@ -1217,8 +1217,8 @@
};
//dialogBodyLayout.AddChidren (btnStopLbl);
Button btnCloseCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
X = Application.GetRealWidth (480 - 124 - 35),
Y = btnOpenCurtain.Y,
UnSelectedImagePath = "Curtain/CurtainClose.png",
@@ -1325,8 +1325,8 @@
Button btnOpenCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
UnSelectedImagePath = "Curtain/CurtainRollerUp.png",
SelectedImagePath = "Curtain/CurtainRollerUpOn.png",
X = Application.GetRealWidth (20),
@@ -1349,8 +1349,8 @@
};
dialogBodyLayout.AddChidren (btnOpenLbl);
Button btnStopCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
X = Application.GetRealWidth ((480 - 124) / 2),
Y = btnOpenCurtain.Y,
UnSelectedImagePath = "Curtain/CurtainTimeOut.png",
@@ -1368,8 +1368,8 @@
};
//dialogBodyLayout.AddChidren (btnStopLbl);
Button btnCloseCurtain = new Button () {
- Width = Application.GetRealWidth (124),
- Height = Application.GetRealHeight (125),
+ Width = Application.GetMinRealAverage (124),
+ Height = Application.GetMinRealAverage (124),
X = Application.GetRealWidth (480 - 124 - 35),
Y = btnOpenCurtain.Y,
UnSelectedImagePath = "Curtain/CurtainRollerDown.png",
@@ -1456,8 +1456,8 @@
dialogBodyLayout.AddChidren (btnSetTemperature);
Button btnReduceTemperature = new Button () {
- Width = Application.GetRealWidth (94),
- Height = Application.GetRealHeight (94),
+ Width = Application.GetMinRealAverage (94),
+ Height = Application.GetMinRealAverage (94),
X = Application.GetRealWidth (20),
Y = btnSetTemperature.Bottom + Application.GetRealHeight (20),
UnSelectedImagePath = "AC/AC-.png",
@@ -1466,8 +1466,8 @@
dialogBodyLayout.AddChidren (btnReduceTemperature);
Button btnSwitchAC = new Button () {
- Width = Application.GetRealWidth (94),
- Height = Application.GetRealHeight (94),
+ Width = Application.GetMinRealAverage (94),
+ Height = Application.GetMinRealAverage (94),
X = Application.GetRealWidth ((480 - 94) / 2),
Y = btnReduceTemperature.Y,
UnSelectedImagePath = "AC/ACClose.png",
@@ -1492,8 +1492,8 @@
}
Button btnAddTemperature = new Button () {
- Width = Application.GetRealWidth (94),
- Height = Application.GetRealHeight (94),
+ Width = Application.GetMinRealAverage (94),
+ Height = Application.GetMinRealAverage (94),
X = Application.GetRealWidth (480 - 20 - 94),
Y = btnReduceTemperature.Y,
UnSelectedImagePath = "AC/AC+.png",
@@ -1533,8 +1533,8 @@
dialogBodyLayout.AddChidren (acModeView);
Button btnACModeLeft = new Button () {
- Width = Application.GetRealWidth (129),
- Height = Application.GetRealHeight (129),
+ Width = Application.GetMinRealAverage (129),
+ Height = Application.GetMinRealAverage (129),
X = btnReduceTemperature.X - Application.GetRealWidth (17),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "AC/ACLeft.png",
@@ -1551,8 +1551,8 @@
};
acModeView.AddChidren (btnModeIcon);
Button btnACModeRight = new Button () {
- Width = Application.GetRealWidth (129),
- Height = Application.GetRealHeight (129),
+ Width = Application.GetMinRealAverage (129),
+ Height = Application.GetMinRealAverage (129),
X = btnAddTemperature.X - Application.GetRealWidth (17),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "AC/ACRight.png",
@@ -1594,8 +1594,8 @@
dialogBodyLayout.AddChidren (acWindView);
Button btnACWindLeft = new Button () {
- Width = Application.GetRealWidth (129),
- Height = Application.GetRealHeight (129),
+ Width = Application.GetMinRealAverage (129),
+ Height = Application.GetMinRealAverage (129),
X = btnReduceTemperature.X - Application.GetRealWidth (17),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "AC/ACLeft.png",
@@ -1613,8 +1613,8 @@
acWindView.AddChidren (btnWindIcon);
Button btnACWindRight = new Button () {
- Width = Application.GetRealWidth (129),
- Height = Application.GetRealHeight (129),
+ Width = Application.GetMinRealAverage (129),
+ Height = Application.GetMinRealAverage (129),
X = btnAddTemperature.X - Application.GetRealWidth (17),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "AC/ACRight.png",
@@ -1710,8 +1710,8 @@
title.Text = fh.Name;
Button FH_Heat = new Button () {
- Width = Application.GetRealWidth (120),
- Height = Application.GetRealHeight (120),
+ Width = Application.GetMinRealAverage (120),
+ Height = Application.GetMinRealAverage (120),
X = Application.GetRealWidth (20),
Y = Application.GetRealHeight (120),
UnSelectedImagePath = "FH/FH_Heat_on.png",
@@ -1736,8 +1736,8 @@
};
Button btnFHSwitch = new Button () {
- Width = Application.GetRealWidth (80),
- Height = Application.GetRealHeight (80),
+ Width = Application.GetMinRealAverage (80),
+ Height = Application.GetMinRealAverage (80),
X = Application.GetRealWidth (480 - 40 - 80),
Y = Application.GetRealHeight (140),
UnSelectedImagePath = "AC/ACClose.png",
@@ -1772,8 +1772,8 @@
dialogBodyLayout.AddChidren (fhTemperatureView);
Button btnReduceTemperature = new Button () {
- Width = Application.GetRealWidth (90),
- Height = Application.GetRealHeight (90),
+ Width = Application.GetMinRealAverage (90),
+ Height = Application.GetMinRealAverage (90),
X = Application.GetRealWidth (40),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "AC/AC-.png",
@@ -1792,8 +1792,8 @@
};
fhTemperatureView.AddChidren (btnSetTemperature);
Button BtnAddTemperature = new Button () {
- Width = Application.GetRealWidth (90),
- Height = Application.GetRealHeight (90),
+ Width = Application.GetMinRealAverage (90),
+ Height = Application.GetMinRealAverage (90),
X = Application.GetRealWidth (480 - 90 - 40),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "AC/AC+.png",
@@ -1863,8 +1863,8 @@
Button btnWindSpeedReduce = new Button () {
X = Application.GetRealWidth (100),
Y = btnWindSpeedTitle.Bottom,
- Width = Application.GetRealWidth (64),
- Height = Application.GetRealHeight (62),
+ Width = Application.GetMinRealAverage (64),
+ Height = Application.GetMinRealAverage (62),
UnSelectedImagePath = "Light/Light-.png",
SelectedImagePath = "Light/Light-On.png",
};
@@ -1883,8 +1883,8 @@
windBodyView.AddChidren (btnWindSpeedText);
Button btnWindSpeedAdd = new Button () {
- Width = Application.GetRealWidth (64),
- Height = Application.GetRealHeight (62),
+ Width = Application.GetMinRealAverage (64),
+ Height = Application.GetMinRealAverage (62),
UnSelectedImagePath = "Light/Light+.png",
SelectedImagePath = "Light/Light+On.png",
X = btnWindSpeedText.Right,
--
Gitblit v1.8.0