From 8e4dd3cdef1348bcf1285576bb946afb85ce2526 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期二, 08 十二月 2020 17:31:27 +0800 Subject: [PATCH] 增加分享设备的时候,判断当前房间分享设备总数,从而决定是否需要增加或者移除房间分享 --- HDL_ON/UI/UI0-Public/TopViewDivBLL.cs | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs index c2f6a6c..4620b7a 100644 --- a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs +++ b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs @@ -44,18 +44,18 @@ callBack("add", floorName); }; string newFloorName = "1F"; - for (int i = 0; i < DB_ResidenceData.residenceData.floors.Count + 1; ) + for (int i = 0; i < SpatialInfo.CurrentSpatial.FloorList.Count + 1; ) { newFloorName = ++i + "F"; - if (null == DB_ResidenceData.residenceData.floors.Find((obj)=>obj.name == newFloorName)) + if (null == SpatialInfo.CurrentSpatial.FloorList.Find((obj)=>obj.roomName == newFloorName)) { break; } } var fs = new List<string>(); - foreach(var f in DB_ResidenceData.residenceData.floors) + foreach(var f in SpatialInfo.CurrentSpatial.FloorList) { - fs.Add(f.name); + fs.Add(f.roomName); } new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors,newFloorName , callBackAction,StringId.FloorNameCannotBeEmpty, StringId.AddFloorFailed_FloorAlreadyExist,fs); -- Gitblit v1.8.0