20201202

wei

2020-12-02 30b5770f56f99c1f92e933ad31cf7d2af58b033c

 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 < Floor.InsFloor.Floors.Count + 1; )
                    {
                        newFloorName = ++i + "F";
                        if (null == DB_ResidenceData.residenceData.floors.Find((obj)=>obj.name ==  newFloorName))
                        if (null == Floor.InsFloor.Floors.Find((obj)=>obj.roomName ==  newFloorName))
                        {
                            break;
                        }
                    }
                    var fs = new List<string>();
                    foreach(var f in DB_ResidenceData.residenceData.floors)
                    foreach(var f in Floor.InsFloor.Floors)
                    {
                        fs.Add(f.name);
                        fs.Add(f.roomName);
                    }
                    new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors,newFloorName , callBackAction,StringId.FloorNameCannotBeEmpty,
                        StringId.AddFloorFailed_FloorAlreadyExist,fs);