From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Common/DeviceUI.cs | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/DeviceUI.cs b/ZigbeeApp/Shared/Common/DeviceUI.cs
index f1c2b1b..913102d 100644
--- a/ZigbeeApp/Shared/Common/DeviceUI.cs
+++ b/ZigbeeApp/Shared/Common/DeviceUI.cs
@@ -512,6 +512,45 @@
}
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 if (device.Type == DeviceType.TemperatureSensor)
+ {
+ var tempera = CommonDevice as TemperatureSensor;
+ if(tempera.SensorDiv==1)
+ {
+ if (tempera.Temperatrue == 0)
+ {
+ return "--鈩�";
+ }
+ return $"{tempera.Temperatrue}鈩�";
+ }
+ else if(tempera.SensorDiv==2)
+ {
+ if (tempera.Humidity == 0)
+ {
+ return "--%";
+ }
+ return $"{tempera.Humidity}%";
+ }
return null;
}
else
--
Gitblit v1.8.0