diff --git a/Runtime/FlipPage/FlipPageComponentManager.cs b/Runtime/FlipPage/FlipPageComponentManager.cs index e79b342..0a05bfd 100644 --- a/Runtime/FlipPage/FlipPageComponentManager.cs +++ b/Runtime/FlipPage/FlipPageComponentManager.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Collections.Generic; using System.ComponentModel; using System.Linq; @@ -44,7 +45,7 @@ namespace XericUI.FlipPage [Tooltip("候选页按最多数量展示")] [SerializeField] protected bool inMaximumCandidatesNumber = false; - + /// /// 首页按钮 /// @@ -81,12 +82,11 @@ namespace XericUI.FlipPage /// 总页面数量文本 /// #if ODIN_INSPECTOR - [Space(2)] - [LabelText("总页面数量文本")] [BoxGroup("组件")] + [Space(2)] [LabelText("总页面数量文本")] [BoxGroup("组件")] #endif public ObjectVessel labelTextTotalPageCount = new ObjectVessel(); - + /// /// 总页面数量文本格式化 /// @@ -94,7 +94,7 @@ namespace XericUI.FlipPage [LabelText("总页面数量文本格式化")] [BoxGroup("设定")] #endif public string totalPageCountFormat = "共$1页"; - + /// /// 页面索引文本格式化 /// @@ -107,7 +107,8 @@ namespace XericUI.FlipPage /// 页面选择组件列表 /// #if ODIN_INSPECTOR - [LabelText("页面选择组件列表")] [BoxGroup("组件")] + [LabelText("页面选择组件列表")] + [BoxGroup("组件")] // [ListDrawerSettings(ShowIndexLabels = true)] #endif [Tooltip("首个组件应当作为主要的节点管理")] @@ -128,13 +129,13 @@ namespace XericUI.FlipPage #if ODIN_INSPECTOR [LabelText("翻页到索引按钮池")] [BoxGroup("组件")] #endif - public XericLibrary.Runtime.MacroLibrary.MacroPool.UnionSet pageButtonPool = new XericLibrary.Runtime.MacroLibrary.MacroPool.UnionSet(); + public XericLibrary.Runtime.MacroLibrary.MacroPool.UnionSet pageButtonPool = + new XericLibrary.Runtime.MacroLibrary.MacroPool.UnionSet(); #endregion #region 字段属性 - private ToggleGroup _toggleGroup; protected ToggleGroup ToggleGroup @@ -149,7 +150,7 @@ namespace XericUI.FlipPage } #endregion - + #region 类内类型 /// @@ -161,23 +162,20 @@ namespace XericUI.FlipPage /// 页面翻页按钮 /// #if ODIN_INSPECTOR - [LabelText("页面翻页按钮")] + [LabelText("页面翻页按钮")] #endif [CanBeNull] internal ObjectVessel pageSelectableVessel; - - - + + protected internal override void OnPageVisible(bool quickVisit) { - if (quickVisit) - return; + if (quickVisit) return; // 自动补全外部交互动画 if (pageSelectableVessel.IsValidVessel()) SwitchSelectableVesselType(pageSelectableVessel.Target0, - null, - toggle => + asToggle: toggle => { if (!toggle.isOn) toggle.SetIsOnWithoutNotify(true); @@ -186,8 +184,8 @@ namespace XericUI.FlipPage protected internal override void OnPageInvisible(bool quickVisit) { + } - } /// @@ -205,7 +203,7 @@ namespace XericUI.FlipPage } #endregion - + #region 生命周期 #if UNITY_EDITOR @@ -215,10 +213,14 @@ namespace XericUI.FlipPage // pageButtonPool.Prefab.GetComponent(); } #endif - + protected override void Awake() { + // 使用默认的 + HowToCreatPageInfo = () => AddPage(new PageComponentInfo()); + base.Awake(); + if (buttonStartPage.IsValidVessel()) // 翻到开头 buttonStartPage.Target.onClick.AddListener(FlipPageToStart); if (buttonPreviousPage.IsValidVessel()) // 翻到上一页 @@ -230,10 +232,9 @@ namespace XericUI.FlipPage if (inputFieldFlipPageIndex.IsValidVessel()) // 翻到指定 inputFieldFlipPageIndex.Target.onValueChanged.AddListener(s => FlipPage(s)); pageButtonPool.Init(); - + // 根据组件类型创建相关内容 // var prefabSelectable = pageButtonPool.Prefab.GetComponent(); - } #endregion @@ -250,12 +251,11 @@ namespace XericUI.FlipPage pageSelectButton[i].Target0.transform.SetSiblingIndex(i); } - if (Currentpage is PageComponentInfo componentPage && + if (Currentpage is PageComponentInfo componentPage && componentPage.pageSelectableVessel.IsValidVessel()) { SwitchSelectableVesselType(componentPage.pageSelectableVessel.Target0, - null, - toggle => + asToggle: toggle => { if (!toggle.isOn) toggle.isOn = true; @@ -266,19 +266,22 @@ namespace XericUI.FlipPage public override void FlipPage(int pageIndex, bool forceRefresh = false) { base.FlipPage(pageIndex, forceRefresh); - + RefreshPageIndeButtonState(); } - public override PageInfo AddPageFirst(PageInfo pageInfo) + public override PageInfo AddPage(PageInfo pageInfo = null, bool isFirstOtherwiseLast = false) { if (pageInfo is not PageComponentInfo componentPageInfo) { - Debug.LogError($"页面容器{Currentpage}不支持当前管理器，其必须由{nameof(FlipPageComponentManager)}.{nameof(PageComponentInfo)}继承/声名，否则无法支持后续功能", this); + Debug.LogError( + $"页面容器{Currentpage}不支持当前管理器，其必须由{nameof(FlipPageComponentManager)}.{nameof(PageComponentInfo)}继承/声名，否则无法支持后续功能", + this); return null; } + // 页面基础初始化 - var result = base.AddPageFirst(pageInfo); + var result = base.AddPage(pageInfo, isFirstOtherwiseLast); // 添加选择按钮 AddPageIndexButton(componentPageInfo); // 刷新选择按钮显示状态 @@ -288,30 +291,10 @@ namespace XericUI.FlipPage return result; } - public override PageInfo AddPageLast(PageInfo pageInfo) - { - if (pageInfo is not PageComponentInfo componentPageInfo) - { - Debug.LogError($"页面容器{Currentpage}不支持当前管理器，其必须由{nameof(FlipPageComponentManager)}.{nameof(PageComponentInfo)}继承/声名，否则无法支持后续功能", this); - return null; - } - // 页面基础初始化 - var result = base.AddPageLast(pageInfo); - // 添加选择按钮 - AddPageIndexButton(componentPageInfo); - // 刷新选择按钮显示状态 - RefreshPageIndeButtonState(); - // 刷新总页数 - RefreshLabelTextTotalPageCount(); - return result; - } - - - public override void RemovePage(int pageIndex) { base.RemovePage(pageIndex); - + pageButtonPool.DirectlyRelease(pageSelectButton[pageIndex].Target0.gameObject); pageSelectButton.RemoveAt(pageIndex); @@ -319,41 +302,45 @@ namespace XericUI.FlipPage RefreshLabelTextTotalPageCount(); } - public override void ClearPages() + public override void ClearPages(bool resetPool = true) { PageInfos .OfType() .Where(a => a.pageSelectableVessel.IsValidVessel()) .ForEachDo(a => pageButtonPool.DirectlyRelease(a.pageSelectableVessel!.Target0.gameObject)); pageSelectButton.Clear(); - base.ClearPages(); + base.ClearPages(resetPool); RefreshLabelTextTotalPageCount(); } /// - /// 在页面上添加按钮 + /// 添加页面对应的翻页按钮 /// /// protected virtual void AddPageIndexButton(PageComponentInfo pageInfo) { - var pageIndexSelectable = GetPageIndexButton(); - pageInfo.pageSelectableVessel = pageIndexSelectable; + // 检查页面上的按钮引用 + ObjectVessel pageIndexSelectable = null; + if (pageInfo.pageSelectableVessel == null) + { + pageIndexSelectable = GetPageIndexButton(); + pageInfo.pageSelectableVessel = pageIndexSelectable; + } + else + pageIndexSelectable = pageInfo.pageSelectableVessel; + // 将按钮对象添加到列表中便于管理 pageSelectButton.Add(pageIndexSelectable); SwitchSelectableVesselType(pageIndexSelectable.Target0, - button => - { - button.onClick.AddListener(() => FlipPage(pageInfo.pageNumber)); - }, + button => { button.onClick.AddListener(() => FlipPage(pageInfo.pageNumber)); }, toggle => { toggle.isOn = pageInfo.pageNumber == currentPageIndex; toggle.group = ToggleGroup; toggle.onValueChanged.AddListener(b => { - if (b) - FlipPage(pageInfo.pageNumber); + if (b) FlipPage(pageInfo.pageNumber); }); }); RefreshPageSelectableVesselLabel(pageInfo); @@ -367,54 +354,54 @@ namespace XericUI.FlipPage var min = currentPageIndex - (int)(candidatesNumber / 2); min = Math.Max(min, 0); - min = pageSelectButton.Count - candidatesNumber > 0 - ? Math.Min(min, (int)(pageSelectButton.Count - candidatesNumber)) + min = pageSelectButton.Count - candidatesNumber > 0 + ? Math.Min(min, (int)(pageSelectButton.Count - candidatesNumber)) : 0; var max = min + (int)candidatesNumber; - + for (int i = 0; i < pageSelectButton.Count; i++) { pageSelectButton[i].Target0.transform.SetSiblingIndex(i); - + // 显示数量控制 if (inMaximumCandidatesNumber) pageSelectButton[i].Target0.gameObject.SetActive(min <= i && i <= max); else pageSelectButton[i].Target0.gameObject.SetActive(min <= i && i < max); // 看不见的内容不刷新 - if (!pageSelectButton[i].Target0.gameObject.activeSelf) + if (!pageSelectButton[i].Target0.gameObject.activeSelf) continue; - + // 更新索引 pageSelectButton[i].Target1.text = MacroRegex.RegexReplace(pageIndexFormat, i + 1); - + // SwitchSelectableVesselType(pageSelectButton[i].Target0, // null, // toggle => // { // toggle.SetIsOnWithoutNotify(currentPageIndex == i); // }); - } + } } - + /// /// 更新总页数 /// private void RefreshLabelTextTotalPageCount() { if (labelTextTotalPageCount.IsValidVessel()) // 总页数更新 - labelTextTotalPageCount.Target.text = + labelTextTotalPageCount.Target.text = MacroRegex.RegexReplace(totalPageCountFormat, PageInfos.Count.ToString()); } - + /// /// 刷新翻页按钮索引为当前页面索引 /// public void RefreshPageSelectableVesselLabel(PageComponentInfo page, object customInput = null) { if (page.pageSelectableVessel.IsValidVessel()) - page.pageSelectableVessel!.Target1.text = - MacroRegex.RegexReplace(pageIndexFormat, customInput ?? page.pageNumber); + page.pageSelectableVessel!.Target1.text = + MacroRegex.RegexReplace(pageIndexFormat, customInput ?? page.pageNumber); } #endregion @@ -422,7 +409,7 @@ namespace XericUI.FlipPage #region 组件方法 /// - /// 获取页面索引按钮 + /// 获取页面索引按钮(获取这个按钮的池化对象，随后应当将其绑定到页面上) /// /// protected virtual ObjectVessel GetPageIndexButton() @@ -433,40 +420,50 @@ namespace XericUI.FlipPage var vessel = new ObjectVessel(selectable, text); return vessel; } - - protected virtual void ListenPageSelectable(ObjectVessel selectableVessel, Action selectPageAction) + + /// + /// 注册一个委托到翻页按钮上。(事件会在调用容器清空后被自动回收) + /// + /// + /// + protected virtual void ListenPageSelectable(ObjectVessel selectableVessel, + Action selectPageAction) { if (selectableVessel.Target0 is Button button) { - button.onClick.AddListener(() => - { - selectPageAction?.Invoke(currentPageIndex); - }); + button.onClick.AddListener(() => { selectPageAction?.Invoke(currentPageIndex); }); } } /// - /// 处理可选对象类型，如果要支持更多的类型优先改此方法，以便获得其他所有位置的编译器提示 + /// 处理可选对象类型.(如果要支持更多的类型，应优先改此方法，以便获得其他所有位置的编译器提示) /// /// - /// - /// + /// 如果是按钮 + /// 如果是单选项 /// - protected static bool SwitchSelectableVesselType(Selectable selectable, Action public IEnumerable AllItemInfos => _pageInfos.SelectMany(page => page.itemInfos); - + /// /// ҳĬĿ /// - protected int DefaultItemCountPerPage + protected int DefaultItemCountPerPage => defaultItemCountPerPage < 0 ? int.MaxValue : defaultItemCountPerPage; - + private List _backupItemInfos; public List BackItemInfos => _backupItemInfos; @@ -138,14 +136,27 @@ namespace XericUI.FlipPage /// ҳ /// public int TotalPageCount => PageInfos.Count(); - + +#if UNITY_EDITOR && ODIN_INSPECTOR + [LabelText("ҳ")] + [Obsolete("ʾб Խ༭ʱЧҪ")] + private List _pageInfoLists_ => _pageInfos.ToList(); +#endif + #endregion #region + protected override void Awake() + { + base.Awake(); + PageInfoPool = new ObjectPool(CreatPageInfo, GetPageInfo, ReleasePageInfo, DestroyPageInfo); + } + protected override void Start() { base.Start(); + FlipPage(currentPageIndex); } @@ -160,18 +171,20 @@ namespace XericUI.FlipPage #region ҳ /// - /// ҳʱ(ҳ̵ִ) + /// ҳʱص (ҳ̵ִУҳлصڴ֮ǰ) /// protected virtual void OnFlipPage() { - } - + /// - /// ָͨɸѡҳ + /// ָͨҳ /// - /// - /// + /// + /// ֶҳʱִд˷ + /// + /// ҳţҪֶʵִĬֻҳ + /// ǿˢ£ĬǰҳĿҳʱִкķҳ public virtual void FlipPage(string pageNumber, bool forceRefresh = false) { if (float.TryParse(pageNumber, out var index)) @@ -183,9 +196,14 @@ namespace XericUI.FlipPage /// /// ָҳ /// - /// - /// ٷҳ - /// + /// + /// ҳʱǰҳᴥһ OnPageInvisibleĿҳᴥһ OnPageVisible + /// ĿҳгǰҳĿҳ֮ҳᴥһOnPageVisibleOnPageInvisibleĿٷҳ + /// д¼ʱÿٷҳ״̬أִصĴ + /// ѹϣڼҳķҳ¼ִ JumpPage + /// + /// Ŀҳ + /// ǿˢ£ĬǰҳĿҳʱִкķҳ public virtual void FlipPage(int pageIndex, bool forceRefresh = false) { // 鷭ҳЧ @@ -200,33 +218,33 @@ namespace XericUI.FlipPage // ҳ var pageIndexOffset = pageIndex - currentPageIndex; var lastPageIndex = currentPageIndex; - // ڵ㲻ڣͨѰ + var quickPage = false; // ҳ + bool visitOffsetDirIsNext; + // ڵ㲻ڣֱͨ if (CurrentPageNode == null) + { CurrentPageNode = _pageInfos.GetOrderNode().LandedIndex(currentPageIndex); - // ƫƣƶ - else if (pageIndexOffset > 0) - { - // ȹرҳԪ - CurrentPageNode.Value.CallChildItemInvisible(); - for (var i = 0; i < pageIndexOffset; i++) - { - var next = CurrentPageNode!.Next; - SwitchPage(next, _pageInfos.Last, i + 1 < pageIndexOffset); - } + if (CurrentPageNode == null) + Debug.LogError($"{currentPageIndex}µĽڵ㲻, ", this); + else + Currentpage.OnPageVisible(false); } - else if (pageIndexOffset < 0) + // ƫƣƶ + else if (pageIndexOffset != 0) { + // жϷ + visitOffsetDirIsNext = pageIndexOffset > 0; + pageIndexOffset = Mathf.Abs(pageIndexOffset); // ȹرҳԪ CurrentPageNode.Value.CallChildItemInvisible(); - for (var i = 0; i > pageIndexOffset; i--) - { - var previa = CurrentPageNode!.Previous; - SwitchPage(previa, _pageInfos.First, i - 1 > pageIndexOffset); - } + for (var i = 1; i < pageIndexOffset; i++) + SwitchPage(false); + SwitchPage(true); } // ûзЧҳֱ˳ else return; + // ʱǰκҳ if (CurrentPageNode == null) return; @@ -234,26 +252,43 @@ namespace XericUI.FlipPage CurrentPageNode.Value.CallChildItemVisible(); currentPageIndex = pageIndex; OnFlipPage(); - - // ҳ - void SwitchPage(LinkedListNode newPageNode, LinkedListNode defualtPageNode, bool quickPage) - { - if (newPageNode != null) - { - Currentpage.OnPageInvisible(quickPage); - CurrentPageNode = newPageNode; - Currentpage.OnPageVisible(quickPage); - } + return; - if (canPassIndexBoundary) - { - Currentpage.OnPageInvisible(quickPage); - CurrentPageNode = defualtPageNode; - Currentpage.OnPageVisible(quickPage); - } + void SwitchPage(bool isEndPage) + { + Currentpage.OnPageInvisible(quickPage); + quickPage = !isEndPage; + CurrentPageNode = visitOffsetDirIsNext ? CurrentPageNode.Next : CurrentPageNode.Previous; + if (CurrentPageNode == null && canPassIndexBoundary) + CurrentPageNode = visitOffsetDirIsNext ? _pageInfos.First : _pageInfos.Last; + Currentpage.OnPageVisible(quickPage); } } + /// + /// ֱתҳ (skip quick Page) + /// + /// + /// FlipPage JumpPageֱӿսҳڼҳ¼ + /// + public virtual void JumpPage(int pageIndex, bool forceRefresh = false) + { + // + CurrentPageNode?.Value.CallChildItemInvisible(); + + // Ӧҳ + var page = _pageInfos.First; + while (pageIndex-- > 0 && page.Next != null) + page = page.Next; + // ִֻзǿĻص + Currentpage?.OnPageInvisible(false); + CurrentPageNode = page; + Currentpage?.OnPageVisible(false); + currentPageIndex = pageIndex; + // ʾ + CurrentPageNode?.Value.CallChildItemVisible(); + } + /// /// ͷ /// @@ -290,24 +325,34 @@ namespace XericUI.FlipPage public void FlipPageToEnd() => FlipPage(_pageInfos.Count - 1); - - + /// /// ҳڿͷ /// - public virtual PageInfo AddPageFirst(PageInfo pageInfo) + /// + /// עͳһҳͣûָԶҳ棬ô + /// + public virtual PageInfo AddPage(PageInfo pageInfo = null, bool isFirstOtherwiseLast = false) { if (pageInfo == null) + pageInfo = PageInfoPool.Get(); + else + GetPageInfo(pageInfo); + + if (isFirstOtherwiseLast) { - Debug.LogError($"һյҳݵУ", this); - return null; + // ҳ(ҳ±Ĭ0) + _pageInfos.AddFirst(pageInfo); + // ºҳ + RefreshAllPageNumber(); + } + else + { + // ҳ± + pageInfo.pageNumber = _pageInfos.Count; + // ҳ + _pageInfos.AddLast(pageInfo); } - // ҳ± - pageInfo.pageNumber = 0; - // ҳ - _pageInfos.AddFirst(pageInfo); - // ºҳ - RefreshAllPageNumber(); // ִҳ pageInfo.OnPageCreated(this); // ˢҳ @@ -315,49 +360,20 @@ namespace XericUI.FlipPage return pageInfo; } - /// - /// ҳڽβ - /// - public virtual PageInfo AddPageLast(PageInfo pageInfo) - { - if (pageInfo == null) - { - Debug.LogError($"һյҳݵУ", this); - return null; - } - // ҳ± - pageInfo.pageNumber = _pageInfos.Count; - // ҳ - _pageInfos.AddLast(pageInfo); - // ִҳ - pageInfo.OnPageCreated(this); - // ˢҳ - FlipPage(currentPageIndex, true); - return pageInfo; - } - /// /// ɾҳ /// /// public virtual void RemovePage(PageInfo pageInfo) { - // Ƴǵǰҳ棬ִйرղ - if (CurrentPageNode.Value == pageInfo) - { - pageInfo.OnPageInvisible(true); - CurrentPageNode = null; - } - // ִҳ - pageInfo.OnPageDestroy(this); - // ҳƳ - _pageInfos.Remove(pageInfo); + // ͷҳ + PageInfoPool.Release(pageInfo); // ˢҳ FlipPage(currentPageIndex, true); var index = PageInfos.IndexOf(a => a == pageInfo); RemovePage(index); } - + /// /// Ƴҳ棨ҳϵҲһͬƳ /// @@ -368,26 +384,20 @@ namespace XericUI.FlipPage Debug.LogError($"ƳڷΧڵ{pageIndex}", this); return; } + // ȡҳڵ var page = _pageInfos.GetOrderNode().LandedIndex(pageIndex); // ºҳ var tempPage = page; - var tempPageNumber = page.Value.pageNumber; + var tempPageNumber = page.Value.pageNumber; while (tempPage.Next != null) { tempPage = tempPage.Next; tempPage.Value.pageNumber = tempPageNumber++; } - // Ƴǵǰҳ棬ִйرղ - if (CurrentPageNode == page) - { - page.Value.OnPageInvisible(true); - CurrentPageNode = null; - } - // ִҳ - page.Value.OnPageDestroy(this); - // ҳƳ - _pageInfos.Remove(page); + + // ͷҳ + PageInfoPool.Release(page.Value); // ˢҳ FlipPage(currentPageIndex, true); } @@ -402,7 +412,7 @@ namespace XericUI.FlipPage RemovePage(pageIndex); RestoreItemsToPages(); } - + /// /// ȡµҳ /// @@ -412,7 +422,7 @@ namespace XericUI.FlipPage public T IndexOfPageInfo(int pageIndex) where T : PageInfo => IndexOfPageInfo(pageIndex) as T; - + /// /// ȡµҳ /// @@ -421,20 +431,75 @@ namespace XericUI.FlipPage /// public PageInfo IndexOfPageInfo(int pageIndex) => _pageInfos.LandedIndex(pageIndex); - + /// /// ҳ (ҳҲһͬƳ) /// + /// ͬʱҳ + /// + /// ҳûӹͷţͬʱҪдҳ OnPageDestroy ȷҳ׼ȷͷ˸ֶ + /// ȷҳݶһµģζҳʱҲնأȻصȾ + /// #if ODIN_INSPECTOR [HorizontalGroup(""), Button("ҳ")] #endif - public virtual void ClearPages() + public virtual void ClearPages(bool resetPool = true) { - _pageInfos.Clear(); + if (CurrentPageNode != null) + Currentpage.OnPageInvisible(true); + foreach (var pageInfo in _pageInfos) + { + pageInfo.itemInfos.Clear(); + if (resetPool) + PageInfoPool.Release(pageInfo); + else + ReleasePageInfo(pageInfo); // ֱӵͷ¼߶أ֪ܼܲظջǻgcƬ + } + // ճ + if (resetPool) + PageInfoPool.Clear(); + // õǰҳ CurrentPageNode = null; currentPageIndex = 0; + // ջ + _pageInfos.Clear(); + _itemInfos.Clear(); } - + + /// + /// رҳ + /// + public void InactivePages() => SetPagesActive(false); + + /// + /// ¼ҳ + /// + public void ReactivePages() => SetPagesActive(true); + + /// + /// ҳļ״̬ + /// + /// + public void SetPagesActive(bool active) + { + foreach (var pageInfo in _pageInfos) + pageInfo.pageActive = active; + FlipPage(0, true); + } + + /// + /// ʹԶķü״̬ + /// + /// + /// + public void SetPagesActive(Func isActive) + where T : PageInfo + { + foreach (var pageInfo in _pageInfos) + pageInfo.pageActive = isActive((T)pageInfo); + FlipPage(0, true); + } + /// /// ABҳ /// @@ -461,44 +526,96 @@ namespace XericUI.FlipPage page.pageNumber = index++; } } - + + #endregion + + #region Ŀ + + /// + /// δҳ棨ֱӸίУ + /// + /// + protected virtual PageInfo CreatPageInfo() => HowToCreatPageInfo(); + + /// + /// ִлȡҳ¼ + /// + /// + protected virtual void GetPageInfo(PageInfo info) + { + info.pageNumber = 0; + _pageInfos.AddLast(info); + } + + /// + /// ִͷҳ¼ + /// + /// + protected virtual void ReleasePageInfo(PageInfo info) + { + if (CurrentPageNode != null && Currentpage == info) + { + info.OnPageInvisible(true); + CurrentPageNode = null; + } + + info.OnPageDestroy(this); + _pageInfos.Remove(info); + } + + /// + /// ִҳ¼ + /// + /// + protected virtual void DestroyPageInfo(PageInfo info) + { + } + #endregion #region Ŀ /// - /// Ŀ + /// һĿ(Ż) /// - /// - /// - public virtual void AddItem(ItemInfo item) + /// + /// + public virtual void AddItems(IEnumerable items, Func customGetPage = null) { - AddItem(item, () => throw new Exception("ҪҳʵӦҳ洴߼дĬݷſʹá")); + foreach (var item in items) + AddItem(item, customGetPage); } - + /// /// Ŀ /// - public virtual void AddItem(ItemInfo item, Func addPage) + /// + /// ṩһָͣĬ͵ҳ + public virtual void AddItem(ItemInfo item) + where T : PageInfo, new() + => AddItem(item, () => new T()); + + /// + /// Ŀ + /// + /// + /// ĿҳУ + /// + public virtual void AddItem(ItemInfo item, Func customGetPage = null) { - // ǰѰҿȱҳ涼׼ȷǣ - var firstVacancy = _pageInfos - .GetReversedOrderNode() - .LastOrDefault(a - => a.Value.itemInfos.Count < DefaultItemCountPerPage); - if (firstVacancy != null) + var page = _pageInfos.Count <= 0 ? null : _pageInfos.Last.Value; + if (page != null && + page.CheckPageAnyLack(item) && + page.itemInfos.Count < DefaultItemCountPerPage) { - firstVacancy.Value.itemInfos.Add(item); + page.itemInfos.Add(item); _itemInfos.Add(item); return; } - if (addPage == null) - { - Debug.LogError("ǰҳĿ˳λӵҳУδָҳ洴ӹ˳", this); - return; - } + // ½һҳ - addPage.Invoke().itemInfos.Add(item); + page = customGetPage == null ? PageInfoPool.Get() : customGetPage(); + page.itemInfos.Add(item); _itemInfos.Add(item); } @@ -508,35 +625,16 @@ namespace XericUI.FlipPage /// public virtual void RemoveItem(ItemInfo item) { + _itemInfos.Remove(item); foreach (var a in AllItemInfos .Adjoint() .Where(a => a.obj == item) .Reverse()) { ItemIndex2PageIndex(a.index); - } } - public virtual void RemoveItem(int indexItem) - { - - } - - /// - /// ҳ״̬ - /// -#if ODIN_INSPECTOR - [HorizontalGroup(""), Button("")] -#endif - public void ClearItemsWithoutPages() - { - foreach (var page in _pageInfos) - { - page.itemInfos.Clear(); - } - } - /// /// ʹλ /// @@ -553,9 +651,7 @@ namespace XericUI.FlipPage /// /// public virtual int ItemIndex2PageIndex(int itemIndex) - { - return itemIndex / DefaultItemCountPerPage; - } + => itemIndex / DefaultItemCountPerPage; /// /// ǰҳаĿ @@ -564,8 +660,8 @@ namespace XericUI.FlipPage /// public bool Contains(ItemInfo item) => _itemInfos.Contains(item); - - + + /// /// ȡĿ /// @@ -580,9 +676,10 @@ namespace XericUI.FlipPage BackupItemsFormPages(); return _backupItemInfos.OfType(); } + return AllItemInfos.OfType(); } - + /// /// Ŀ /// @@ -593,60 +690,45 @@ namespace XericUI.FlipPage } /// - /// ǿĿӱлָݣ + /// Ŀӱлָݣ /// public void RestoreItemsToPages() - { - RestoreItemsToPages(_backupItemInfos); - } + => RestoreItemsToPages(_backupItemInfos); + /// - /// ǿĿӱָͨݣ + /// ĿڱӦùݣ /// public void RestoreItemsByFilterToPages() - { - RestoreItemsToPages(_backupItemInfos.Where(a => a.PassFilter(this)).ToList()); - } - + => RestoreItemsToPages(_backupItemInfos.Where(a => a.PassFilter(this)).ToList()); + /// - /// ǿĿӸлָݣ + /// ĿӸлָݣ /// - public void RestoreItemsToPages(List overrideDatas) - where T : ItemInfo + /// + /// 漰ҳ沼 + /// + /// + public void RestoreItemsToPages(List overrideDatas, Func customGetPage = null, + bool allowClear = true) + where TItemInfo : ItemInfo { - if (overrideDatas == null || overrideDatas.Count <= 0) + var collectionInvalid = overrideDatas is not { Count: > 0 }; + if (collectionInvalid && !allowClear) { - Debug.LogError($"ҪһЧݶбϣΪգʹClearŲ", this); + Debug.LogError($"ǰʹһЧݶбϣΪգʹClearŲб", this); return; } - if (ItemIndex2PageIndex(overrideDatas.Count - 1) > _pageInfos.Count) - { - Debug.LogError($"ʱԭ({overrideDatas.Count})({_pageInfos.Count})Ѿܾ", this); - return; - } - // ִ - var page = _pageInfos.First; - page.Value.itemInfos.Clear(); - var pageIndex = 0; - for (int i = 0; i < overrideDatas.Count; i++) - { - var newPageIndex = ItemIndex2PageIndex(i); - if (pageIndex != newPageIndex) - { - pageIndex = newPageIndex; - page = page.Next; - if (page == null) - { - Debug.LogError($"ʱҳӴűж", this); - return; - } - page.Value.itemInfos.Clear(); - } - page.Value.itemInfos.Add(overrideDatas[i]); - } + + // ҳ + ClearPages(); + if (collectionInvalid) return; + AddItems(overrideDatas, customGetPage); + FlipPage(0); + return; } #endregion - + #region /// @@ -681,6 +763,8 @@ namespace XericUI.FlipPage #endif public int pageNumber { get; internal set; } + public bool pageActive; + #endregion #region @@ -705,49 +789,65 @@ namespace XericUI.FlipPage // ͷб if (itemInfos != null) ListPool.Release(itemInfos); - } /// - /// ҳʾʱ + /// ҳʾʱص /// /// (ֶ߼ΪʱӦڶ¼) - /// - /// ҳеijԱԶڷǿģʽԶִӦļ - /// + /// + /// ҳеijԱԶִӦļҪֶá + /// ҪΪֵǰִеǶ¼Ǵ߼ + /// protected internal abstract void OnPageVisible(bool quickVisit); - + /// - /// ҳʱ + /// ҳʱص /// /// (ֶ߼ΪʱӦڶ¼) - /// - /// ҳеijԱԶڷǿģʽԶִӦļ - /// + /// + /// ҳеijԱԶִӦļҪֶá + /// ҪΪֵǰִеǶ¼Ǵ߼ + /// protected internal abstract void OnPageInvisible(bool quickVisit); #endregion /// - /// ص¼ + /// صӦ /// + /// + /// ҳ津û + /// protected internal virtual void CallChildItemVisible() { itemInfos .Where(a => a != null) .ForEachDo(itemInfo => itemInfo.OnItemVisible()); } - + /// - /// Ǽص¼ + /// ǼصӦأ /// + /// + /// ҳ津û + /// protected internal virtual void CallChildItemInvisible() { itemInfos .Where(a => a != null) .ForEachDo(itemInfo => itemInfo.OnItemInvisible()); } - + + /// + /// ҳǷڿԷ¶Ŀȱ + /// + /// + protected internal virtual bool CheckPageAnyLack(ItemInfo item = null) + { + return true; + } + public override string ToString() { return $"[{nameof(PageInfo)}] ({name})"; @@ -780,7 +880,7 @@ namespace XericUI.FlipPage #region /// - /// Ŀʾʱ + /// Ŀʾʱص /// /// /// ҳʾִ֮ @@ -788,7 +888,7 @@ namespace XericUI.FlipPage protected internal abstract void OnItemVisible(); /// - /// Ŀʱ + /// Ŀʱص /// /// /// ҳر֮ǰִ @@ -797,7 +897,7 @@ namespace XericUI.FlipPage #endregion - + /// /// Ƿͨ /// @@ -807,7 +907,7 @@ namespace XericUI.FlipPage { return true; } - + public override string ToString() { return $"[{nameof(ItemInfo)}] ({name})"; @@ -815,6 +915,5 @@ namespace XericUI.FlipPage } #endregion - } } \ No newline at end of file