JLChen
2020-12-09 e87985ec1dcb69beedaf9f95e8e7aba14b7c08d6
HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
@@ -15,13 +15,16 @@
        {
            btnBack.MouseUpEventHandler = (sender, e) => {
                backAction?.Invoke();
                if (baseView != null)
                if (needClose)
                {
                    baseView.RemoveFromParent();
                }
                if (baseDialog != null)
                {
                    baseDialog.Close();
                    if (baseView != null)
                    {
                        baseView.RemoveFromParent();
                    }
                    if (baseDialog != null)
                    {
                        baseDialog.Close();
                    }
                }
            };
        }
@@ -41,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);