From 5428935270159bfc42c2934ed7fb1091554fc9a4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 七月 2020 17:12:42 +0800
Subject: [PATCH] 修改了 sokect
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs | 171 ++++++++++++--------------------------------------------
1 files changed, 37 insertions(+), 134 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
index f667767..8bbe274 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
@@ -20,25 +20,9 @@
/// </summary>
public string RoomKey = string.Empty;
/// <summary>
- /// 褰撳墠閫夋嫨鐨勬ゼ灞備富閿�(娌″繀瑕佸叕寮�鍑哄幓)
+ /// 鏄剧ず鏂囨湰
/// </summary>
- private string FloorKey = string.Empty;
- /// <summary>
- /// 妤煎眰鍒楄〃鍚嶅瓧
- /// </summary>
- private List<string> listFloorName = new List<string>();
- /// <summary>
- /// 妤煎眰鍒楄〃涓婚敭
- /// </summary>
- private List<string> listFloorKeys = new List<string>();
- /// <summary>
- /// 鎴块棿鍚嶅瓧
- /// </summary>
- private List<List<string>> listRoomName = new List<List<string>>();
- /// <summary>
- /// 鎴块棿涓婚敭
- /// </summary>
- private List<List<string>> listRoomKeys = new List<List<string>>();
+ private NormalViewControl btnTextView = null;
#endregion
@@ -50,8 +34,6 @@
/// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(銆愬垪琛ㄦ帶浠剁殑rowSpace/2銆戝嵆鍙�,涓嶆噦榛樿涓�0鍗冲彲)</param>
public BelongAreaControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
{
- //鍒濆鍖栨暟鎹�
- this.InitData();
}
/// <summary>
@@ -114,7 +96,6 @@
{
string roomName = i_Room.Name;
this.RoomKey = i_Room.Id;
- this.FloorKey = i_Room.FloorId;
if (Common.Config.Instance.Home.FloorDics.ContainsKey(i_Room.FloorId) == true)
{
//妤煎眰+鎴块棿
@@ -140,17 +121,17 @@
this.AddChidren(btnCaption, ChidrenBindMode.BindEvent);
//鏄剧ず妗�
- var txtView = new NormalViewControl(700, true);
- txtView.X = Application.GetRealWidth(294);
- txtView.Gravity = Gravity.CenterVertical;
- txtView.TextColor = UserCenterColor.Current.TextGrayColor1;
- txtView.Text = i_RoomName;
- this.AddChidren(txtView, ChidrenBindMode.BindEvent);
+ this.btnTextView = new NormalViewControl(700, true);
+ btnTextView.X = Application.GetRealWidth(294);
+ btnTextView.Gravity = Gravity.CenterVertical;
+ btnTextView.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnTextView.Text = i_RoomName;
+ this.AddChidren(btnTextView, ChidrenBindMode.BindEvent);
if (chidrenYaxis != 0)
{
btnCaption.Y += chidrenYaxis;
- txtView.Y += chidrenYaxis;
+ btnTextView.Y += chidrenYaxis;
}
if (IsSharedRoom == true)
@@ -159,74 +140,15 @@
this.UseClickStatu = false;
return;
}
- if (this.listFloorKeys.Count == 0 && listRoomKeys.Count == 0)
- {
- //鎴栬�呮牴鏈氨娌℃湁鍒涘缓鎴块棿锛屽垯涓嶅厑璁告洿鏀�
- this.UseClickStatu = false;
- return;
- }
+
//鍙崇澶�
this.AddRightArrow();
this.ButtonClickEvent += (sender, e) =>
{
//鍖哄煙閫夋嫨
- this.ShowSelectRoom(txtView, i_caption);
+ this.ShowSelectRoom(btnTextView, i_caption);
};
- }
-
- /// <summary>
- /// 鍒濆鍖栨暟鎹�
- /// </summary>
- private void InitData()
- {
- var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
- if (dicFloor.Count == 0)
- {
- //绗竴浣嶉粯璁ゆ坊鍔犳湭鍒嗛厤
- var listKeys = new List<string>() { "" };
- var listName = new List<string>() { Language.StringByID(R.MyInternationalizationString.uUndistributed) };
- //鎴块棿鍚嶅瓧鍜屼富閿敹闆�
- var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(string.Empty, false);
- foreach (var myRoom in listRoom)
- {
- listName.Add(myRoom.Name);
- listKeys.Add(myRoom.Id);
- }
- listRoomName.Add(listName);
- listRoomKeys.Add(listKeys);
- }
- else
- {
- //绗竴浣嶉粯璁ゆ坊鍔犳湭鍒嗛厤(鏈垎閰嶆斁鍦ㄦゼ灞傞偅涓彍鍗�)
- var listKeys = new List<string>() { "" };
- var listName = new List<string>() { "" };
- listRoomName.Add(listName);
- listRoomKeys.Add(listKeys);
- this.listFloorKeys.Add("");
- this.listFloorName.Add(Language.StringByID(R.MyInternationalizationString.uUndistributed));
-
- foreach (string fKeys in dicFloor.Keys)
- {
- var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(fKeys, false);
- if (listRoom.Count > 0)
- {
- //妤煎眰鍚嶅瓧鍜屼富閿敹闆�
- this.listFloorKeys.Add(fKeys);
- this.listFloorName.Add(dicFloor[fKeys]);
- //鎴块棿鍚嶅瓧鍜屼富閿敹闆�
- listName = new List<string>();
- listKeys = new List<string>();
- foreach (var myRoom in listRoom)
- {
- listName.Add(myRoom.Name);
- listKeys.Add(myRoom.Id);
- }
- listRoomName.Add(listName);
- listRoomKeys.Add(listKeys);
- }
- }
- }
}
#endregion
@@ -240,58 +162,39 @@
/// <param name="i_caption"></param>
private void ShowSelectRoom(NormalViewControl txtView, string i_caption)
{
- int index1 = this.listFloorKeys.IndexOf(FloorKey);
- if (index1 == -1) { index1 = 0; }
- int index2 = this.listRoomKeys[index1].IndexOf(RoomKey);
- if (index2 == -1) { index2 = 0; }
-
- if (this.listFloorKeys.Count == 0)
+ //鏄剧ず搴曢儴寮圭獥鐨勬埧闂村垪琛�
+ var result = HdlControlLogic.Current.ShowBottomListRoomView(this.RoomKey, i_caption, (selectId, selectName) =>
{
- //鏃犳ゼ灞傛ā寮�
- PickerView.Show(this.listRoomName[0], (value) =>
- {
- RoomKey = this.listRoomKeys[0][value];
- if (RoomKey != string.Empty)
- {
- //鎴块棿
- txtView.Text = this.listRoomName[0][value];
- }
- else
- {
- txtView.Text = Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
- }
- this.SelectRoomEvent?.Invoke(RoomKey);
-
- }, index2, i_caption,
- Language.StringByID(R.MyInternationalizationString.uFinish),
- Language.StringByID(R.MyInternationalizationString.uCancel));
- }
- else
+ this.RoomKey = selectId;
+ txtView.Text = selectName;
+ //璋冪敤鍥炶皟鍑芥暟
+ this.SelectRoomEvent?.Invoke(RoomKey);
+ });
+ if (result == false)
{
- //鏈夋ゼ灞傛ā寮�
- PickerView.ShowSecondary(this.listFloorName, this.listRoomName, (value1, value2) =>
- {
- FloorKey = this.listFloorKeys[value1];
- RoomKey = this.listRoomKeys[value1][value2];
- if (RoomKey != string.Empty)
- {
- //妤煎眰+鎴块棿
- txtView.Text = this.listFloorName[value1] + " " + this.listRoomName[value1][value2];
- }
- else
- {
- txtView.Text = Language.StringByID(R.MyInternationalizationString.uDeviceNotAssignedRoom);
- }
- this.SelectRoomEvent?.Invoke(RoomKey);
-
- }, index1, index2, i_caption,
- Language.StringByID(R.MyInternationalizationString.uFinish),
- Language.StringByID(R.MyInternationalizationString.uCancel));
+ //鎴栬�呮牴鏈氨娌℃湁鍒涘缓鎴块棿锛屽垯涓嶅厑璁告洿鏀�
+ this.UseClickStatu = false;
}
}
#endregion
+ #region 鈻� 鍒锋柊鎺т欢___________________________
+
+ /// <summary>
+ /// 閲嶆柊鍒锋柊鎺т欢
+ /// </summary>
+ /// <param name="i_RoomId">鎸囧畾浠ュ摢涓埧闂碔D鍒锋柊鎺т欢</param>
+ public void RefreshControl(string i_RoomId)
+ {
+ this.RoomKey = i_RoomId;
+
+ var room = HdlRoomLogic.Current.GetRoomById(i_RoomId);
+ this.btnTextView.Text = HdlRoomLogic.Current.GetRoomName(room);
+ }
+
+ #endregion
+
#region 鈻� 鎺т欢鎽ф瘉___________________________
/// <summary>
--
Gitblit v1.8.0