From ed2f4a97aa48cdb4a013d2a389877f52eb3eccdf Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:15:59 +0800
Subject: [PATCH] Merge branch 'DEV_GXC' of http://172.16.1.23:6688/r/~xm/HomeApp into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
old mode 100644
new mode 100755
index e688e5e..296d3fb
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
@@ -95,11 +95,11 @@
middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
this.AddChidren(middle);
- ///杩囨护鎺夌殑璁惧
+ ///鐩墠鏀寔鐨勮澶�
List<DeviceType> deviceTypeList = new List<DeviceType> {
- DeviceType.IASZone,
- DeviceType.OnOffSwitch,
- DeviceType.AirSwitch,
+ DeviceType.OnOffOutput,
+ DeviceType.DimmableLight,
+ DeviceType.WindowCoveringDevice,
};
///鎴块棿鐐瑰嚮浜嬩欢
@@ -166,8 +166,9 @@
foreach (var device in room.DeviceUIList) {
if (!deviceTypeList.Contains(device.CommonDevice.Type))
{
- list.Add(device);
+ continue;
}
+ list.Add(device);
}
AllDeviceTypeView(list);
@@ -182,7 +183,7 @@
foreach (var device in Common.Logic.LogicDviceList)
{
//杩囨护鎺夋病鏈夌敤鍒拌澶囷紱
- if (deviceTypeList.Contains(device.Type))
+ if (!deviceTypeList.Contains(device.Type))
{
continue;
}
@@ -207,7 +208,7 @@
devicetypelist.Clear();
#region ------鎺掑垪璁惧绫诲瀷------
- var lightjosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.ColorDimmableLight || device.CommonDevice.Type == DeviceType.OnOffOutput);
+ var lightjosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.DimmableLight || device.CommonDevice.Type == DeviceType.OnOffOutput);
if (lightjosn != null)
{
devicetypelist.Add(Language.StringByID(MyInternationalizationString.Lights));
@@ -273,6 +274,7 @@
if (devicetype == Language.StringByID(MyInternationalizationString.Lights))
{
list.Add(DeviceType.OnOffOutput);//0x0101鍗佽繘鍒�257
+ list.Add(DeviceType.DimmableLight);
}
else if (devicetype == Language.StringByID(MyInternationalizationString.Curtains))
{
@@ -600,7 +602,7 @@
}
break;
///璋冨厜鐏厜
- case DeviceType.ColorDimmableLight:
+ case DeviceType.DimmableLight:
{
#region ----鍒濆鍖栬澶囧姛鑳芥暟鎹�----
--
Gitblit v1.8.0