From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs
index 1fb8732..1352422 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceInfoIconControl.cs
@@ -58,7 +58,7 @@
             //璁惧鍥炬爣
             btnIcon = new NormalViewControl(Application.GetMinRealAverage(121), Application.GetMinRealAverage(121), false);
             btnIcon.Gravity = Gravity.Center;
-            Common.LocalDevice.Current.SetDeviceBeloneIconToControl(btnIcon, Common.LocalDevice.Current.GetDevicesByMac(deviceMac));
+            Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, Common.LocalDevice.Current.GetDevicesByMac(deviceMac));
             this.AddChidren(btnIcon);
         }
 
@@ -95,7 +95,7 @@
             if (this.deviceMac != null)
             {
                 //鍒锋柊鍥炬爣
-                Common.LocalDevice.Current.SetDeviceBeloneIconToControl(btnIcon, Common.LocalDevice.Current.GetDevicesByMac(deviceMac));
+                Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, Common.LocalDevice.Current.GetDevicesByMac(deviceMac));
             }
             else
             {

--
Gitblit v1.8.0