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/Schedule/AddSchedule.cs | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
index 57d0c7f..0682b47 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/AddSchedule.cs
@@ -125,7 +125,7 @@
X = btnTime.Right + Application.GetRealWidth (190),
Gravity = Gravity.CenterVertical,
Width = Application.GetRealWidth (75),
- Height = Application.GetRealHeight (75),
+ Height = Application.GetRealWidth (75),
UnSelectedImagePath = "CrabtreeAdd/Timer.png",
};
timeView.AddChidren (btnTimeIcon);
@@ -823,7 +823,7 @@
Tag = deviceCommon.CommonLoopID,
};
DeviceRowView.AddChidren (tempSwitch);
-
+
if (deviceCommon.Type == DeviceType.FanModule) {
#region 椋庢墖
@@ -874,7 +874,7 @@
ProgressColor = SkinStyle.Current.SelectedColor,
ThumbRadius = Application.GetRealWidth (3),
Max = 8,
- Progress =2,// (int)(deviceCommon.SendBytes[1]),
+ Progress = 2,// (int)(deviceCommon.SendBytes[1]),
};
DeviceRowView.AddChidren (fanLevel);
@@ -1083,12 +1083,14 @@
#endregion
} else if (deviceCommon.Type == DeviceType.CurtainModel || deviceCommon.Type == DeviceType.CurtainTrietex || deviceCommon.Type == DeviceType.CurtainRoller) {
#region 绐楀笜
+ //2020-07-09 鍒锋柊鎺у埗鎿嶄綔鐮�
+ deviceCommon.Command = (int)Command.UpdataCurtainModelStutas;
tempSwitch.RemoveFromParent ();
- var tempSwitch1 = new Button () {
- Width = Application.GetMinRealAverage (90),
- Height = Application.GetMinRealAverage (53),
- X = Application.GetRealWidth (640 - 90 - 20),
- Radius = 5,
+ var tempSwitch1 = new Button () {
+ Width = Application.GetMinRealAverage (90),
+ Height = Application.GetMinRealAverage (53),
+ X = Application.GetRealWidth (640 - 90 - 20),
+ Radius = 5,
BorderColor = SkinStyle.Current.Transparent,
BorderWidth = 1,
Gravity = Gravity.CenterVertical,
@@ -1118,10 +1120,13 @@
btnChoose.IsSelected = true;
}
deviceCommon.SendBytes = new byte [] { deviceCommon.LoopID, (byte)CurrentBrightness };
- if (timerControlDeviceList.Find ((obj) => obj.DevicePath == deviceCommon.SavePath) == null) {
+ //2020-07-09
+ DeviceInfo mDeviceInfo = timerControlDeviceList.Find ((obj) => obj.DevicePath == deviceCommon.SavePath);
+ if (mDeviceInfo == null) {
timerControlDeviceList.Add (deviceCommon);
} else {
- timerControlDeviceList.Find ((obj) => obj.DevicePath == deviceCommon.SavePath).SendBytes = new byte [] { deviceCommon.LoopID, (byte)CurrentBrightness };
+ mDeviceInfo.Command = (int)Command.UpdataCurtainModelStutas;
+ mDeviceInfo.SendBytes = new byte [] { deviceCommon.LoopID, (byte)CurrentBrightness };
}
};
@@ -1150,10 +1155,19 @@
}
deviceCommon.SendBytes = new byte [] { deviceCommon.LoopID, (byte)CurrentBrightness };
- if (timerControlDeviceList.Find ((obj) => obj.DevicePath == deviceCommon.SavePath) == null) {
+ //if (timerControlDeviceList.Find ((obj) => obj.DevicePath == deviceCommon.SavePath) == null) {
+ // timerControlDeviceList.Add (deviceCommon);
+ //} else {
+ // timerControlDeviceList.Find ((obj) => obj.DevicePath == deviceCommon.SavePath).SendBytes = new byte [] { deviceCommon.LoopID, (byte)CurrentBrightness };
+ //}
+
+ //2020-07-09
+ DeviceInfo mDeviceInfo = timerControlDeviceList.Find ((obj) => obj.DevicePath == deviceCommon.SavePath);
+ if (mDeviceInfo == null) {
timerControlDeviceList.Add (deviceCommon);
} else {
- timerControlDeviceList.Find ((obj) => obj.DevicePath == deviceCommon.SavePath).SendBytes = new byte [] { deviceCommon.LoopID, (byte)CurrentBrightness };
+ mDeviceInfo.Command = (int)Command.UpdataCurtainModelStutas;
+ mDeviceInfo.SendBytes = new byte [] { deviceCommon.LoopID, (byte)CurrentBrightness };
}
} else {
timerControlDeviceList.Remove (timerControlDeviceList.Find ((obj) => obj.DeviceType == (int)deviceCommon.Type &&
--
Gitblit v1.8.0