Merge branch 'CJL'

wxr

2020-11-20 f4b178e64fd43262872fe9d443aa9da6048ceaac

 HDL_ON/UI/UI0-Public/TopViewDivBLL.cs

@@ -26,23 +26,12 @@
            };
        }

        /// <summary>
        /// 顶部按钮跳转功能配置页面
        /// </summary>
        /// <param name="function"></param>
        void LoadEvent_SkipFunctionSetting(Function function)
        {
            var infoView = new FunctionBaseInfoSetPage(function,backAction);
            MainPage.BasePageView.AddChidren(infoView);
            infoView.LoadPage();
            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
        }

        /// <summary>
        /// 顶部添加按钮点击事件
        /// </summary>
        /// <param name="type">添加按钮的功能类型</param>
        void LoadEvent_AddEvent(string type,Action <string,string> callBack)
        void LoadEvent_AddEvent(string type, Action<string, string> callBack)
        {
            switch (type)
            {
@@ -51,30 +40,30 @@
                    {
                        callBack("add", floorName);
                    };
                    string newFloorName = "1 F";
                    for (int i = 0; i < DB_ResidenceData.residenceData.floors.Count + 1; )
                    string newFloorName = "1F";
                    for (int i = 0; i < DB_ResidenceData.residenceData.floors.Count + 1;)
                    {
                        newFloorName = ++i + " F";
                        if (null != DB_ResidenceData.residenceData.floors.Find((obj)=>obj.name ==  newFloorName))
                        newFloorName = ++i + "F";
                        if (null == DB_ResidenceData.residenceData.floors.Find((obj) => obj.name == newFloorName))
                        {
                            break;
                        }
                    }
                    var fs = new List<string>();
                    foreach(var f in DB_ResidenceData.residenceData.floors)
                    foreach (var f in DB_ResidenceData.residenceData.floors)
                    {
                        fs.Add(f.name);
                    }
                    new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors,newFloorName , callBackAction,StringId.FloorNameCannotBeEmpty,
                        StringId.AddFloorFailed_FloorAlreadyExist,fs);
                    new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors, newFloorName, callBackAction, StringId.FloorNameCannotBeEmpty,
                        StringId.AddFloorFailed_FloorAlreadyExist, fs);
                    break;
                case "rooms":
                    callBack("", "");
                    break;
                case "Member":
                    callBack("","");
                    callBack("", "");
                    break;
                

            }
        }