From cf0bffdf072bae11bdb8c780d0a355818700f713 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 18 五月 2020 15:42:45 +0800
Subject: [PATCH] 请合并代码，优化面板问题
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs | 70 +++++++++++++++++++++++++++++++---
1 files changed, 63 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
index 7182c20..de21c0e 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
@@ -259,7 +259,15 @@
{
continue;
}
- bindFreshAirName = device.DeviceEpointName;
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindFreshAirName = device.DeviceEpointName;
+ }
+ else
+ {
+ bindFreshAirName = bDev.ESName;
+ }
+
bindFreshAirDev = device;
}
if (device.Type == DeviceType.TemperatureSensor)
@@ -267,35 +275,83 @@
var bD = device as TemperatureSensor;
if (bD.SensorDiv == 1)
{
- bindTemperatureName = device.DeviceEpointName;
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindTemperatureName = device.DeviceEpointName;
+ }
+ else
+ {
+ bindTemperatureName = bDev.ESName;
+ }
+
bindTemperatureDev = device;
}
if (bD.SensorDiv == 2)
{
- bindHumidityName = device.DeviceEpointName;
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindHumidityName = device.DeviceEpointName;
+ }
+ else
+ {
+ bindHumidityName = bDev.ESName;
+ }
+
bindHumidityDev = device;
}
}
if (device.Type == DeviceType.FreshAirHumiditySensor)
{
- bindHumidityName = device.DeviceEpointName;
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindHumidityName = device.DeviceEpointName;
+ }
+ else
+ {
+ bindHumidityName = bDev.ESName;
+ }
+
bindHumidityDev = device;
}
if (device.Type == DeviceType.PMSensor)
{
if (bDev.BindCluster == 1026)
{
- bindTemperatureName = device.DeviceEpointName;
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindTemperatureName = device.DeviceEpointName;
+ }
+ else
+ {
+ bindTemperatureName = bDev.ESName;
+ }
+
bindTemperatureDev = device;
}
if (bDev.BindCluster == 1029)
{
- bindHumidityName = device.DeviceEpointName;
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindHumidityName = device.DeviceEpointName;
+ }
+ else
+ {
+ bindHumidityName = bDev.ESName;
+ }
+
bindHumidityDev = device;
}
if (bDev.BindCluster == 1066)
{
- bindPmName = device.DeviceEpointName;
+ if (string.IsNullOrEmpty(bDev.ESName))
+ {
+ bindPmName = device.DeviceEpointName;
+ }
+ else
+ {
+ bindPmName = bDev.ESName;
+ }
+
bindPMDev = device;
}
}
--
Gitblit v1.8.0