From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
similarity index 91%
rename from ZigbeeApp/Shared/Phone/Common/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
index 9719d61..f335816 100644
--- a/ZigbeeApp/Shared/Phone/Common/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
@@ -3,7 +3,7 @@
using System.Text;
using ZigBee.Device;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// 璁惧鍔熻兘绫诲瀷鐨勮嚜瀹氫箟琛屾帶浠�
@@ -127,7 +127,7 @@
HdlThreadLogic.Current.RunThread(() =>
{
//璁剧疆鍔熻兘绫诲瀷鍒扮綉鍏�
- var result = HdlDeviceCommonLogic.Current.SendDeviceFunctionTypeToGateway(this.device, (DeviceFunctionType)nowSelectNo);
+ var result = Common.LocalDevice.Current.SendDeviceFunctionTypeToGateway(this.device, (DeviceFunctionType)nowSelectNo);
HdlThreadLogic.Current.RunMain(() =>
{
@@ -194,28 +194,28 @@
|| this.device.Type == DeviceType.DimmableLight)
{
//鐏厜绫诲浐瀹氫负 鐏厜
- var infoContent = HdlDeviceCommonLogic.Current.GetDeviceModelIdNameInfo("A418");
+ var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A418");
strType = infoContent != null ? infoContent.A瀹樻柟鍚嶅瓧 : string.Empty;
nowSelectNo = 2;
}
else if (this.device.Type == DeviceType.WindowCoveringDevice)
{
//绐楀笜鍥哄畾涓� 閬槼
- var infoContent = HdlDeviceCommonLogic.Current.GetDeviceModelIdNameInfo("A400");
+ var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A400");
strType = infoContent != null ? infoContent.A瀹樻柟鍚嶅瓧 : string.Empty;
nowSelectNo = -1;
}
else if (this.device.Type == DeviceType.Thermostat)
{
//绌鸿皟鍥哄畾涓� 绌鸿皟
- var infoContent = HdlDeviceCommonLogic.Current.GetDeviceModelIdNameInfo("A406");
+ var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A406");
strType = infoContent != null ? infoContent.A瀹樻柟鍚嶅瓧 : string.Empty;
nowSelectNo = -1;
}
else if (this.device.Type == DeviceType.DoorLock)
{
//闂ㄩ攣鍥哄畾涓� 闂ㄩ攣
- var infoContent = HdlDeviceCommonLogic.Current.GetDeviceModelIdNameInfo("A405");
+ var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A405");
strType = infoContent != null ? infoContent.A瀹樻柟鍚嶅瓧 : string.Empty;
nowSelectNo = -1;
}
@@ -229,6 +229,18 @@
{
//PM2.5浼犳劅鍣ㄥ浐瀹氫负 绌烘皵璐ㄩ噺
strType = Language.StringByID(R.MyInternationalizationString.AirQuality);
+ nowSelectNo = -1;
+ }
+ else if (this.device.Type == DeviceType.Airer)
+ {
+ //鏅捐。鏋�
+ strType = Language.StringByID(R.MyInternationalizationString.AirerFun);
+ nowSelectNo = -1;
+ }
+ else if (this.device.Type == DeviceType.PMSensor)
+ {
+ //绌烘皵璐ㄩ噺浼犳劅鍣� 鐜
+ strType = Language.StringByID(R.MyInternationalizationString.Envoronment);
nowSelectNo = -1;
}
@@ -256,6 +268,7 @@
|| this.device.Type == DeviceType.Thermostat//绌鸿皟
|| this.device.Type == DeviceType.FreshAir//鏂伴
|| this.device.Type == DeviceType.PMSensor //PM2.5
+ || this.device.Type == DeviceType.Airer//鏅捐。鏋�
|| this.device.Type == DeviceType.ColorTemperatureLight //鑹叉俯鐏�
|| this.device.Type == DeviceType.WindowCoveringDevice)//绐楀笜
{
@@ -347,7 +360,7 @@
HdlThreadLogic.Current.RunThread(() =>
{
//璇诲彇璁惧鍔熻兘绫诲瀷
- var info = HdlDeviceCommonLogic.Current.ReadDeviceEpointDeviceInfo(this.device);
+ var info = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(this.device);
if (info != null && ((int)this.device.DfunctionType) != info.FunctionType)
{
this.device.DfunctionType = (DeviceFunctionType)info.FunctionType;
--
Gitblit v1.8.0