From 6f808c5dae939fdf7b9443c4eda389631258a5b2 Mon Sep 17 00:00:00 2001
From: limeng <limeng208@huawei.com>
Date: Mon, 19 Jun 2023 16:44:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E6=A0=BC=E8=B0=83=E6=95=B4:=E5=BD=93c?=
 =?UTF-8?q?achecount=E7=AD=89=E4=BA=8E0=E6=97=B6=EF=BC=8C=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=89=8D=E5=90=8E=E8=BE=B9=E8=B7=9D=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: limeng <limeng208@huawei.com>
---
 .../swiper/swiper_layout_algorithm.cpp        | 41 ++++++++++++++++---
 .../pattern/swiper/swiper_layout_algorithm.h  |  1 +
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/frameworks/core/components_ng/pattern/swiper/swiper_layout_algorithm.cpp b/frameworks/core/components_ng/pattern/swiper/swiper_layout_algorithm.cpp
index 7e296252622..4ad689ef247 100644
--- a/frameworks/core/components_ng/pattern/swiper/swiper_layout_algorithm.cpp
+++ b/frameworks/core/components_ng/pattern/swiper/swiper_layout_algorithm.cpp
@@ -61,9 +61,13 @@ void SwiperLayoutAlgorithm::LoadItemWithDrag(float translateLength)
     }
 
     int32_t nextIndex = currentIndex_;
+    int32_t prevMarginCount = Positive(prevMargin_) ? 1 : 0;
+    int32_t nextMarginCount = Positive(nextMargin_) ? 1 : 0;
+
     auto loadItems = static_cast<int32_t>(floorf(fabsf(currentOffset_) / translateLength));
     do {
-        nextIndex = Positive(currentOffset_) ? (nextIndex - 1) : (nextIndex + displayCount_);
+        nextIndex = Positive(currentOffset_) ? (nextIndex - 1 - prevMarginCount) :
+                                               (nextIndex + displayCount_ + nextMarginCount);
         AddToItemRange(nextIndex);
         loadItems--;
     } while (loadItems >= 0);
@@ -126,7 +130,7 @@ void SwiperLayoutAlgorithm::InitItemRange(LayoutWrapper* layoutWrapper)
     CHECK_NULL_VOID(layoutWrapper);
     auto layoutProperty = AceType::DynamicCast<SwiperLayoutProperty>(layoutWrapper->GetLayoutProperty());
     CHECK_NULL_VOID(layoutProperty);
-
+    auto cacheCount = layoutProperty->GetCachedCount().value_or(1);
     // If display mode is AutoLinear, expand all children.
     if (!SwiperUtils::IsStretch(layoutProperty)) {
         startIndex_ = 0;
@@ -150,7 +154,7 @@ void SwiperLayoutAlgorithm::InitItemRange(LayoutWrapper* layoutWrapper)
         /* Load next index while dragging */
         LoadItemWithDrag(translateLength);
     }
-
+    CalculateIncludeMarginCacheRange(cacheCount);
     if (startIndex_ <= endIndex_) {
         for (auto index = startIndex_; index <= endIndex_; ++index) {
             itemRange_.insert(index);
@@ -570,12 +574,16 @@ void SwiperLayoutAlgorithm::SortItems(std::list<int32_t>& preItems, std::list<in
 {
     auto itemCount = static_cast<int32_t>(itemRange_.size());
     displayCount = std::clamp(displayCount, 0, itemCount);
-    auto cacheCount = static_cast<int32_t>(ceilf(static_cast<float>(itemCount - displayCount) / 2.0f));
+    auto cacheCount = static_cast<int32_t>(ceilf(static_cast<float>(itemCount - TotalDisplayCount()) / 2.0f));
+    cacheCount = std::max(0, cacheCount);
     auto loopIndex = (currentIndex_ - 1 + totalCount_) % totalCount_;
     int32_t prevTargetIndex = CaculatePrevTargetIndex();
     int32_t nextTargetIndex = CaculateNextTargetIndex();
+    int32_t prevMarginCount = Positive(prevMargin_) ? 1 : 0;
+    int32_t nextMarginCount = Positive(nextMargin_) ? 1 : 0;
+
     int32_t count = 0;
-    while (itemRange_.find(loopIndex) != itemRange_.end() && count < cacheCount) {
+    while (itemRange_.find(loopIndex) != itemRange_.end() && count < (prevMarginCount + cacheCount)) {
         if (NearEqual(loopIndex, nextTargetIndex)) {
             break;
         }
@@ -586,7 +594,7 @@ void SwiperLayoutAlgorithm::SortItems(std::list<int32_t>& preItems, std::list<in
 
     loopIndex = currentIndex_;
     count = 0;
-    while (itemRange_.find(loopIndex) != itemRange_.end() && count < (displayCount + cacheCount)) {
+    while (itemRange_.find(loopIndex) != itemRange_.end() && count < (displayCount + nextMarginCount + cacheCount)) {
         nextItems.emplace_back(loopIndex);
         loopIndex = (loopIndex + 1) % totalCount_;
         if (NearEqual(loopIndex, prevTargetIndex)) {
@@ -809,6 +817,27 @@ void SwiperLayoutAlgorithm::ArrowLayout(LayoutWrapper* layoutWrapper, const RefP
     arrowWrapper->Layout();
 }
 
+void SwiperLayoutAlgorithm::CalculateIncludeMarginCacheRange(int32_t cacheCount)
+{
+    auto loadCount = cacheCount * 2 + displayCount_;
+    if (Positive(static_cast<double>(prevMargin_))) {
+        startIndex_ = isLoop_ ? (startIndex_ - 1 + totalCount_) % totalCount_ :
+                                std::max(startIndex_ - 1, 0);
+        loadCount++;
+    }
+
+    if (Positive(static_cast<double>(nextMargin_))) {
+        endIndex_ = isLoop_ ? (endIndex_ + 1 + totalCount_) % totalCount_ :
+                            std::min(endIndex_ + 1, totalCount_ - 1);
+        loadCount++;
+    }
+
+    if (GreatOrEqual(loadCount, totalCount_)) {
+        startIndex_ = 0;
+        endIndex_ = totalCount_ - 1;
+    }
+}
+
 int32_t SwiperLayoutAlgorithm::CaculatePrevTargetIndex() const
 {
     int32_t totalDisplayCount = TotalDisplayCount();
diff --git a/frameworks/core/components_ng/pattern/swiper/swiper_layout_algorithm.h b/frameworks/core/components_ng/pattern/swiper/swiper_layout_algorithm.h
index 46dd161b63c..74e5724d57e 100644
--- a/frameworks/core/components_ng/pattern/swiper/swiper_layout_algorithm.h
+++ b/frameworks/core/components_ng/pattern/swiper/swiper_layout_algorithm.h
@@ -135,6 +135,7 @@ private:
     RefPtr<LayoutWrapper> GetNodeLayoutWrapperByTag(LayoutWrapper* layoutWrapper, const std::string& tagName) const;
     void MeasureArrow(const RefPtr<LayoutWrapper>& arrowWrapper, const RefPtr<LayoutProperty>& layoutProperty) const;
     void ArrowLayout(LayoutWrapper* layoutWrapper, const RefPtr<LayoutWrapper>& arrowWrapper) const;
+    void CalculateIncludeMarginCacheRange(int32_t cacheCount);
     int32_t CaculatePrevTargetIndex() const;
     int32_t CaculateNextTargetIndex() const;
     bool isLoop_ = true;
-- 
Gitee