From f5ba05c33393e55de28db91433901600bfb0658f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 22 五月 2020 17:43:11 +0800
Subject: [PATCH] 请合并最新代码「20200522:添加门锁晚上9点上报常开功能,优化PM2.5测试功能」

---
 ZigbeeApp20200519/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ZigbeeApp20200519/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs b/ZigbeeApp20200519/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
old mode 100755
new mode 100644
index 2832b5d..346a4fe
--- a/ZigbeeApp20200519/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
+++ b/ZigbeeApp20200519/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
@@ -261,7 +261,7 @@
                         }
                         if (string.IsNullOrEmpty(bDev.ESName))
                         {
-                            bindFreshAirName = device.DeviceEpointName;
+                            bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                         }
                         else
                         {
@@ -277,7 +277,7 @@
                         {
                             if (string.IsNullOrEmpty(bDev.ESName))
                             {
-                                bindTemperatureName = device.DeviceEpointName;
+                                bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                             }
                             else
                             {
@@ -289,7 +289,7 @@
                         {
                             if (string.IsNullOrEmpty(bDev.ESName))
                             {
-                                bindHumidityName = device.DeviceEpointName;
+                                bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                             }
                             else
                             {
@@ -303,7 +303,7 @@
                     {
                         if (string.IsNullOrEmpty(bDev.ESName))
                         {
-                            bindHumidityName = device.DeviceEpointName;
+                            bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                         }
                         else
                         {
@@ -328,7 +328,7 @@
                         {
                             if (string.IsNullOrEmpty(bDev.ESName))
                             {
-                                bindPmName = device.DeviceEpointName;
+                                bindPmName = Common.LocalDevice.Current.GetDeviceEpointName(device);
                             }
                             else
                             {

--
Gitblit v1.8.0