From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs | 76 ++++++++------------------------------
1 files changed, 16 insertions(+), 60 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
index 1e1babd..9b4ae07 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/BelongAreaControl.cs
@@ -131,15 +131,9 @@
txtView.Y += chidrenYaxis;
}
- if (IsSharedRoom == true)
+ if (IsSharedRoom == true || this.listFloorKeys.Count == 0)
{
- //濡傛灉杩欎釜璁惧浣嶄簬鍒嗕韩鐨勬埧闂�
- this.UseClickStatu = false;
- return;
- }
- if (this.listFloorKeys.Count == 0 && listRoomKeys.Count == 0)
- {
- //鎴栬�呮牴鏈氨娌℃湁鍒涘缓鎴块棿锛屽垯涓嶅厑璁告洿鏀�
+ //濡傛灉杩欎釜璁惧浣嶄簬鍒嗕韩鐨勬埧闂�,鎴栬�呮牴鏈氨娌℃湁鍒涘缓鎴块棿锛屽垯涓嶅厑璁告洿鏀�
this.UseClickStatu = false;
return;
}
@@ -159,11 +153,14 @@
private void InitData()
{
var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
- if (dicFloor.Count == 0)
+ foreach (string fKeys in dicFloor.Keys)
{
- var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(string.Empty, false);
+ var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(fKeys, false);
if (listRoom.Count > 0)
{
+ //妤煎眰鍚嶅瓧鍜屼富閿敹闆�
+ this.listFloorKeys.Add(fKeys);
+ this.listFloorName.Add(dicFloor[fKeys]);
//鎴块棿鍚嶅瓧鍜屼富閿敹闆�
var listName = new List<string>();
var listKeys = new List<string>();
@@ -174,29 +171,6 @@
}
listRoomName.Add(listName);
listRoomKeys.Add(listKeys);
- }
- }
- else
- {
- foreach (string fKeys in dicFloor.Keys)
- {
- var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(fKeys, false);
- if (listRoom.Count > 0)
- {
- //妤煎眰鍚嶅瓧鍜屼富閿敹闆�
- this.listFloorKeys.Add(fKeys);
- this.listFloorName.Add(dicFloor[fKeys]);
- //鎴块棿鍚嶅瓧鍜屼富閿敹闆�
- var listName = new List<string>();
- var listKeys = new List<string>();
- foreach (var myRoom in listRoom)
- {
- listName.Add(myRoom.Name);
- listKeys.Add(myRoom.Id);
- }
- listRoomName.Add(listName);
- listRoomKeys.Add(listKeys);
- }
}
}
}
@@ -217,35 +191,17 @@
int index2 = this.listRoomKeys[index1].IndexOf(RoomKey);
if (index2 == -1) { index2 = 0; }
- if (this.listFloorKeys.Count == 0)
+ PickerView.ShowSecondary(this.listFloorName, this.listRoomName, (value1, value2) =>
{
- //鏃犳ゼ灞傛ā寮�
- PickerView.Show(this.listRoomName[0], (value) =>
- {
- //妤煎眰+鎴块棿
- txtView.Text = this.listRoomName[0][value];
- RoomKey = this.listRoomKeys[0][value];
- this.SelectRoomEvent?.Invoke(RoomKey);
+ //妤煎眰+鎴块棿
+ txtView.Text = this.listFloorName[value1] + " " + this.listRoomName[value1][value2];
+ FloorKey = this.listFloorKeys[value1];
+ RoomKey = this.listRoomKeys[value1][value2];
+ this.SelectRoomEvent?.Invoke(RoomKey);
- }, index2, i_caption,
- Language.StringByID(R.MyInternationalizationString.uFinish),
- Language.StringByID(R.MyInternationalizationString.uCancel));
- }
- else
- {
- //鏈夋ゼ灞傛ā寮�
- PickerView.ShowSecondary(this.listFloorName, this.listRoomName, (value1, value2) =>
- {
- //妤煎眰+鎴块棿
- txtView.Text = this.listFloorName[value1] + " " + this.listRoomName[value1][value2];
- FloorKey = this.listFloorKeys[value1];
- RoomKey = this.listRoomKeys[value1][value2];
- this.SelectRoomEvent?.Invoke(RoomKey);
-
- }, index1, index2, i_caption,
- Language.StringByID(R.MyInternationalizationString.uFinish),
- Language.StringByID(R.MyInternationalizationString.uCancel));
- }
+ }, index1, index2, i_caption,
+ Language.StringByID(R.MyInternationalizationString.uFinish),
+ Language.StringByID(R.MyInternationalizationString.uCancel));
}
#endregion
--
Gitblit v1.8.0