From 9ef48d7b2da7c408b53f73be0f6eef3cbac1c84a Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 19 十一月 2020 10:23:45 +0800 Subject: [PATCH] Evoyo.Home1.1.0120111601_Release --- ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs | 53 +++++++---------------------------------------------- 1 files changed, 7 insertions(+), 46 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs index 6b6ac40..d175f2e 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs @@ -8,7 +8,7 @@ namespace Shared.Phone.UserCenter.DevicePanel { /// <summary> - /// 鏂规偊鏂伴闈㈡澘鐨勬寜閿厤缃晫闈� + /// 闈㈡澘鐨勬寜閿厤缃晫闈€�愯绫绘殏鏃惰垗寮冦�� /// </summary> public class PanelSimpleEnvironmentButtonSettionForm : EditorCommonForm { @@ -164,7 +164,7 @@ Application.RunOnMainThread(() => { - new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance); + new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance); }); } } @@ -221,15 +221,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) @@ -237,54 +229,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