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/CompoundControls/BelongAreaControl.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Controls/CompoundControls/BelongAreaControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
similarity index 98%
rename from ZigbeeApp/Shared/Phone/Common/Controls/CompoundControls/BelongAreaControl.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
index d852e8e..ac2cda2 100644
--- a/ZigbeeApp/Shared/Phone/Common/Controls/CompoundControls/BelongAreaControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// 鎵�灞炲尯鍩熺殑鎺т欢
@@ -54,7 +54,7 @@
/// <param name="i_gateway">缃戝叧瀵硅薄</param>
public void InitControl(string i_caption, ZigBee.Device.ZbGateway i_gateway)
{
- var room = HdlRoomLogic.Current.GetRoomByGateway(i_gateway.GwId);
+ var room = HdlRoomLogic.Current.GetRoomByGateway(i_gateway);
this.DoInitControl(i_caption, room);
}
@@ -115,7 +115,7 @@
{
//鏍囬
var btnCaption = new NormalViewControl(270, 58, true);
- btnCaption.X = HdlControlResourse.XXLeft;
+ btnCaption.X = ControlCommonResourse.XXLeft;
btnCaption.Gravity = Gravity.CenterVertical;
btnCaption.Text = i_caption + "锛�";
this.AddChidren(btnCaption, ChidrenBindMode.BindEvent);
--
Gitblit v1.8.0