From 737c036a39176fd2085ce82b7c60391da8cb508c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 19:17:47 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Common/DeviceUI.cs | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 103 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/DeviceUI.cs b/ZigbeeApp/Shared/Common/DeviceUI.cs
index a796ccb..7c6a101 100755
--- a/ZigbeeApp/Shared/Common/DeviceUI.cs
+++ b/ZigbeeApp/Shared/Common/DeviceUI.cs
@@ -178,38 +178,42 @@
{
case DeviceType.OnOffSwitch:
//鎺у埗闈㈡澘
- ImagePath= "Device/DryContact.png";
+ ImagePath = "Device/DryContact.png";
break;
case DeviceType.OnOffOutput:
//缁х數鍣�
- ImagePath= "Device/Relay.png";
+ ImagePath = "Device/Relay.png";
break;
case DeviceType.DimmableLight:
//璋冨厜鐏�
- ImagePath= "Device/DimmableLight.png";
+ ImagePath = "Device/DimmableLight.png";
break;
case DeviceType.WindowCoveringDevice:
//绐楀笜
- ImagePath= "Device/Curtain.png";
+ ImagePath = "Device/Curtain.png";
break;
case DeviceType.Thermostat:
//绌鸿皟
- ImagePath= "Device/AirConditioner.png";
+ ImagePath = "Device/AirConditioner.png";
break;
case DeviceType.IASZone:
//浼犳劅鍣�
- ImagePath= "Device/Sensor.png";
+ ImagePath = "Device/Sensor.png";
break;
case DeviceType.AirSwitch:
//绌烘皵寮�鍏�
- ImagePath= "Device/AirSwitch.png";
+ ImagePath = "Device/AirSwitch.png";
break;
case DeviceType.Repeater:
//涓户鍣�
ImagePath = "Device/AirSwitch.png";
break;
+ case DeviceType.TemperatureSensor:
+ //娓╂箍搴︿紶鎰熷櫒
+ ImagePath = "Device/Sensor.png";
+ break;
default:
- ImagePath= "Device/Relay.png";
+ ImagePath = "Device/Relay.png";
break;
}
return ImagePath;
@@ -309,6 +313,10 @@
deviceTypeR = R.MyInternationalizationString.DoorLock;
break;
+ case DeviceType.TemperatureSensor:
+ //娓╁害浼犳劅鍣�
+ deviceTypeR = R.MyInternationalizationString.TemperatureAndHumiditySensor;
+ break;
default:
deviceTypeR = R.MyInternationalizationString.UnknowDevice;
break;
@@ -437,6 +445,93 @@
}
return $"{model},{wind},{tempareture}";
}
+ else if (device.Type == DeviceType.IASZone)
+ {
+ var ias = CommonDevice as IASZone;
+ var info = Common.LocalDevice.Current.GetNotHdlMyDeviceEnumInfo(new List<CommonDevice> { device });
+ if (info.ConcreteType == DeviceConcreteType.Sensor_Infrared)
+ {
+ //绾㈠
+ if (ias.iASInfo?.Alarm1 == 1)
+ {
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_HavePerson);
+ }
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_NoPerson);
+ }
+ else if (info.ConcreteType == DeviceConcreteType.Sensor_Water)
+ {
+ //姘存蹈
+ if (ias.iASInfo?.Alarm1 == 1)
+ {
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_HaveWater);
+ }
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Normal);
+ }
+ else if (info.ConcreteType == DeviceConcreteType.Sensor_DoorWindow)
+ {
+ //闂ㄧ獥
+ if (ias.iASInfo?.Alarm1 == 1)
+ {
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Open);
+ }
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Close);
+ }
+ else if (info.ConcreteType == DeviceConcreteType.Sensor_CarbonMonoxide)
+ {
+ //鐕冩皵
+ if (ias.iASInfo?.Alarm1 == 1)
+ {
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Alarm);
+ }
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Safe);
+ }
+ else if (info.ConcreteType == DeviceConcreteType.Sensor_Fire)
+ {
+ //鐑熼浘
+ if (ias.iASInfo?.Alarm1 == 1)
+ {
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Alarm);
+ }
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Safe);
+ }
+ else if (info.ConcreteType == DeviceConcreteType.Sensor_Pir)
+ {
+ //pir
+ if (ias.iASInfo?.Alarm1 == 1)
+ {
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Alarm);
+ }
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Safe);
+ }
+ else if (info.ConcreteType == DeviceConcreteType.Sensor_Keyfob)
+ {
+ //閽ュ寵鎵�
+ if (ias.iASInfo?.Alarm1 == 1)
+ {
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Alarm);
+ }
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Normal);
+ }
+ else if (info.ConcreteType == DeviceConcreteType.Sensor_Motion)
+ {
+ //杩愬姩浼犳劅鍣�
+ if (ias.iASInfo?.Alarm1 == 1)
+ {
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Alarm);
+ }
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Normal);
+ }
+ else if (info.ConcreteType == DeviceConcreteType.Sensor_EmergencyButton)
+ {
+ //绱ф�ユ寜閽�
+ if (ias.iASInfo?.Alarm1 == 1)
+ {
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Alarm);
+ }
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Normal);
+ }
+ return null;
+ }
else
{
return null;
--
Gitblit v1.8.0