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/Alexa/AlexaSettingPage.cs | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs
index 9ad80a4..f36fde0 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingPage.cs
@@ -187,16 +187,16 @@
|| typeString.ToString () == DeviceType.CurtainTrietex.ToString ()
#endregion
#region ac
- || typeString.ToString () == DeviceType.ACPanel.ToString ()
- || typeString.ToString () == DeviceType.ACDevice.ToString ()
- || typeString.ToString () == DeviceType.ACInfrared.ToString ()
- || typeString.ToString () == DeviceType.ACCoolmaster.ToString ()
- || typeString.ToString () == DeviceType.CustomAC.ToString ()
- || typeString.ToString () == DeviceType.HVAC.ToString ()
+ //|| typeString.ToString () == DeviceType.ACPanel.ToString ()
+ //|| typeString.ToString () == DeviceType.ACDevice.ToString ()
+ //|| typeString.ToString () == DeviceType.ACInfrared.ToString ()
+ //|| typeString.ToString () == DeviceType.ACCoolmaster.ToString ()
+ //|| typeString.ToString () == DeviceType.CustomAC.ToString ()
+ //|| typeString.ToString () == DeviceType.HVAC.ToString ()
#endregion
#region
|| typeString.ToString () == DeviceType.FanModule.ToString ()
- || typeString.ToString () == DeviceType.UniversalDevice.ToString ()
+ //|| typeString.ToString () == DeviceType.UniversalDevice.ToString ()
#endregion
);
});
@@ -379,6 +379,8 @@
btnChoose.AddTag ("DeviceFilePath", deviceFilePath);
deviceRow.AddChidren (btnChoose);
+
+
btnChoose.MouseUpEventHandler += (sendere, ee) => {
btnChoose.IsSelected = !btnChoose.IsSelected;
if (btnChoose.IsSelected) {
@@ -399,10 +401,17 @@
}
};
- //2020-07-23 濡傛灉鍖归厤鍒欏垽鏂槸鍚︽坊鍔犵湡姝ｇ殑璺緞
- if (btnChoose.IsSelected) {
- if (!roomDeviceFilePathList.Contains (filePath)) {
- roomDeviceFilePathList.Add (filePath);
+ if (selectedDeviceType == "Scene") {
+ //string [] str = filePath.Split ('_');
+ var sceneName = str [str.Length - 2];//鍊掓暟绗竴浣嶄负鍦烘櫙鍚�
+ btnChoose.IsSelected = showList.Contains (sceneName);
+ btnChoose.Enable = !btnChoose.IsSelected;
+ } else {
+ //2020-07-23 濡傛灉鍖归厤鍒欏垽鏂槸鍚︽坊鍔犵湡姝ｇ殑璺緞
+ if (btnChoose.IsSelected) {
+ if (!roomDeviceFilePathList.Contains (filePath)) {
+ roomDeviceFilePathList.Add (filePath);
+ }
}
}
@@ -423,7 +432,7 @@
Language.StringByID(R.MyInternationalizationString.All),
Language.StringByID(R.MyInternationalizationString.Scenes),
Language.StringByID(R.MyInternationalizationString.Lights),
- Language.StringByID(R.MyInternationalizationString.AC),
+ //Language.StringByID(R.MyInternationalizationString.AC),
Language.StringByID(R.MyInternationalizationString.Curtains),
//Language.StringByID(R.MyInternationalizationString.FoolHeat),
//Language.StringByID(R.MyInternationalizationString.FreshAir),
@@ -433,7 +442,7 @@
//Language.StringByID (R.MyInternationalizationString.LogicModule),
//Language.StringByID(R.MyInternationalizationString.ElectricalControl),
//Language.StringByID (R.MyInternationalizationString.MusicModel),
- Language.StringByID (R.MyInternationalizationString.UniversalDevice),
+ //Language.StringByID (R.MyInternationalizationString.UniversalDevice),
//Language.StringByID (R.MyInternationalizationString.Sensor),
};
--
Gitblit v1.8.0