From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/Common/Controls/DeviceControls/DeviceRoomControl.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceRoomControl.cs b/ZigbeeApp/Shared/Phone/Common/Controls/DeviceControls/DeviceRoomControl.cs
similarity index 88%
rename from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceRoomControl.cs
rename to ZigbeeApp/Shared/Phone/Common/Controls/DeviceControls/DeviceRoomControl.cs
index 770343a..4f9dad4 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceRoomControl.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Controls/DeviceControls/DeviceRoomControl.cs
@@ -3,7 +3,7 @@
using System.Text;
using ZigBee.Device;
-namespace Shared.Phone.UserCenter
+namespace Shared.Phone
{
/// <summary>
/// 鍋氭垚涓�涓樉绀鸿澶囧洖璺�+鎴块棿鐨凴owLayout
@@ -21,7 +21,7 @@
/// </summary>
public CommonDevice device
{
- get { return Common.LocalDevice.Current.GetDevice(mainKey); }
+ get { return HdlDeviceCommonLogic.Current.GetDevice(mainKey); }
}
/// <summary>
/// 鍦ㄧ嚎鐘舵��
@@ -67,7 +67,7 @@
/// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
public DeviceRoomControl(CommonDevice i_device, int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
{
- this.mainKey = Common.LocalDevice.Current.GetDeviceMainKeys(i_device);
+ this.mainKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(i_device);
}
/// <summary>
@@ -78,7 +78,7 @@
/// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param>
public DeviceRoomControl(string deviceMac, int deviceEpoint, int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
{
- this.mainKey = Common.LocalDevice.Current.GetDeviceMainKeys(deviceMac, deviceEpoint);
+ this.mainKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(deviceMac, deviceEpoint);
}
/// <summary>
@@ -89,7 +89,7 @@
var tempDevice = device;
//鍥炬爣
btnIcon = frameTable.AddLeftIcon();
- Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, tempDevice);
+ HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, tempDevice);
//璁惧
btnDevie = frameTable.AddLeftCaption("", 600, 60);
@@ -99,7 +99,7 @@
frameTable.AddChidren(btnDevie, ChidrenBindMode.BindEvent);
if (tempDevice != null)
{
- btnDevie.Text = Common.LocalDevice.Current.GetDeviceEpointName(tempDevice);
+ btnDevie.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(tempDevice);
}
else
{
@@ -142,12 +142,12 @@
{
return;
}
- btnDevie.Text = Common.LocalDevice.Current.GetDeviceEpointName(tempDevice);
+ btnDevie.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(tempDevice);
btnRoom.Text = HdlRoomLogic.Current.GetRoomNameByDevice(tempDevice);
string unSelectPath = string.Empty;
string selectPath = string.Empty;
- Common.LocalDevice.Current.GetDeviceIcon(tempDevice, ref unSelectPath, ref selectPath);
+ HdlDeviceCommonLogic.Current.GetDeviceIcon(tempDevice, ref unSelectPath, ref selectPath);
btnIcon.UnSelectedImagePath = unSelectPath;
}
--
Gitblit v1.8.0