From cca9ba03381aaf0ddb599eaa0e0c632c2cfff09a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 22 九月 2020 10:36:44 +0800
Subject: [PATCH] 代码还原回来
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs | 120 ++++++-----------------------------------------------------
1 files changed, 13 insertions(+), 107 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs
index 8dae4d2..db3ee0e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs
@@ -170,7 +170,7 @@
this.AddTemperatureSensorRow();
//娣诲姞婀垮害鏉ユ簮
this.AddHumiditySourceRow();
- //浜害璋冭妭
+ //鏁版嵁鐭
this.DataCorrectionRow();
//浜害璋冭妭
this.AddLevelRow();
@@ -260,15 +260,7 @@
{
continue;
}
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindAcName = bDev.ESName;
- }
-
+ bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindAcDev = device;
}
else if (device.Type == DeviceType.FreshAir)
@@ -280,15 +272,7 @@
{
continue;
}
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindFreshAirName = bDev.ESName;
- }
-
+ bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindFreshAirDev = device;
}
else if (device.Type == DeviceType.TemperatureSensor)
@@ -296,41 +280,18 @@
var bD = device as TemperatureSensor;
if (bD.SensorDiv == 1)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindTemperatureName = bDev.ESName;
- }
+ bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindTemperatureDev = device;
}
if (bD.SensorDiv == 2)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindHumidityName = bDev.ESName;
- }
-
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindHumidityDev = device;
}
}
else if (device.Type == DeviceType.FreshAirHumiditySensor)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindHumidityName = bDev.ESName;
- }
-
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindHumidityDev = device;
}
else if (device.Type == DeviceType.PMSensor)
@@ -347,15 +308,7 @@
}
if (bDev.BindCluster == 1066)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindPmName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindPmName = bDev.ESName;
- }
-
+ bindPmName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindPMDev = device;
}
}
@@ -406,15 +359,7 @@
{
continue;
}
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindAcName = bDev.ESName;
- }
-
+ bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindAcDev = device;
}
else if (device.Type == DeviceType.FreshAir)
@@ -426,15 +371,7 @@
{
continue;
}
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindFreshAirName = bDev.ESName;
- }
-
+ bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindFreshAirDev = device;
}
else if (device.Type == DeviceType.TemperatureSensor)
@@ -442,54 +379,23 @@
var bD = device as TemperatureSensor;
if (bD.SensorDiv == 1)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindTemperatureName = bDev.ESName;
- }
+ bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindTemperatureDev = device;
}
if (bD.SensorDiv == 2)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindHumidityName = bDev.ESName;
- }
-
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindHumidityDev = device;
}
}
else if (device.Type == DeviceType.FreshAirHumiditySensor)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindHumidityName = bDev.ESName;
- }
-
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindHumidityDev = device;
}
else if (device.Type == DeviceType.Thermostat)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindAcName = bDev.ESName;
- }
-
+ bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindAcDev = device;
}
else if (device.Type == DeviceType.PMSensor)
--
Gitblit v1.8.0