From 5b0a842cbdc5dc54e45e5d350d3516d0cdd59199 Mon Sep 17 00:00:00 2001 From: lss <lsc@hdlchina.com.cn> Date: 星期一, 25 四月 2022 14:50:07 +0800 Subject: [PATCH] 2022-4-25 --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs index f335816..2eee023 100644 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs @@ -237,11 +237,17 @@ strType = Language.StringByID(R.MyInternationalizationString.AirerFun); nowSelectNo = -1; } - else if (this.device.Type == DeviceType.PMSensor) + else if (device.Type == DeviceType.TemperatureSensor) { - //绌烘皵璐ㄩ噺浼犳劅鍣� 鐜 - strType = Language.StringByID(R.MyInternationalizationString.Envoronment); - nowSelectNo = -1; + //鑾峰彇璁惧绫诲瀷 + var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device }); + //绌烘皵璐ㄩ噺浼犳劅鍣� + if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor) + { + //绌烘皵璐ㄩ噺浼犳劅鍣� 鐜 + strType = Language.StringByID(R.MyInternationalizationString.Envoronment); + nowSelectNo = -1; + } } //鏄剧ず鏂囨湰 @@ -274,6 +280,18 @@ { return true; } + //绌烘皵璐ㄩ噺浼犳劅鍣� + if (this.device.Type == DeviceType.TemperatureSensor) + { + //鑾峰彇璁惧绫诲瀷 + var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device }); + //绌烘皵璐ㄩ噺浼犳劅鍣� + if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor) + { + return true; + } + } + return false; } -- Gitblit v1.8.0