Merge remote-tracking branch 'origin/main'

@@ -171,6 +171,24 @@ export class LazyDataSource<T> extends BasicDataSource<T> {
     }
     }
   }
   }
 
 
+  // 删除index指定索引位置的元素
+  public deleteItems(startIndex: number, count?: number): void {
+    if (startIndex < 0) {
+      return
+    }
+    this.dataArray.splice(startIndex, count || (this.dataArray.length - startIndex));
+    let to = 0
+    if (count == undefined) {
+      to = this.dataArray.length - 1
+    } else {
+      to = count + startIndex
+      if (to >= this.dataArray.length) {
+        to = this.dataArray.length - 1;
+      }
+    }
+    this.notifyDataMove(startIndex, to);
+  }
+
   // 删除最后1个元素
   // 删除最后1个元素
   public pop(): void {
   public pop(): void {
     this.deleteItem()
     this.deleteItem()

@@ -90,9 +90,6 @@ export struct SpacialTopicPageComponent {
         this.publishCommentModel.targetType = String(this.contentDetailData?.newsType || '')
         this.publishCommentModel.targetType = String(this.contentDetailData?.newsType || '')
         this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
         this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
         // }
         // }
-        if (this.contentDetailData[0]?.openComment) {
-          this.operationButtonList = ['collect', 'share']
-        }
         this.trySendData2H5()
         this.trySendData2H5()
       }
       }
     }
     }

 import { CompDTO } from 'wdBean/Index';
 import { CompDTO } from 'wdBean/Index';
 import { DateTimeUtils, Logger } from 'wdKit/Index';
 import { DateTimeUtils, Logger } from 'wdKit/Index';
+import { PageHelper } from '../../viewmodel/PageHelper';
 import PageModel from '../../viewmodel/PageModel';
 import PageModel from '../../viewmodel/PageModel';
 
 
 /**
 /**
@@ -61,6 +62,7 @@ export struct CardAdvBottom {
       }
       }
       if (currentIndex >= 0) {
       if (currentIndex >= 0) {
         this.pageModel.compList.deleteItem(currentIndex)
         this.pageModel.compList.deleteItem(currentIndex)
+        PageHelper.updateFirstPageEndIndex(this.pageModel, true, currentIndex)
       }
       }
     }
     }
   }
   }

 import { CompDTO } from 'wdBean/Index';
 import { CompDTO } from 'wdBean/Index';
 import { DateTimeUtils, Logger } from 'wdKit/Index';
 import { DateTimeUtils, Logger } from 'wdKit/Index';
+import {PageHelper} from '../../viewmodel/PageHelper';
 import PageModel from '../../viewmodel/PageModel';
 import PageModel from '../../viewmodel/PageModel';
 
 
 /**
 /**
@@ -73,6 +74,7 @@ export struct CardAdvTop {
       }
       }
       if (currentIndex >= 0) {
       if (currentIndex >= 0) {
         this.pageModel.compList.deleteItem(currentIndex)
         this.pageModel.compList.deleteItem(currentIndex)
+        PageHelper.updateFirstPageEndIndex(this.pageModel, true, currentIndex)
       }
       }
     }
     }
   }
   }

@@ -99,6 +99,7 @@ export struct CommentTabComponent {
                 bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
                 bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
               })
               })
               .id("Image")
               .id("Image")
+              .visibility(this.contentDetail.appstyle !== 9 ? Visibility.Visible : Visibility.Hidden)
           }
           }
           Text(this.placeHolder)
           Text(this.placeHolder)
             .fontSize(12)
             .fontSize(12)
@@ -110,6 +111,7 @@ export struct CommentTabComponent {
               bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
               bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
             })
             })
             .id("Text")
             .id("Text")
+            .visibility(this.contentDetail.appstyle !== 9 ? Visibility.Visible : Visibility.Hidden)
         }
         }
       }
       }
     }
     }
@@ -134,6 +136,7 @@ export struct CommentIconComponent {
   @ObjectLink publishCommentModel: publishCommentModel
   @ObjectLink publishCommentModel: publishCommentModel
   /*展示类型*/
   /*展示类型*/
   @State type: number = 1
   @State type: number = 1
+  @Prop contentDetail: ContentDetailDTO
   styleType: number = 1 //1: 白色背景（图文底部栏）    2: 黑色背景（图集底部栏）
   styleType: number = 1 //1: 白色背景（图文底部栏）    2: 黑色背景（图集底部栏）
   // aboutToAppear(): void {
   // aboutToAppear(): void {
   //   setTimeout(() => {
   //   setTimeout(() => {
@@ -206,7 +209,10 @@ export struct CommentIconComponent {
 
 
         }
         }
       }
       }
-    }.width(24).height(24)
+    }
+    .width(24)
+    .height(24)
+    .visibility(this.contentDetail.appstyle !== 9 ? Visibility.Visible : Visibility.Hidden)
 
 
     // .backgroundColor(Color.Blue)
     // .backgroundColor(Color.Blue)
   }
   }

@@ -233,7 +233,11 @@ export struct OperRowListView {
     if (this.showCommentIcon) {
     if (this.showCommentIcon) {
       Column() {
       Column() {
         if (this.publishCommentModel?.targetId) {
         if (this.publishCommentModel?.targetId) {
-          CommentIconComponent({ publishCommentModel: this.publishCommentModel, styleType: this.styleType })
+          CommentIconComponent({
+            publishCommentModel: this.publishCommentModel,
+            styleType: this.styleType,
+            contentDetail: this.contentDetailData
+          })
             .onClick(() => {
             .onClick(() => {
               this.onCommentIconClick()
               this.onCommentIconClick()
 
 

@@ -80,7 +80,7 @@ export class PageHelper {
         return;
         return;
       }
       }
       pageModel.pageInfo = pageInfo;
       pageModel.pageInfo = pageInfo;
-      pageModel.cachePageInfoMd5 = pageInfo.md5
+      pageModel.displayPageInfoMd5 = pageInfo.md5
       //解析页面挂角广告资源
       //解析页面挂角广告资源
       pageAdvModel.analysisAdvSource(pageInfo);
       pageAdvModel.analysisAdvSource(pageInfo);
       this.parseGroup(pageModel, true)
       this.parseGroup(pageModel, true)
@@ -129,7 +129,7 @@ export class PageHelper {
           return;
           return;
         }
         }
         pageModel.pageInfo = pageInfo;
         pageModel.pageInfo = pageInfo;
-        if (pageInfo.md5 == pageModel.cachePageInfoMd5) {
+        if (pageInfo.md5 == pageModel.displayPageInfoMd5) {
           // 缓存一致，不解析
           // 缓存一致，不解析
           Logger.debug(TAG, 'getPageInfo 与缓存一致，不解析广告。。。')
           Logger.debug(TAG, 'getPageInfo 与缓存一致，不解析广告。。。')
         } else {
         } else {
@@ -138,6 +138,7 @@ export class PageHelper {
             // 保存缓存
             // 保存缓存
             CacheData.saveCacheData(CacheData.comPageInfoCacheKey + pageModel.pageId, pageInfo, pageInfo.md5)
             CacheData.saveCacheData(CacheData.comPageInfoCacheKey + pageModel.pageId, pageInfo, pageInfo.md5)
           }
           }
+          pageModel.displayPageInfoMd5 = pageInfo.md5
           //解析页面挂角广告资源
           //解析页面挂角广告资源
           pageAdvModel.analysisAdvSource(pageInfo);
           pageAdvModel.analysisAdvSource(pageInfo);
         }
         }
@@ -185,15 +186,25 @@ export class PageHelper {
       Logger.debug(TAG, 'parseGroup isCache: ' + isCache)
       Logger.debug(TAG, 'parseGroup isCache: ' + isCache)
       if (isCache) {
       if (isCache) {
         pageDto = await PageViewModel.getPageGroupCacheData(pageModel.bizCopy()) as PageDTO
         pageDto = await PageViewModel.getPageGroupCacheData(pageModel.bizCopy()) as PageDTO
-        pageModel.cacheGroupInfoMd5 = pageDto.md5
+        pageModel.displayGroupInfoMd5 = pageDto.md5
       } else {
       } else {
         pageDto = await PageViewModel.getPageGroupCompData(pageModel.bizCopy()) as PageDTO
         pageDto = await PageViewModel.getPageGroupCompData(pageModel.bizCopy()) as PageDTO
-        if (pageDto.md5 == pageModel.cacheGroupInfoMd5) {
+        if (pageDto.md5 == pageModel.displayGroupInfoMd5) {
           Logger.debug(TAG, 'parseGroup cache load, return: ' + pageDto.md5)
           Logger.debug(TAG, 'parseGroup cache load, return: ' + pageDto.md5)
-          // 缓存数据一致，不再刷新
+          // 下拉刷新场景，数据没变，拦截刷新UI，重置相关参数
+          if (pageModel.loadStrategy === 2) {
+            // 缓存数据一致，不再刷新
+            this.refreshUIEnd(pageModel, true)
+            // 第一页不刷新，分页数据清除
+            pageModel.hasMore = true
+            this.deleteMorePage(pageModel)
+            pageModel.pageTotalCompSize = pageModel.compList.size()
+          }
+          pageModel.currentPage++
           return
           return
         }
         }
-        Logger.debug(TAG, 'parseGroup cache load, save: ')
+        pageModel.displayGroupInfoMd5 = pageDto.md5
+        Logger.debug(TAG, 'parseGroup cache load, save: ' + pageDto.md5)
         // 保存缓存
         // 保存缓存
         CacheData.saveCacheData(CacheData.compGroupInfoDataCacheKey + pageModel.pageId + pageModel.groupId, pageDto,
         CacheData.saveCacheData(CacheData.compGroupInfoDataCacheKey + pageModel.pageId + pageModel.groupId, pageDto,
           pageDto.md5)
           pageDto.md5)
@@ -238,9 +249,11 @@ export class PageHelper {
 
 
     // 批查互动数据
     // 批查互动数据
     this.allCompBatchRequest(pageInfo.oneRequestPageGroupCompList.convertToArray(), pageModel)
     this.allCompBatchRequest(pageInfo.oneRequestPageGroupCompList.convertToArray(), pageModel)
-
-    //
-    pageModel.currentPage++
+    // 记录第一页数量
+    this.saveFirstPageEndIndex(pageModel)
+    if (!isCache) {
+      pageModel.currentPage++
+    }
     pageModel.viewType = ViewType.LOADED
     pageModel.viewType = ViewType.LOADED
     this.refreshUIEnd(pageModel, true)
     this.refreshUIEnd(pageModel, true)
 
 
@@ -754,6 +767,40 @@ export class PageHelper {
     }
     }
 
 
   }
   }
+
+  saveFirstPageEndIndex(pageModel: PageModel) {
+    pageModel.firstPageEndIndex = pageModel.compList.size() - 1
+  }
+
+  static updateFirstPageEndIndex(pageModel: PageModel, isDel: boolean, index: number) {
+    if (index > pageModel.firstPageEndIndex) {
+      return
+    }
+    // 这里默认删除、添加都是一条一条处理
+    let count = 1
+    let endIndex = pageModel.firstPageEndIndex
+    if (isDel) {
+      // 第一页里删除
+      let offset = Math.min(endIndex - index, count)
+      endIndex = endIndex - offset
+    } else {
+      // 第一页里添加
+      endIndex = endIndex + count
+    }
+    pageModel.firstPageEndIndex = endIndex
+  }
+
+  /**
+   * 删除分页数据，保留第一页的数据。（下拉刷新场景用到）
+   */
+  deleteMorePage(pageModel: PageModel) {
+    Logger.debug(TAG, 'deleteMorePage endindex: ' + pageModel.firstPageEndIndex)
+    if (pageModel.firstPageEndIndex < 0) {
+      return
+    }
+    // 从第二页开始删
+    pageModel.compList.deleteItems(pageModel.firstPageEndIndex + 1)
+  }
 }
 }
 
 
 
 

@@ -63,9 +63,11 @@ export default class PageModel {
   pageType: number = 0;
   pageType: number = 0;
 
 
   extra: string = ''
   extra: string = ''
-  // 缓存数据相关
-  cachePageInfoMd5: string = ''
-  cacheGroupInfoMd5: string = ''
+  // 页面加载，md5数据相关（初始缓存、下拉刷新用到）
+  displayPageInfoMd5: string = ''
+  displayGroupInfoMd5: string = ''
+  // 第一页，最后一个comp下标，用于区分分页加载（下拉刷新，清除分页数据）
+  firstPageEndIndex = -1
 
 
   /**
   /**
    * 简单复制业务数据
    * 简单复制业务数据