From d8545fbd1b36a6766c57c987e5d89862b470fed9 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 九月 2020 09:46:29 +0800
Subject: [PATCH] 2020-09-03 1.修改风扇默认为关状态。2.Alexa添加设备时，去掉空调和通用开关选择添加支持。 3.场景增加通用开关添加和发送控制支持，Alexa 的场景同样增加通用开关的支持。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserLightPage.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserLightPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserLightPage.cs
index dad8fa1..cb95546 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserLightPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Light/UserLightPage.cs
@@ -131,7 +131,7 @@
};
var btnAddLightScene = new Button () {
Width = Application.GetRealWidth (100),
- Height = Application.GetRealHeight (100),
+ Height = Application.GetRealWidth (100),
X = Application.GetRealWidth (640 - 120),
Y = Application.GetRealHeight (20),
UnSelectedImagePath = "Light/UserLightAddScene.png",
@@ -256,7 +256,7 @@
};
Button btnSIcon = new Button () {
Width = Application.GetRealWidth(111),
- Height = Application.GetRealHeight(110),
+ Height = Application.GetRealWidth(110),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = scene.SceneIconPath,
SelectedImagePath = scene.SceneIconPath,
@@ -670,8 +670,8 @@
lightView.AddChidren (tempLightName);
var tempSiwtch = new Button () {
- Width = Application.GetRealWidth (85),
- Height = Application.GetRealHeight (53),
+ Width = Application.GetMinRealAverage (85),
+ Height = Application.GetMinRealAverage (53),
X = Application.GetRealWidth (640 - 90 - 20),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "Item/SwitchClose.png",
@@ -1029,8 +1029,8 @@
};
//寮�鍏虫寜閿�
var tempSwitch = new Button () {
- Width = Application.GetRealWidth (90),
- Height = Application.GetRealHeight (53),
+ Width = Application.GetMinRealAverage (90),
+ Height = Application.GetMinRealAverage (53),
X = Application.GetRealWidth (640 - 90 - 20),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "Item/SwitchClose.png",
@@ -1194,7 +1194,7 @@
lightView.AddChidren (btnLightSetting);
Button btnRGBSetting = new Button () {
Width = Application.GetRealWidth (60),
- Height = Application.GetRealHeight (60),
+ Height = Application.GetRealWidth (60),
Radius = (uint)Application.GetRealHeight (30),
X = tempLightSeekBar.Right + Application.GetRealWidth (20),
Gravity = Gravity.CenterVertical,
@@ -1567,8 +1567,8 @@
#endregion
//寮�鍏虫寜閿�
var tempSwitch = new Button () {
- Width = Application.GetRealWidth (90),
- Height = Application.GetRealHeight (53),
+ Width = Application.GetMinRealAverage (90),
+ Height = Application.GetMinRealAverage (53),
X = Application.GetRealWidth (640 - 90 - 20),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "Item/SwitchClose.png",
--
Gitblit v1.8.0