Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

王士厅
Commit 218d15a9a7cb73e9b7961d0d16c02e56e4631fd7 218d15a9 2 parents 016f863b fd3e2551
Showing 20 changed files with 121 additions and 91 deletions
sight_harmony/commons/wdNetwork/src/main/ets/http/AxiosRequest.ets
sight_harmony/commons/wdNetwork/src/main/ets/http/HttpUrlUtils.ets
sight_harmony/features/wdComponent/src/main/ets/components/CompParser.ets
sight_harmony/features/wdComponent/src/main/ets/components/ENewspaperPageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/ImageAndTextPageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card19Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card9Component.ets
sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhSingleRow04.ets
sight_harmony/features/wdComponent/src/main/ets/components/peopleShipHomePage/PeopleShipHomeListComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/search/SearchComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/search/SearchResultComponent.ets
sight_harmony/features/wdComponent/src/main/ets/components/search/SearchResultContentComponent.ets
sight_harmony/features/wdComponent/src/main/ets/dialog/ENewspaperListDialog.ets
sight_harmony/features/wdComponent/src/main/ets/pages/MineHomePage.ets
sight_harmony/features/wdComponent/src/main/ets/pages/VisitorCommentPage.ets
sight_harmony/features/wdDetailPlayShortVideo/src/main/ets/view/PlayerProgressView.ets
sight_harmony/products/phone/src/main/ets/pages/launchPage/LaunchAdvertisingPage.ets
sight_harmony/products/phone/src/main/ets/pages/launchPage/LaunchInterestsHobbiesPage.ets
sight_harmony/products/phone/src/main/ets/pages/view/BottomNavigationComponent.ets
sight_harmony/products/phone/src/main/ets/pages/view/VideoChannelPage.ets
--- a/sight_harmony/commons/wdNetwork/src/main/ets/http/AxiosRequest.ets
View file @218d15a
+++ b/sight_harmony/commons/wdNetwork/src/main/ets/http/AxiosRequest.ets
View file @218d15a
@@ -163,7 +163,7 @@ function buildErrorMsg(httpStatus: number): string {
       if(httpStatus != undefined){
         message = `连接出错(${httpStatus})!`;
       }else{
-        message = `连接出错!`;
+        message = `网络出小差了，请检查网络后重试`;
       }
     }
--- a/sight_harmony/commons/wdNetwork/src/main/ets/http/HttpUrlUtils.ets
View file @218d15a
+++ b/sight_harmony/commons/wdNetwork/src/main/ets/http/HttpUrlUtils.ets
View file @218d15a
@@ -13,7 +13,7 @@ export class HttpUrlUtils {
    */
   static readonly BOTTOM_NAV_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/bottomNavGroup";
   /**
-   * 底导详情接口
+   * 顶导详情接口
    */
   static readonly BOTTOM_NAV_DETAIL_PATH: string = "/api/rmrb-bff-display-zh/display/zh/c/bottomNavGroup/detail";
   /**
--- a/sight_harmony/features/wdComponent/src/main/ets/components/CompParser.ets
View file @218d15a
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/CompParser.ets
View file @218d15a
@@ -45,8 +45,6 @@ export struct CompParser {
   aboutToAppear(): void {
-
-
     console.log('CompParser-compDTO', JSON.stringify(this.compDTO))
     this.pageName = this.pageModel.pageInfo.name
     // 轮播图屏蔽音频类型稿件
@@ -81,13 +79,11 @@ export struct CompParser {
   @Builder
   componentBuilder() {
-    //CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO:this.compDTO })
-
     if (this.compDTO.operDataList[0]?.objectType !== '3' &&
       this.compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口
       if (this.compDTO.compStyle === CompStyle.Label_03) {
         LabelComponent({ compDTO: this.compDTO })
-        Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
+          Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
         if (this.compDTO.operDataList.length > this.audioItems.length) {
           ZhCarouselLayout01({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
@@ -104,7 +100,7 @@ export struct CompParser {
         } else {
           HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         }
-        Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) {
         ZhSingleRow02({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
@@ -121,20 +117,20 @@ export struct CompParser {
       } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
         ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
         ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
         // ZhSingleRow05({ compDTO })
         // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) {
         ZhSingleRow06({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
         //头图卡 和comStyle 2相同，
         Card5Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], titleShowPolicy: this.compDTO.titleShowPolicy, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) {
         // 大图卡
         Card2Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
@@ -142,28 +138,28 @@ export struct CompParser {
       } else if (this.compDTO.compStyle === CompStyle.Card_09) {
         //时间链卡
         Card9Component({ compDTO: this.compDTO, contentDTO:this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if(this.compDTO.compStyle === CompStyle.Card_13){
         Card6Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if(this.compDTO.compStyle === CompStyle.Card_03){
         Card3Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       }else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
         ZhSingleColumn04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) {
         // ZhSingleColumn05({ compDTO: compDTO })
         // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
       } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) {
-        Divider().strokeWidth(3).color('#ffffff').padding({ left: 0, right: 0 }).margin({ top: -3 })
-        Divider().strokeWidth(6).color('#f5f5f5')
+        // Divider().strokeWidth(3).color('#ffffff').padding({ left: 0, right: 0 }).margin({ top: -3 })
+        // Divider().strokeWidth(6).color('#f5f5f5')
         ZhSingleColumn09({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
-        Divider().strokeWidth(6).color('#f5f5f5')
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告
         AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO })
         //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 0, right: 0 })
-        Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
+        Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
       } else if (!Number.isNaN(Number(this.compDTO.compStyle))) {
         CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName });
         Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
--- a/sight_harmony/features/wdComponent/src/main/ets/components/ENewspaperPageComponent.ets
View file @218d15a
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/ENewspaperPageComponent.ets
View file @218d15a
@@ -32,7 +32,7 @@ export struct ENewspaperPageComponent {
   @State swiperIndex: number = 0;
   //当前选择的日期标记
   @State selectDate: Date = new Date()
-  @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
+  @Provide bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   @State ratio: string = '100%'
   @State toastText: ResourceStr = ""
@@ -280,17 +280,18 @@ export struct ENewspaperPageComponent {
             this.swiperIndex = index
           })
-          Image($r('app.media.newspaper_shadow'))
-            .height($r('app.float.vp_12'))
-            .width('100%')
-            .margin({ left: 10, right: 10, top: -1 })
-            .objectFit(ImageFit.Contain)
-            .alignRules({
-              top: { anchor: "e_newspaper_content", align: VerticalAlign.Bottom },
-              // left: { anchor: 'e_newspaper_content', align: HorizontalAlign.Start },
-              // right: { anchor: 'e_newspaper_content', align: HorizontalAlign.End }
-            })
-            .id('e_newspaper_shadow')
+          Row() {
+            Image($r('app.media.newspaper_shadow'))
+              .height($r('app.float.vp_12'))
+              .width('100%')
+              .objectFit(ImageFit.Contain)
+
+          }.margin({ top: -1,left: 10, right: 10 }).alignRules({
+            top: { anchor: "e_newspaper_content", align: VerticalAlign.Bottom },
+            // left: { anchor: 'e_newspaper_content', align: HorizontalAlign.Start },
+            // right: { anchor: 'e_newspaper_content', align: HorizontalAlign.End }
+          })
+          .id('e_newspaper_shadow')
           Row() {
             Text(this.swiperIndex + 1 == this.newspaperListBean?.list?.length ? '已到底部，可以选择其他日期' :
@@ -407,7 +408,7 @@ export struct ENewspaperPageComponent {
       .width('100%')
       .height('100%')
       .backgroundColor($r('app.color.color_80000000'))
-      .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
+   //   .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
       .id('e_newspaper_container')
       if (this.isOpenListDialog) {
--- a/sight_harmony/features/wdComponent/src/main/ets/components/ImageAndTextPageComponent.ets
View file @218d15a
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/ImageAndTextPageComponent.ets
View file @218d15a
@@ -61,6 +61,7 @@ export struct ImageAndTextPageComponent {
   @State likeNum: number = 0
   @State reachEndIncreament: number = 0
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
+  @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   @State isScrollTop: boolean = true
   @State offsetY: number = 0
   pageShowTime:number = 0;
@@ -88,7 +89,7 @@ export struct ImageAndTextPageComponent {
               action: this.action,
               isPageEnd: $isPageEnd
             })
-              .padding({ top: 15, bottom: 10 })
+              .padding({ bottom: 10 })
             Column() {
               // 点赞
               if (this.contentDetailData?.openLikes && this.contentDetailData?.likesStyle !== 4) {
@@ -159,8 +160,8 @@ export struct ImageAndTextPageComponent {
           }
           .id('imgTextContainer')
         }
+        .padding({bottom: 44})
         .width(CommonConstants.FULL_WIDTH)
-        .height(CommonConstants.FULL_HEIGHT)
         .scrollBar(BarState.Off)
         .align(Alignment.Top)
         .onReachEnd(() => {
@@ -174,10 +175,10 @@ export struct ImageAndTextPageComponent {
             retry: () => {
               this.getDetail()
             }
-          }).padding({ bottom: 200 })
+          }).padding({ bottom: 44 })
         } else {
           if (!this.isPageEnd) {
-            detailedSkeleton().padding({ bottom: this.bottomSafeHeight })
+            detailedSkeleton().padding({ bottom: 44 })
           }
         }
         // 底部交互区
@@ -206,12 +207,10 @@ export struct ImageAndTextPageComponent {
             this.isScrollTop = !this.isScrollTop
           }
         })
-          .position({ y: '100%' })
       }
+      .margin({top: `${this.topSafeHeight}px`, bottom: `${this.bottomSafeHeight}px`})
       .width(CommonConstants.FULL_WIDTH)
-      .height(CommonConstants.FULL_HEIGHT)
-      .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
-      .padding({ top: 38 })
+      // .height(CommonConstants.FULL_HEIGHT)
       // 发布时间
       Column() {
@@ -242,6 +241,7 @@ export struct ImageAndTextPageComponent {
         .backgroundColor(Color.White)
       }.backgroundColor(Color.White)
     }
+    .margin({top: `${this.topSafeHeight}px`, bottom: `${this.bottomSafeHeight}px`})
     .width(CommonConstants.FULL_WIDTH)
     .height(CommonConstants.FULL_HEIGHT)
     .backgroundColor(Color.White)
--- a/sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card19Component.ets
View file @218d15a
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card19Component.ets
View file @218d15a
@@ -239,7 +239,7 @@ struct createImg {
           }) {
             Stack({alignContent: Alignment.BottomEnd}) {
               Image(this.loadImg ? item.fullUrl : '')
-                .backgroundColor(0xf5f5f5)
+                .backgroundColor(index === 2 ? 0xffffff : 0xf5f5f5)
                 .aspectRatio(1)
                 .width(113)
                 .height(113)
--- a/sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card9Component.ets
View file @218d15a
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/cardview/Card9Component.ets
View file @218d15a
@@ -108,7 +108,7 @@ export struct Card9Component {
       // 时间线--后端返回三个，
       Column() {
         ForEach(this.contentDTO.slideShows, (item: slideShows, index: number) => {
-          this.timelineItem(item, index)
+          this.timelineItem(item, index, index === this.contentDTO.slideShows.length - 1)
         })
       }
@@ -149,25 +149,41 @@ export struct Card9Component {
   }
   @Builder
-  timelineItem(item: slideShows, index: number) {
+  timelineItem(item: slideShows, index: number, isLastOne: boolean) {
     Column() {
       Stack() {
-        if (index < this.contentDTO.slideShows.length - 1) {
+        if (index === 0) {
           Divider()
             .vertical(true)
             .color($r('app.color.color_EDEDED'))
             .strokeWidth(1)
-            .margin({ top: index > 0 ? 0 : 16, left: 4 })
-        }
-        if (index > 0 && index == this.contentDTO.slideShows.length - 1) {
+            .margin({ top: 16, left: 4 })
+            .height(16)
+        } else {
           Divider()
             .vertical(true)
             .color($r('app.color.color_EDEDED'))
             .strokeWidth(1)
+            .margin({ top: 0, left: 4 })
             .height(16)
-            .margin({ left: 4 })
+          if (!isLastOne)
+          {
+            Divider()
+              .vertical(true)
+              .color($r('app.color.color_EDEDED'))
+              .strokeWidth(1)
+              .margin({ top: 16, left: 4 })
+              .height(16)
+          }
         }
+        // Divider()
+        //   .vertical(true)
+        //   .color($r('app.color.color_EDEDED'))
+        //   .strokeWidth(1)
+        //   .margin({ top: index > 0 ? 0 : 32, left: 4 })
+        //   .height(16)
+
         Column() {
           Row() {
             // 标题
@@ -195,21 +211,14 @@ export struct Card9Component {
               .maxLines(2)
               .textOverflow({ overflow: TextOverflow.Ellipsis })
               .alignSelf(ItemAlign.Center)
-              .margin({ left: 12 })
-              // .padding({bottom: 20})
-            // if (item.fullColumnImgUrls[0] && item.fullColumnImgUrls[0].url) {
-            //   Image(this.loadImg? item.fullColumnImgUrls[0].url : '')
-            //     .backgroundColor(0xf5f5f5)
-            //     .width(90)
-            //     .height(60)
-            //     .borderRadius($r('app.float.image_border_radius'))
-            // }
+              .margin({ left: 4 })
+              .padding({ bottom: 20, left: 12 })
+              .border({ width: { left: isLastOne ? 0 : 1 }, color: 0xededed})
           }
         }
       }
       .alignContent(Alignment.TopStart)
     }
-    .height(item.fullColumnImgUrls[0] && item.fullColumnImgUrls[0].url ? 100 : 50)
     .alignItems(HorizontalAlign.Start)
   }
 }
--- a/sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhSingleRow04.ets
View file @218d15a
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/compview/ZhSingleRow04.ets
View file @218d15a
@@ -109,6 +109,7 @@ struct localCard {
         .width('100%')
         .margin({ bottom: 6 })
         .flexShrink(0)
+        .maxLines(1)
       Text(this.operDataListItem.newsTitle)
         .width(CommonConstants.FULL_PARENT)
--- a/sight_harmony/features/wdComponent/src/main/ets/components/peopleShipHomePage/PeopleShipHomeListComponent.ets
View file @218d15a
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/peopleShipHomePage/PeopleShipHomeListComponent.ets
View file @218d15a
@@ -24,7 +24,7 @@ export struct PeopleShipHomeListComponent {
     // 列表
     else if (this.publishCount == 0) {
       // 无数据展示
-      EmptyComponent({emptyType: 12}).height('100%')
+      EmptyComponent({emptyType: 12}).height('60%')
     } else {
       Column() {
         Stack({ alignContent: Alignment.Top }){
--- a/sight_harmony/features/wdComponent/src/main/ets/components/search/SearchComponent.ets
View file @218d15a
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/search/SearchComponent.ets
View file @218d15a
 import router from '@ohos.router'
-import { BreakpointSystem, NetworkUtil, StringUtils, ToastUtils } from 'wdKit'
+import { BreakpointSystem, DateTimeUtils, NetworkUtil, StringUtils, ToastUtils } from 'wdKit'
 import { ParamType, TrackConstants, Tracking } from 'wdTracking/Index'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import { SearchHistoryItem } from '../../viewmodel/SearchHistoryItem'
@@ -32,6 +32,7 @@ export struct SearchComponent {
   @State count:string[] = []
   @State isGetRequest:boolean = false
   @Link fromTabName: string
+  @State sameSearch:number = 0 //再次搜索
   @StorageProp('currentBreakpoint') @Watch("currentChanged")currentBreakpoint: string = 'sm';
   private breakpointSystem = new BreakpointSystem();
@@ -175,7 +176,7 @@ export struct SearchComponent {
               this.getSearchHistoryData()
               this.getSearchInputResData(this.searchText)
             }
-          },percent:this.percent})
+          },percent:this.percent,sameSearch:this.sameSearch})
         } else {
           //联想搜索
           SearchRelatedComponent({relatedSearchContentData:$relatedSearchContentsData,onGetSearchRes: (item): void => this.getSearchRelatedResData(item),searchText:this.searchText,percent:this.percent})
@@ -402,6 +403,7 @@ export struct SearchComponent {
       }
       this.isGetRequest = true
       this.resetSearch()
+      this.sameSearch = DateTimeUtils.getTimeStamp()
     }).catch((err: Error) => {
       console.log(TAG, JSON.stringify(err))
       this.isGetRequest = true
--- a/sight_harmony/features/wdComponent/src/main/ets/components/search/SearchResultComponent.ets
View file @218d15a
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/search/SearchResultComponent.ets
View file @218d15a
@@ -29,6 +29,8 @@ export struct SearchResultComponent {
   onClickTryAgain?: () => void;
   @State isConnectNetwork : boolean = NetworkUtil.isNetConnected()
   @Prop percent:number = 1
+  @Prop sameSearch:number = 0
+
   aboutToAppear(): void {
     if (this.count.length === 0 && this.isGetRequest == true) {
@@ -137,7 +139,7 @@ export struct SearchResultComponent {
         Tabs({ barPosition: BarPosition.Start, controller: this.controller }) {
           ForEach(this.count, (item: string, index: number) => {
             TabContent() {
-              SearchResultContentComponent({ keywords: this.searchText, searchType: item })
+              SearchResultContentComponent({ keywords: this.searchText, searchType: item ,sameSearch:this.sameSearch,isCurrentShow:this.currentIndex === index})
             }.tabBar(this.TabBuilder(index, item))
             .layoutWeight(1)
           }, (item: string, index: number) => index.toString())
--- a/sight_harmony/features/wdComponent/src/main/ets/components/search/SearchResultContentComponent.ets
View file @218d15a
+++ b/sight_harmony/features/wdComponent/src/main/ets/components/search/SearchResultContentComponent.ets
View file @218d15a
@@ -51,7 +51,22 @@ export struct SearchResultContentComponent {
   @State moreWidth:number = 20
   @State listLeft: number = 0
   @State isEnd: boolean = false
+  @Watch('updateData') @Prop sameSearch:number = 0
+  @Prop isCurrentShow:boolean = false;
+  updateData(){
+    if(this.isCurrentShow){
+      this.data_rmh = []
+
+      this.data.clearAllData()
+
+      this.curPageNum = 1
+      this.hasMore = true
+      this.isLoading = false
+      this.getNewSearchResultData()
+    }
+
+  }
   aboutToAppear(): void {
     if (this.searchType == "全部") {
--- a/sight_harmony/features/wdComponent/src/main/ets/dialog/ENewspaperListDialog.ets
View file @218d15a
+++ b/sight_harmony/features/wdComponent/src/main/ets/dialog/ENewspaperListDialog.ets
View file @218d15a
@@ -18,6 +18,7 @@ export struct ENewspaperListDialog {
   private listScroller: Scroller = new Scroller()
   @State scrollOffset: number = 0
   @State isCurrentViewOpen: boolean = false
+  @Consume bottomSafeHeight:number
   //文字版选择弹框
   pageListDialogController: CustomDialogController = new CustomDialogController({
     builder: ENewspaperPageDialog({
@@ -266,13 +267,13 @@ export struct ENewspaperListDialog {
           left: 15,
           right: 15,
           // top: 16,
-          bottom: 16
+         // bottom: 16
         })
         .margin({
           bottom: 85
         })
         .scrollBar(BarState.Off)
-        .edgeEffect(EdgeEffect.None)
+        .edgeEffect(EdgeEffect.Spring)
         .onScrollIndex((firstIndex: number, lastIndex: number, centerIndex: number) => {
           console.info('ENewspaperListDialog::first' + firstIndex)
           console.info('ENewspaperListDialog::last' + lastIndex)
@@ -288,19 +289,14 @@ export struct ENewspaperListDialog {
           // }
         })
       }
-      // .margin({ top: 124 })
       .margin({ top: this.topHeight })
-
       .width('100%')
       .backgroundColor(Color.White)
-      .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.BOTTOM])
-      .onClick(() => {
-      })
     }.width('100%')
     .height('100%')
     .backgroundColor('#80000000')
-    .margin({bottom:44})
+    .margin({bottom:50})
     .onClick(() => {
       if (this.closeDialog) {
         this.closeDialog()
--- a/sight_harmony/features/wdComponent/src/main/ets/pages/MineHomePage.ets
View file @218d15a
+++ b/sight_harmony/features/wdComponent/src/main/ets/pages/MineHomePage.ets
View file @218d15a
@@ -214,12 +214,7 @@ struct MineHomePage {
                       .fontWeight('400lpx')
                       .fontColor(this.isHasIntroduction?$r('app.color.color_222222'):$r('app.color.color_999999'))
                       .textAlign(TextAlign.Start)
-                      .onClick(()=>{
-                        let params: editModelParams = {
-                          editContent: this.isHasIntroduction?this.desc:''
-                        }
-                        WDRouterRule.jumpWithPage(WDRouterPage.editUserIntroductionPage,params)
-                      })
+
                     if(!this.isHasIntroduction){
                       Image($r('app.media.user_info_edit_icon'))
                         .width('27lpx')
@@ -227,7 +222,12 @@ struct MineHomePage {
                         .interpolation(ImageInterpolation.High)
                         .objectFit(ImageFit.Auto)
                     }
-                  }
+                  }.onClick(()=>{
+                    let params: editModelParams = {
+                      editContent: this.isHasIntroduction?this.desc:''
+                    }
+                    WDRouterRule.jumpWithPage(WDRouterPage.editUserIntroductionPage,params)
+                  })
                   Text(`来到人民日报${this.registerTimeForDay}天`)
--- a/sight_harmony/features/wdComponent/src/main/ets/pages/VisitorCommentPage.ets
View file @218d15a
+++ b/sight_harmony/features/wdComponent/src/main/ets/pages/VisitorCommentPage.ets
View file @218d15a
@@ -102,6 +102,7 @@ struct VisitorCommentPage {
       .width('100%')
     }.width("100%")
     .height("100%")
+    .backgroundColor(Color.White)
     .padding({top:px2vp(this.topSafeHeight),bottom:px2vp(this.bottomSafeHeight)})
   }
--- a/sight_harmony/features/wdDetailPlayShortVideo/src/main/ets/view/PlayerProgressView.ets
View file @218d15a
+++ b/sight_harmony/features/wdDetailPlayShortVideo/src/main/ets/view/PlayerProgressView.ets
View file @218d15a
@@ -55,6 +55,7 @@ export struct PlayerProgressView {
     }
     .width('100%')
     .zIndex(2000)
+    .height(10)
     .visibility(this.showLoading ? Visibility.Visible: Visibility.Hidden)
     .margin({ bottom: 10 })
     // .markAnchor({ x: 0, y: '100%' })
--- a/sight_harmony/products/phone/src/main/ets/pages/launchPage/LaunchAdvertisingPage.ets
View file @218d15a
+++ b/sight_harmony/products/phone/src/main/ets/pages/launchPage/LaunchAdvertisingPage.ets
View file @218d15a
@@ -115,7 +115,7 @@ struct LaunchAdvertisingPage {
               if (this.defaultModel.linkUrl.length > 0 || this.defaultModel.objectId.length > 0){
                 Button(){
                   Row(){
-                    Text('点击跳转至详情')
+                    Text(this.defaultModel.isAd == '1'?'点击跳转至详情或第三方应用':'点击跳转至详情')
                       .fontSize('31lpx')
                       .fontColor(Color.White)
                       .margin({
--- a/sight_harmony/products/phone/src/main/ets/pages/launchPage/LaunchInterestsHobbiesPage.ets
View file @218d15a
+++ b/sight_harmony/products/phone/src/main/ets/pages/launchPage/LaunchInterestsHobbiesPage.ets
View file @218d15a
@@ -3,6 +3,7 @@ import { WDRouterRule } from 'wdRouter';
 import { WDRouterPage } from 'wdRouter';
 import { SPHelper } from 'wdKit/Index';
 import { SpConstants } from 'wdConstant/Index';
+import { CustomToast} from 'wdKit'
 import { ButtonOptions, promptAction, window } from '@kit.ArkUI';
 import { ParamType, TrackConstants, TrackingContent } from 'wdTracking/Index';
 import { ImageKnifeComponent,ScaleType } from '@ohos/imageknife';
@@ -16,6 +17,16 @@ struct LaunchInterestsHobbiesPage {
   @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  dialogToast: CustomDialogController = new CustomDialogController({
+    builder: CustomToast({
+      msg: '请先选择您感兴趣的内容哦',
+    }),
+    autoCancel: false,
+    alignment: DialogAlignment.Center,
+    customStyle: true,
+    maskColor:"#00000000"
+  })
+
   aboutToAppear(){
     //请求接口，获取兴趣偏好数据
     this.requestInterestsData()
@@ -153,11 +164,7 @@ struct LaunchInterestsHobbiesPage {
           .borderRadius('10lpx')
           .onClick(()=>{
             if (this.selectCount == 0) {
-              promptAction.showToast({
-                message : '请先选择您感兴趣的内容哦',
-                duration: 2000,
-                bottom: '50%',
-              })
+              this.dialogToast.open()
                return
             }
             this.saveTagIds()
--- a/sight_harmony/products/phone/src/main/ets/pages/view/BottomNavigationComponent.ets
View file @218d15a
+++ b/sight_harmony/products/phone/src/main/ets/pages/view/BottomNavigationComponent.ets
View file @218d15a
-import { BottomNavi, CommonConstants, DisplayDirection } from 'wdConstant';
-import { BottomNavDTO, NavigationBodyDTO, NavigationDetailDTO, TopNavDTO } from 'wdBean';
-import { EmitterEventId, EmitterUtils, Logger, StringUtils } from 'wdKit';
+import { BottomNavi, DisplayDirection } from 'wdConstant';
+import { BottomNavDTO, NavigationBodyDTO, TopNavDTO } from 'wdBean';
+import { EmitterEventId, EmitterUtils, Logger } from 'wdKit';
 import { HttpUtils } from 'wdNetwork/Index';
 import HomeChannelUtils, { AssignChannelParam } from 'wdRouter/Index';
 import { MinePageComponent } from 'wdComponent/src/main/ets/components/page/MinePageComponent';
 import { CompUtils, TopNavigationComponentNew } from 'wdComponent/Index';
 import { VideoChannelPage } from './VideoChannelPage';
 import ChannelViewModel from 'wdComponent/src/main/ets/viewmodel/ChannelViewModel';
-import { ALL, ImageKnifeComponent, ImageKnifeOption, NONE } from '@ohos/imageknife';
+import { ALL, ImageKnifeComponent, ImageKnifeOption } from '@ohos/imageknife';
 import { ParamType, Tracking } from 'wdTracking/Index';
 const TAG = 'BottomNavigationComponent';
@@ -102,7 +102,6 @@ export struct BottomNavigationComponent {
           }
           .tabBar(this.tabBarBuilder(navItem, index))
-          // .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP])
         });
       }
@@ -140,6 +139,7 @@ export struct BottomNavigationComponent {
         .opacity(this.currentNavIndex === index ? this.FULL_OPACITY : this.SIXTY_OPACITY)
     }
     .zIndex(10)
+    .width('100%')
     .height($r('app.float.bottom_navigation_barHeight'))
     .hoverEffect(HoverEffect.Highlight)
     .visibility(this.displayDirection === DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None)
--- a/sight_harmony/products/phone/src/main/ets/pages/view/VideoChannelPage.ets
View file @218d15a
+++ b/sight_harmony/products/phone/src/main/ets/pages/view/VideoChannelPage.ets
View file @218d15a
@@ -125,7 +125,6 @@ export struct VideoChannelPage {
         }, (item: TopNavDTO) => item.channelId + '')
       }
       .width('100%')
-
       .justifyContent(FlexAlign.Center)
       // 搜索按钮
@@ -182,7 +181,7 @@ export struct VideoChannelPage {
             channelId: item.channelId + '',
             autoRefresh: this.autoRefresh
           })
-            .padding({ top: px2vp(this.topSafeHeight) + 55 })
+            .padding({ top: px2vp(this.topSafeHeight) + 44 })
             .backgroundColor(Color.White)
         }
       }, (item: TopNavDTO) => item.channelId + '')