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/DeviceControls/DeviceObjectControl.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Controls/DeviceControls/DeviceObjectControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs
similarity index 88%
rename from ZigbeeApp/Shared/Phone/Common/Controls/DeviceControls/DeviceObjectControl.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs
index 57bc490..58dffb7 100644
--- a/ZigbeeApp/Shared/Phone/Common/Controls/DeviceControls/DeviceObjectControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// 鍋氭垚涓�涓樉绀鸿澶囩被鍨�+璁惧MAC澶囨敞鐨凴owLayout
@@ -76,18 +76,18 @@
/// </summary>
public void InitControl()
{
- var listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(this.deviceMac);
+ var listDevice = Common.LocalDevice.Current.GetDevicesByMac(this.deviceMac);
if (listDevice.Count == 0)
{
//閽堝鍗曠函鍙湁涓�涓�200绔偣鐨勮澶�
- listDevice.Add(HdlDeviceCommonLogic.Current.GetOTADevice(this.deviceMac));
+ listDevice.Add(Common.LocalDevice.Current.GetOTADevice(this.deviceMac));
}
//鍥炬爣
btnIcon = frameTable.AddLeftIcon(81);
- HdlDeviceCommonLogic.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);
+ Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);
//璁惧
- string deviceName = HdlDeviceCommonLogic.Current.GetDeviceMacName(listDevice[0]);
+ string deviceName = Common.LocalDevice.Current.GetDeviceMacName(listDevice[0]);
btnDeviceName = frameTable.AddTopView(deviceName, 800);
frameTable.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);
@@ -99,7 +99,7 @@
frameTable.AddBottomLine();
//璁剧疆鍦ㄧ嚎鐘舵�佺殑鐗规晥
- this.IsOnline = HdlDeviceCommonLogic.Current.CheckDeviceIsOnline(listDevice[0]);
+ this.IsOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(listDevice[0]);
}
#endregion
@@ -134,16 +134,16 @@
}
hadRefresh = true;
- var listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(this.deviceMac);
+ var listDevice = Common.LocalDevice.Current.GetDevicesByMac(this.deviceMac);
if (listDevice.Count == 0)
{
//閽堝鍗曠函鍙湁涓�涓�200绔偣鐨勮澶�
- listDevice.Add(HdlDeviceCommonLogic.Current.GetOTADevice(this.deviceMac));
+ listDevice.Add(Common.LocalDevice.Current.GetOTADevice(this.deviceMac));
}
//鍥炬爣
- HdlDeviceCommonLogic.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);
+ Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);
//璁惧
- btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceMacName(listDevice[0]);
+ btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceMacName(listDevice[0]);
//璁惧鎴块棿
btnDeviceRoom.Text = HdlRoomLogic.Current.GeteRealDeviceRoomName(listDevice[0]);
}
--
Gitblit v1.8.0