From 6a8e27a164158b31356b30c1e2947b95898275fe Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 20 十二月 2020 19:34:04 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs b/HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs
index 58130ee..6c86100 100644
--- a/HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs
+++ b/HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs
@@ -4,8 +4,14 @@
namespace HDL_ON
{
+ /// <summary>
+ /// 鎴块棿妤煎眰閫夋嫨寮圭獥
+ /// </summary>
public class FloorSelectPopupDialog
{
+ /// <summary>
+ ///
+ /// </summary>
public FloorSelectPopupDialog()
{
}
@@ -18,30 +24,35 @@
/// 浜岀骇鑱斿姩List
/// </summary>
List<List<RoomCellInfo>> mSecondList = new List<List<RoomCellInfo>>();
-
+
/// <summary>
- ///
+ /// 璇诲彇鏈湴妤煎眰鍜屾埧闂存暟鎹紝寮圭獥鏄剧ず
/// </summary>
+ /// <param name="selectAction">鍥炶皟閫変腑浜嬩欢锛屽洖璋冮�変腑鐨剈id</param>
+ /// <param name="selectTag">璁剧疆閫変腑鐨則ga鏍囪</param>
public void ShowView(Action<string> selectAction, string selectTag = DiySelectPopupDialog.ALLSELECT)
{
-
+ //妤煎眰闆嗗悎鏁版嵁
var floorList = SpatialInfo.CurrentSpatial.FloorList;
+ //鎴块棿闆嗗悎鏁版嵁
var roomList = SpatialInfo.CurrentSpatial.RoomList;
-
+ //鏍规嵁妤煎眰鍜屾埧闂存暟鎹粨鎯呭喌鍔犺浇瀵逛簬鏁堟灉寮圭獥
if (floorList == null || floorList.Count == 0)
{
//娌℃湁妤煎眰鍙姞杞芥埧闂�
if (roomList == null)
{
- Utlis.WriteLine("roomList null");
- return;
+ Utlis.WriteLine("floorList and roomList null");
+ roomList = new List<Room>();
}
mFirstList.Clear();
+ //閬嶅巻鎵�鏈夋埧闂村垪琛�
foreach (var room in roomList)
{
mFirstList.Add(new RoomCellInfo() { Title = room.roomName, TagId = room.uid });
}
+ //寮圭獥涓�绾ц仈鍔ㄩ�夋嫨绐楀彛
var roomSelectPopupDialog = new DiySelectPopupDialog();
roomSelectPopupDialog.ShowView(mFirstList, null, selectAction, selectTag);
}
@@ -52,6 +63,7 @@
//涓�绾ф暟缁勪负妤煎眰
foreach (var floor in floorList)
{
+ //閬嶅巻鎵�鏈夋ゼ灞傚垪琛ㄤ互鍙婃ゼ灞傛墍鍏宠仈鎴块棿鐨勫垪琛�
mFirstList.Add(new RoomCellInfo() { Title = floor.roomName, TagId = floor.uid });
var mList = new List<RoomCellInfo>();
var allRoom = roomList.FindAll((room) => room.parentId == floor.uid);
@@ -66,7 +78,7 @@
}
mSecondList.Add(mList);
}
-
+ //寮圭獥浜岀骇鑱斿姩閫夋嫨绐楀彛
var roomSelectPopupDialog = new DiySelectPopupDialog();
roomSelectPopupDialog.ShowView(mFirstList, mSecondList, selectAction, selectTag);
--
Gitblit v1.8.0