From 2bc230cf2e7a7329c2329b07307a47b059835bbc Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期五, 18 十月 2019 10:20:52 +0800
Subject: [PATCH] 2019-10-18-1
---
ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
index 4f71fa0..585af4d 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -156,7 +156,8 @@
DeviceType.IASZone,
DeviceType.OnOffSwitch,
DeviceType.OnOffOutput,//妤兼鐏�
- DeviceType.DoorLock
+ DeviceType.DoorLock,
+ DeviceType.TemperatureSensor,
};
///妤煎眰鐐瑰嚮浜嬩欢
@@ -224,7 +225,7 @@
///绗竴娆¤繘鏉�
var roomlists = new List<Common.Room>();
roomlists.Clear();
- if (Config.Instance.Home.FloorDics.Count < 1)
+ if (Config.Instance.Home.FloorDics.Count < 2)
{
foolrname.Visible = false;
dropdown.Visible = false;
@@ -366,7 +367,7 @@
devicetypelist.Add(Language.StringByID(MyInternationalizationString.Curtains));
}
- var iASZonejosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.IASZone);
+ var iASZonejosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.IASZone|| device.CommonDevice.Type == DeviceType.TemperatureSensor);
if (iASZonejosn != null)
{
devicetypelist.Add(Language.StringByID(MyInternationalizationString.sensor));
@@ -486,6 +487,7 @@
else if (devicetype == Language.StringByID(MyInternationalizationString.sensor))
{
list.Add(DeviceType.IASZone);
+ list.Add(DeviceType.TemperatureSensor);
}
else if (devicetype == Language.StringByID(MyInternationalizationString.doorLock))
{
@@ -587,6 +589,21 @@
deviceIconBtn.SelectedImagePath = $"ZigeeLogic/selectedsensor{iASZonedevice.IasDeviceType}.png";
+ }
+ break;
+ case DeviceType.TemperatureSensor:
+ {
+ var temperatureSensor = common.CommonDevice as TemperatureSensor;
+ if (temperatureSensor.SensorDiv == 1)
+ {
+ deviceIconBtn.UnSelectedImagePath = $"ZigeeLogic/temperature.png";
+ deviceIconBtn.SelectedImagePath = $"ZigeeLogic/selectedtemperature.png";
+ }
+ else
+ {
+ deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/humidity.png";
+ deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedhumidity.png";
+ }
}
break;
case DeviceType.OnOffSwitch:
@@ -1397,6 +1414,33 @@
}
break;
+ case DeviceType.TemperatureSensor:
+ {
+
+ var temperatureSensor = common as TemperatureSensor;
+ if (temperatureSensor.SensorDiv == 1)
+ {
+ dictionary(deviceConditionsInfo, "Cluster_ID", "1026");
+ dictionary(deviceConditionsInfo, "AttriButeId", "0");
+ dictionary(deviceConditionsInfo, "Range", "0");
+ dictionary(deviceConditionsInfo, "AttriButeData1", "0");
+ dictionary(deviceConditionsInfo, "AttriButeData2", "0");
+
+
+
+ }
+ else
+ {
+
+ dictionary(deviceConditionsInfo, "Cluster_ID", "1029");
+ dictionary(deviceConditionsInfo, "AttriButeId", "0");
+ dictionary(deviceConditionsInfo, "Range", "0");//琛ㄧず澶т簬鍊�
+ dictionary(deviceConditionsInfo, "AttriButeData1", "0");//娓╁害鍊�
+ dictionary(deviceConditionsInfo, "AttriButeData2", "0");
+ }
+
+ }
+ break;
}
Btncomplete.MouseUpEventHandler += (sender2, e2) =>
--
Gitblit v1.8.0