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/DeviceSimpleSelectControl.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Controls/DeviceControls/DeviceSimpleSelectControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSimpleSelectControl.cs
similarity index 90%
rename from ZigbeeApp/Shared/Phone/Common/Controls/DeviceControls/DeviceSimpleSelectControl.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSimpleSelectControl.cs
index 4de3e99..0cf1a54 100644
--- a/ZigbeeApp/Shared/Phone/Common/Controls/DeviceControls/DeviceSimpleSelectControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSimpleSelectControl.cs
@@ -3,7 +3,7 @@
using System.Text;
using ZigBee.Device;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// 鍋氭垚涓�涓畝鍗曡澶囬�夋嫨鐨勮鎺т欢
@@ -17,7 +17,7 @@
/// </summary>
public CommonDevice device
{
- get { return HdlDeviceCommonLogic.Current.GetDevice(MainKeys); }
+ get { return Common.LocalDevice.Current.GetDevice(MainKeys); }
}
/// <summary>
/// 閫夋嫨鎺т欢
@@ -66,7 +66,7 @@
/// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
public DeviceSimpleSelectControl(CommonDevice i_device, bool autoSelect, int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
{
- this.MainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(i_device);
+ this.MainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(i_device);
if (autoSelect == true)
{
this.ButtonClickEvent += (sender, e) =>
@@ -83,10 +83,10 @@
{
//鍥炬爣
var btnIcon = this.AddLeftIcon();
- HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, device);
+ Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, device);
//璁惧
- string eName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
+ string eName = Common.LocalDevice.Current.GetDeviceEpointName(device);
this.AddLeftCaption(eName, 850);
btnSelect = this.AddMostRightEmptyIcon(58, 58);
--
Gitblit v1.8.0