From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期五, 12 六月 2020 09:22:04 +0800
Subject: [PATCH] 2020.06.12
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSelectControl.cs | 40 ++++------------------------------------
1 files changed, 4 insertions(+), 36 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSelectControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSelectControl.cs
index 0436869..1059d0e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSelectControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceSelectControl.cs
@@ -20,14 +20,6 @@
get { return Common.LocalDevice.Current.GetDevice(MainKeys); }
}
/// <summary>
- /// 鎴块棿鎺т欢
- /// </summary>
- private NormalViewControl btnRoom = null;
- /// <summary>
- /// 璁惧鎺т欢
- /// </summary>
- private NormalViewControl btnDevie = null;
- /// <summary>
/// 閫夋嫨鎺т欢
/// </summary>
private MostRightIconControl btnSelect = null;
@@ -71,7 +63,7 @@
/// </summary>
/// <param name="i_device">璁惧瀵硅薄</param>
/// <param name="autoSelect">褰撶偣鍑绘鎺т欢鏃�,鏄惁鑷姩璁剧疆閫夋嫨鐘舵��</param>
- /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param>
+ /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
public DeviceSelectControl(CommonDevice i_device, bool autoSelect, int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
{
this.MainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(i_device);
@@ -95,20 +87,11 @@
//璁惧
string eName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- btnDevie = this.AddLeftCaption(eName, 850, 60);
- btnDevie.TextSize = 15;
- //杩欎釜鍧愭爣鏈夌偣鐗规畩
- btnDevie.Y = Application.GetRealHeight(12) + this.chidrenYaxis;
- this.AddChidren(btnDevie, ChidrenBindMode.BindEventOnly);
+ this.AddTopView(eName, 850);
//鎴块棿
- string roomName = Common.Room.CurrentRoom.GetRoomNameByDevice(device);
- btnRoom = this.AddLeftCaption(roomName, 850, 50, true);
- //杩欎釜鍧愭爣鏈夌偣鐗规畩
- btnRoom.Y = Application.GetRealHeight(72) + this.chidrenYaxis;
- btnRoom.TextSize = 12;
- btnRoom.TextColor = UserCenterColor.Current.TextGrayColor1;
- this.AddChidren(btnRoom, ChidrenBindMode.BindEventOnly);
+ string roomName = HdlRoomLogic.Current.GetRoomNameByDevice(device);
+ this.AddBottomView(roomName, 850);
btnSelect = this.AddMostRightEmptyIcon(58, 58);
btnSelect.Visible = false;
@@ -149,21 +132,6 @@
#endregion
#region 鈻� 涓�鑸柟娉昣__________________________
-
- /// <summary>
- /// 绉婚櫎鎴块棿鎺т欢
- /// </summary>
- public void RemoveRoomControl()
- {
- //绉婚櫎浜嬩欢
- this.ChangedChidrenBindMode(btnRoom, ChidrenBindMode.NotBind);
- this.btnRoom.RemoveFromParent();
- this.btnDevie.Gravity = Gravity.CenterVertical;
- if (chidrenYaxis != 0)
- {
- this.btnDevie.Y += chidrenYaxis;
- }
- }
#endregion
}
--
Gitblit v1.8.0