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/DeviceInfoIconControl.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs b/ZigbeeApp/Shared/Phone/Common/Controls/DeviceControls/DeviceInfoIconControl.cs
similarity index 85%
rename from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs
rename to ZigbeeApp/Shared/Phone/Common/Controls/DeviceControls/DeviceInfoIconControl.cs
index 1ad53b0..1e6583c 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs
+++ b/ZigbeeApp/Shared/Phone/Common/Controls/DeviceControls/DeviceInfoIconControl.cs
@@ -3,7 +3,7 @@
using System.Text;
using ZigBee.Device;
-namespace Shared.Phone.UserCenter
+namespace Shared.Phone
{
/// <summary>
/// 璁惧淇℃伅鐣岄潰鐨勮澶囧浘鏍囨帶浠�(鍏煎缃戝叧)
@@ -63,15 +63,15 @@
this.AddChidren(btnIcon2, ChidrenBindMode.BindEvent);
//璁惧鍥炬爣
- var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
+ var listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(deviceMac);
if (listDevice.Count == 0)
{
//瀵瑰簲鍗曠函鍙湁200鍥炶矾鐨勮澶�
- listDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));
+ listDevice.Add(HdlDeviceCommonLogic.Current.GetOTADevice(deviceMac));
}
btnIcon = new NormalViewControl(this.GetPictrueRealSize(121), this.GetPictrueRealSize(121), false);
btnIcon.Gravity = Gravity.Center;
- Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);
+ HdlDeviceCommonLogic.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);
this.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
}
@@ -95,7 +95,7 @@
//璁惧鍥炬爣
btnIcon = new NormalViewControl(this.GetPictrueRealSize(121), this.GetPictrueRealSize(121), false);
btnIcon.Gravity = Gravity.Center;
- Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, Common.LocalDevice.Current.GetDevice(deviceMacAddr, epoint));
+ HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, HdlDeviceCommonLogic.Current.GetDevice(deviceMacAddr, epoint));
this.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
}
@@ -134,18 +134,18 @@
if (this.deviceEpoint != -1)
{
//鍒锋柊鍥炬爣
- Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, Common.LocalDevice.Current.GetDevice(this.deviceMac, this.deviceEpoint));
+ HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, HdlDeviceCommonLogic.Current.GetDevice(this.deviceMac, this.deviceEpoint));
}
else if (this.deviceMac != null)
{
//鍒锋柊鍥炬爣
- var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
+ var listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(deviceMac);
if (listDevice.Count == 0)
{
//瀵瑰簲鍗曠函鍙湁200鍥炶矾鐨勮澶�
- listDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));
+ listDevice.Add(HdlDeviceCommonLogic.Current.GetOTADevice(deviceMac));
}
- Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);
+ HdlDeviceCommonLogic.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);
}
else
{
--
Gitblit v1.8.0