fix:17516 稿件详情页-相关推荐不该展示音频相关数据;17488 图文稿件详情，查看大图，极限左滑或右滑，不应支持滑动，如从第1张左滑到最后一张。见附件视频

yuzhilin
Commit 011692344bcc2a41a8341aba83c37c1efaaf7f85 01169234 1 parent 984a1c61
Showing 4 changed files with 66 additions and 38 deletions
sight_harmony/features/wdComponent/src/main/ets/components/ImageAndTextPageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/SpacialTopicPageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/view/OperRowListView.ets
sight_harmony/features/wdComponent/src/main/ets/pages/MultiPictureListPage.ets
--- a/sight_harmony/features/wdComponent/src/main/ets/components/ImageAndTextPageComponent.ets
View file @0116923
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/ImageAndTextPageComponent.ets
View file @0116923
@@ -52,35 +52,11 @@ export struct ImageAndTextPageComponent {
   @State isNetConnected: boolean = true
   @State info: Area | null = null
   @State likeNum: number = 0
-  @State reachEndIncreament : number = 0
+  @State reachEndIncreament: number = 0
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   build() {
-    Column() {
-      // 发布时间
-      Row() {
-        Image(this.contentDetailData?.rmhInfo ? $r('app.media.logo_rmh') : $r('app.media.logo_rmrb'))
-          .width(80)
-          .height(28)
-        Text(this.publishTime)
-          .fontColor($r('app.color.color_B0B0B0'))
-          .fontSize(13)
-      }
-      .width(CommonConstants.FULL_WIDTH)
-      .height(32)
-      .padding({ left: 15, right: 15, })
-      .justifyContent(FlexAlign.SpaceBetween)
-      .alignItems(VerticalAlign.Bottom)
-
-      Row() {
-        Image($r('app.media.line'))
-          .width('100%')
-          .height(6)
-          .objectFit(ImageFit.Cover)
-          .margin({ top: 10 })
-      }
-      .padding({ left: 15, right: 15 })
-      .backgroundColor(Color.White)
-
+    Stack({ alignContent: Alignment.Top }) {
       Stack({ alignContent: Alignment.Bottom }) {
         Scroll(this.scroller) {
           Column() {
@@ -89,7 +65,7 @@ export struct ImageAndTextPageComponent {
               action: this.action,
               isPageEnd: $isPageEnd
             })
-              .padding({ bottom: 10 })
+              .padding({ top: 15, bottom: 10 })
             Column() {
               // 点赞
               if (this.contentDetailData?.openLikes && this.contentDetailData?.likesStyle !== 4) {
@@ -156,11 +132,9 @@ export struct ImageAndTextPageComponent {
               }
             }
           }
-
         }
         .width(CommonConstants.FULL_WIDTH)
-        // .height(CommonConstants.FULL_HEIGHT)
-        .padding({ bottom: 76 })
+        .height(CommonConstants.FULL_HEIGHT)
         .scrollBar(BarState.Off)
         .align(Alignment.Top)
         .onReachEnd(() => {
@@ -177,11 +151,10 @@ export struct ImageAndTextPageComponent {
           }).padding({ bottom: 200 })
         } else {
           if (!this.isPageEnd) {
-            detailedSkeleton()
+            detailedSkeleton().padding({ bottom: this.bottomSafeHeight })
           }
         }
-        //底部交互区
-        if (this.operationButtonList.length) {
+        // 底部交互区
         OperRowListView({
           contentDetailData: this.contentDetailData,
           publishCommentModel: this.publishCommentModel,
@@ -189,12 +162,41 @@ export struct ImageAndTextPageComponent {
           styleType: 1,
         })
       }
+      .width(CommonConstants.FULL_WIDTH)
+      .height(CommonConstants.FULL_HEIGHT)
+      .padding({ top: 38 })
+
+      // 发布时间
+      Column() {
+        Row() {
+          Image(this.contentDetailData?.rmhInfo ? $r('app.media.logo_rmh') : $r('app.media.logo_rmrb'))
+            .width(80)
+            .height(28)
+          Text(this.publishTime)
+            .fontColor($r('app.color.color_B0B0B0'))
+            .fontSize(13)
         }
+        .width(CommonConstants.FULL_WIDTH)
+        .height(32)
+        .padding({ left: 15, right: 15, })
+        .justifyContent(FlexAlign.SpaceBetween)
+        .alignItems(VerticalAlign.Bottom)
+        Row() {
+          Image($r('app.media.line'))
+            .width('100%')
+            .height(6)
+            .objectFit(ImageFit.Cover)
+            .margin({ top: 10 })
+        }
+        .padding({ left: 15, right: 15 })
+        .backgroundColor(Color.White)
+      }.backgroundColor(Color.White)
     }
     .width(CommonConstants.FULL_WIDTH)
     .height(CommonConstants.FULL_HEIGHT)
     .backgroundColor(Color.White)
+
   }
   private async getDetail() {
@@ -260,7 +262,11 @@ export struct ImageAndTextPageComponent {
       channelId: String(this.contentDetailData?.reLInfo?.channelId)
     }
     let recommendList = await DetailViewModel.postRecommendList(params)
-    this.recommendList = recommendList;
+    if (recommendList.length > 0) {
+      //推荐列表过滤音频和活动入口
+      this.recommendList = recommendList.filter(item => item.objectType !== '3' &&  item.objectType !== '13');
+    }
+
   }
   // 已登录->查询用户对作品点赞、收藏状态
--- a/sight_harmony/features/wdComponent/src/main/ets/components/SpacialTopicPageComponent.ets
View file @0116923
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/SpacialTopicPageComponent.ets
View file @0116923
@@ -8,6 +8,8 @@ import { NativeCallH5Type } from 'wdWebComponent/src/main/ets/pages/NativeCallH5
 import { OperRowListView } from './view/OperRowListView';
 import DetailViewModel from '../viewmodel/DetailViewModel';
 import { publishCommentModel } from '../components/comment/model/PublishCommentModel';
+import { EmptyComponent } from '../components/view/EmptyComponent';
+import { NetworkUtil } from 'wdKit';
 const TAG: string = 'SpacialTopicPageComponent'
@@ -24,6 +26,8 @@ export struct SpacialTopicPageComponent {
   private dataPrepared = false;
   @State publishCommentModel: publishCommentModel = new publishCommentModel()
   @State operationButtonList: string[] = ['comment', 'collect', 'share']
+  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
+  @State isNetConnected: boolean = true
   private trySendData2H5() {
     if (!this.webPrepared || !this.dataPrepared) {
@@ -45,6 +49,8 @@ export struct SpacialTopicPageComponent {
   }
   private async getDetail() {
+    this.isNetConnected = NetworkUtil.isNetConnected()
+
     let contentId: string = ''
     let relId: string = ''
     let relType: string = ''
@@ -95,15 +101,28 @@ export struct SpacialTopicPageComponent {
         .height(CommonConstants.FULL_HEIGHT)
         .padding({ bottom: 75 })
+        if (!this.isNetConnected) {
+          EmptyComponent({
+            emptyType: 1,
+            emptyButton: true,
+            retry: () => {
+              this.getDetail()
+            }
+          }).padding({ bottom: 200 })
+        } else {
           if (!this.isPageEnd) {
             detailedSkeleton()
           }
+        }
         //底部交互区
         OperRowListView({
           contentDetailData: this.contentDetailData,
           publishCommentModel: this.publishCommentModel,
           operationButtonList: this.operationButtonList,
         })
+          .padding({
+            bottom: `${this.bottomSafeHeight}px`
+          })
       }
     }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
   }
--- a/sight_harmony/features/wdComponent/src/main/ets/components/view/OperRowListView.ets
View file @0116923
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/view/OperRowListView.ets
View file @0116923
@@ -61,7 +61,7 @@ export struct OperRowListView {
   @Prop componentType: number = 1 //1: 底部栏目样式    2: 新闻页中间位置样式  3:动态Tab内容下的互动入口
   @Prop pageComponentType: number = -1 //1:视频详情页
   @State likesStyle: number = this.contentDetailData.likesStyle // 赞样式 1红心(点赞) 2大拇指(祈福) 3蜡烛(默哀) 4置空
-  @State operationButtonList: string[] = ['comment', 'collect', 'share'] // 组件展示条件
+  @Prop operationButtonList?: string[] = ['comment', 'collect', 'share'] // 组件展示条件
   @State needLike: boolean = true
   @ObjectLink publishCommentModel: publishCommentModel
   @State styleType: number = 1
@@ -138,7 +138,7 @@ export struct OperRowListView {
         })
         .width(42)
-        if (this.contentDetailData) {
+        if (this.contentDetailData?.newsId) {
           ForEach(this.operationButtonList, (item: string, index: number) => {
             if (item == 'comment') {
               this.builderComment()
@@ -162,7 +162,8 @@ export struct OperRowListView {
     .backgroundColor(this.bgColor)
     .padding({
       top: 10,
-      bottom: `${this.bottomSafeHeight}px`
+      bottom: 10
+      // bottom: `${this.bottomSafeHeight}px`
       // bottom: 50
     })
--- a/sight_harmony/features/wdComponent/src/main/ets/pages/MultiPictureListPage.ets
View file @0116923
+++ b/sight_harmony/features/wdComponent/src/main/ets/pages/MultiPictureListPage.ets
View file @0116923
@@ -65,6 +65,8 @@ export struct MultiPictureListPage {
         .height(px2vp(this.picHeight) + 32)
         .vertical(false)
         .autoPlay(false)
+        .loop(false)
+        .effectMode(EdgeEffect.None)
         .cachedCount(3)
         .indicator(false)
         .displayCount(1)