From d53e6af2c5f17838fa79659614b15a2a1f383399 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 31 三月 2023 10:04:58 +0800
Subject: [PATCH] 1
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingDevicePage.cs | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingDevicePage.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingDevicePage.cs
index 30a3430..8b399ec 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingDevicePage.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Alexa/AlexaSettingDevicePage.cs
@@ -201,6 +201,9 @@
{
deviceScrolView.RemoveAll ();
foreach (Function function in CommonConfig.Current.FunctionList) {
+ //杩囨护閫氱敤寮�鍏充笉鍏佽鏄剧ず鍜屾坊鍔�
+ if (function.spk == SPK.UniversalDevice) continue;
+
AddRowView (function);
}
@@ -276,15 +279,15 @@
deviceRow.AddChidren (btnChoose);
- var sceneData = targetInfoList.Find ((obj) => obj.targetId == function.deviceId);
- btnChoose.IsSelected = sceneData != null;
+ var targeDeviceData = targetInfoList.Find ((obj) => obj.targetId == function.deviceId);
+ btnChoose.IsSelected = targeDeviceData != null;
btnChoose.MouseUpEventHandler += (sendere, ee) => {
btnChoose.IsSelected = !btnChoose.IsSelected;
if (btnChoose.IsSelected) {
- var sceneData = targetInfoList.Find ((obj) => obj.targetId == function.deviceId);
- if (sceneData == null) {
+ var deviceData = targetInfoList.Find ((obj) => obj.targetId == function.deviceId);
+ if (deviceData == null) {
targetInfoList.Add (new TargetInfo () {
targetId = function.deviceId,
targetName = function.name,
@@ -293,9 +296,9 @@
}
} else {
- var sceneData = targetInfoList.Find ((obj) => obj.targetId == function.deviceId);
- if (sceneData != null) {
- targetInfoList.Remove (sceneData);
+ var deviceData = targetInfoList.Find ((obj) => obj.targetId == function.deviceId);
+ if (deviceData != null) {
+ targetInfoList.Remove (deviceData);
}
}
};
--
Gitblit v1.8.0