From 2450c12c825ad4d78d1572da2fa421706db2df2f Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 18 六月 2020 16:01:14 +0800
Subject: [PATCH] 新代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
index cf71a30..f667767 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
@@ -47,11 +47,22 @@
/// <summary>
/// 鎵�灞炲尯鍩熺殑鎺т欢
/// </summary>
- /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param>
+ /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
public BelongAreaControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
{
//鍒濆鍖栨暟鎹�
this.InitData();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栨帶浠�(閽堝鐨勬槸鍦烘櫙)
+ /// </summary>
+ /// <param name="i_caption">鏍囬鏂囨湰</param>
+ /// <param name="i_roomId">鎴块棿ID</param>
+ public void InitControl(string i_caption, string i_roomId)
+ {
+ var room = HdlRoomLogic.Current.GetRoomById(i_roomId);
+ this.DoInitControl(i_caption, room);
}
/// <summary>
@@ -62,7 +73,7 @@
public void InitControl(string i_caption, ZigBee.Device.ZbGateway i_gateway)
{
var room = HdlGatewayLogic.Current.GetRoomByGateway(i_gateway);
- this.InitControl(i_caption, room);
+ this.DoInitControl(i_caption, room);
}
/// <summary>
@@ -73,7 +84,7 @@
public void InitControl(string i_caption, ZigBee.Device.CommonDevice i_device)
{
var room = HdlRoomLogic.Current.GetRoomByDevice(i_device);
- this.InitControl(i_caption, room);
+ this.DoInitControl(i_caption, room);
}
/// <summary>
@@ -84,7 +95,7 @@
public void InitControl(string i_caption, List<ZigBee.Device.CommonDevice> i_listDevice)
{
var room = Common.LocalDevice.Current.GeteRealDeviceRoom(i_listDevice[0]);
- this.InitControl(i_caption, room);
+ this.DoInitControl(i_caption, room);
}
/// <summary>
@@ -92,7 +103,7 @@
/// </summary>
/// <param name="i_caption"></param>
/// <param name="i_Room"></param>
- private void InitControl(string i_caption, Common.Room i_Room)
+ private void DoInitControl(string i_caption, Common.Room i_Room)
{
if (i_Room == null)
{
@@ -126,7 +137,7 @@
btnCaption.X = ControlCommonResourse.XXLeft;
btnCaption.Gravity = Gravity.CenterVertical;
btnCaption.Text = i_caption + "锛�";
- this.AddChidren(btnCaption, ChidrenBindMode.BindEventOnly);
+ this.AddChidren(btnCaption, ChidrenBindMode.BindEvent);
//鏄剧ず妗�
var txtView = new NormalViewControl(700, true);
@@ -134,7 +145,7 @@
txtView.Gravity = Gravity.CenterVertical;
txtView.TextColor = UserCenterColor.Current.TextGrayColor1;
txtView.Text = i_RoomName;
- this.AddChidren(txtView, ChidrenBindMode.BindEventOnly);
+ this.AddChidren(txtView, ChidrenBindMode.BindEvent);
if (chidrenYaxis != 0)
{
--
Gitblit v1.8.0