From e96e11d6f8b965ea522c983e040d41e3b9ef105a Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 18 五月 2020 21:33:19 +0800
Subject: [PATCH] 2020-05-18-4
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceRoomControl.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceRoomControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceRoomControl.cs
index 1bb995a..9dcce0d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceRoomControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceRoomControl.cs
@@ -61,7 +61,7 @@
/// 鍋氭垚涓�涓樉绀鸿澶囧洖璺�+鎴块棿鐨凴owLayout
/// </summary>
/// <param name="i_device">璁惧瀵硅薄</param>
- /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param>
+ /// <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);
@@ -114,7 +114,7 @@
frameTable.AddChidren(btnRoom, ChidrenBindMode.BindEventOnly);
if (tempDevice != null)
{
- btnRoom.Text = Common.Room.CurrentRoom.GetRoomNameByDevice(tempDevice);
+ btnRoom.Text = HdlRoomLogic.Current.GetRoomNameByDevice(tempDevice);
}
else
{
@@ -140,7 +140,7 @@
return;
}
btnDevie.Text = Common.LocalDevice.Current.GetDeviceEpointName(tempDevice);
- btnRoom.Text = Common.Room.CurrentRoom.GetRoomNameByDevice(tempDevice);
+ btnRoom.Text = HdlRoomLogic.Current.GetRoomNameByDevice(tempDevice);
string unSelectPath = string.Empty;
string selectPath = string.Empty;
--
Gitblit v1.8.0