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/Scene/UserDeviceToScene.cs | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs
index c765bd1..a9ccc52 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Scene/UserDeviceToScene.cs
@@ -19,6 +19,14 @@
curView = this;
}
+ public override void RemoveFromParent ()
+ {
+ curView = null;
+ UserDeviceView.UpdataScenesCountNumber ();
+ base.RemoveFromParent ();
+
+ }
+
public static bool hasModify = false;
public static void Refresh ()
{
@@ -137,7 +145,7 @@
InitView (UserConfig.Instance.SceneOfGloba);
}
- void InitView (bool isGolba)
+ public void InitView (bool isGolba)
{
bodyScrolView.RemoveAll ();
if (isGolba) {
@@ -190,7 +198,8 @@
};
sceneView.AddChidren (btnSceneName);
var btnBGC = new Button () {
- UnSelectedImagePath = "Item/sss.png",
+ //UnSelectedImagePath = "Item/sss.png",
+ UnSelectedImagePath = "Item/Transparent.png",
SelectedImagePath = "Item/SceneSettingBackground.png",
TextAlignment = TextAlignment.BottomCenter,
Text = scene.Name,
@@ -341,7 +350,7 @@
roomView.AddChidren (btnNumber);
btnRoomName.MouseUpEventHandler += (sender, e) => {
- var userScenePage = new UserScenePage ();
+ var userScenePage = new UserScenePage (this);
UserMiddle.DevicePageView.AddChidren (userScenePage);
userScenePage.ShowUserScene (room);
UserMiddle.DevicePageView.PageIndex = 2;
--
Gitblit v1.8.0