Merge remote-tracking branch 'origin/main'

@@ -32,6 +32,10 @@ export struct CardParser {
   pageShowTime:number = 0;
   pageHideTime:number = 0;
 
+  aboutToAppear(): void {
+    console.log('CardParser-', JSON.stringify(this.contentDTO))
+  }
+
   onPageShow() {
     this.pageShowTime = DateTimeUtils.getTimeStamp()
   }

@@ -44,6 +44,7 @@ export struct CompParser {
   aboutToAppear(): void {
 
 
+
     console.log('CompParser-compDTO', JSON.stringify(this.compDTO))
     // 轮播图屏蔽音频类型稿件
     if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
@@ -93,7 +94,7 @@ export struct CompParser {
         this.compDTO.imageScale === 2) { // && compDTO.name ==="横划卡"
 
         LiveHorizontalCardComponent({ 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_Row_01 && this.compDTO.imageScale === 3) {
         if (this.compDTO.operDataList.length > 1) {
           HorizontalStrokeCardThreeTwoRadioForMoreComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
@@ -103,7 +104,7 @@ export struct CompParser {
         Divider().strokeWidth(5).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(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_Row_03) {
         ZhSingleRow03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName })
         Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })

@@ -229,7 +229,7 @@ export struct CardMediaInfo {
 @Extend(Text)
 function mediaText() {
   .fontColor($r('app.color.color_fff'))
-  .fontSize($r('app.float.font_size_14'))
+  .fontSize($r('app.float.font_size_13'))
   .lineHeight(18)
   .textShadow({
     radius: 2,

@@ -39,13 +39,16 @@ export struct Card11Component {
     Column() {
       Stack() {
         if(this.contentDTO.objectType == '5'){
-          Notes({ objectType: this.contentDTO.objectType }).height(20).align(Alignment.Center)
+          Notes({ objectType: this.contentDTO.objectType }).height(28).align(Alignment.Center)
         } else {
           if (this.contentDTO.seoTags) {
-            Notes({ newTags: this.contentDTO.seoTags }).height(20).align(Alignment.Center)
+            Notes({ newTags: this.contentDTO.seoTags }).height(28).align(Alignment.Center)
           }
           if (this.contentDTO.newTags) {
-            Notes({ newTags: this.contentDTO.newTags }).height(20).align(Alignment.Center)
+            Notes({ newTags: this.contentDTO.newTags }).height(28).align(Alignment.Center)
+          }
+          if (this.contentDTO.top === 1) {
+            Notes({ newTags: '置顶' }).height(28).align(Alignment.Center)
           }
         }
         Text() {
@@ -70,7 +73,7 @@ export struct Card11Component {
         .width(CommonConstants.FULL_WIDTH)
         .textIndent((this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) > 2 &&
           (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) < 5 ? 58 :
-          ((this.contentDTO.newTags?.length > 0 || this.contentDTO.seoTags?.length > 0) || this.contentDTO.objectType == '5') ? 35 :
+          ((this.contentDTO.newTags?.length > 0 || this.contentDTO.seoTags?.length > 0) || this.contentDTO.objectType == '5' || this.contentDTO.top === 1) ? 35 :
             0 )
 
       }.alignContent(Alignment.TopStart)

@@ -69,6 +69,9 @@ export struct Card2Component {
             if (this.contentDTO.newTags) {
               Notes({ newTags: this.contentDTO.newTags }).height(29).align(Alignment.Center)
             }
+            if (this.contentDTO.top === 1) {
+              Notes({ newTags: '置顶' }).height(29).align(Alignment.Center)
+            }
           }
           //新闻标题
           // if (this.contentDTO.newTags) {
@@ -101,7 +104,7 @@ export struct Card2Component {
           .align(Alignment.Start)
           .textIndent((this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) > 2 &&
             (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) < 5 ? 58 :
-            ((this.contentDTO.newTags?.length > 0 || this.contentDTO.seoTags?.length > 0) || this.contentDTO.objectType == '5') ? 35 :
+            ((this.contentDTO.newTags?.length > 0 || this.contentDTO.seoTags?.length > 0) || this.contentDTO.objectType == '5' || this.contentDTO.top === 1) ? 35 :
               0 )
         }.alignContent(Alignment.TopStart)
 

@@ -50,6 +50,9 @@ export struct Card3Component {
           if (this.contentDTO.newTags) {
             Notes({ newTags: this.contentDTO.newTags }).height(29).align(Alignment.Center)
           }
+          if (this.contentDTO.top === 1) {
+            Notes({ newTags: '置顶' }).height(29).align(Alignment.Center)
+          }
         }
         Text() {
           if (this.titleMarked) {
@@ -71,7 +74,7 @@ export struct Card3Component {
         .width(CommonConstants.FULL_WIDTH)
         .textIndent((this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) > 2 &&
           (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) < 5 ? 58 :
-          ((this.contentDTO.newTags?.length > 0 || this.contentDTO.seoTags?.length > 0) || this.contentDTO.objectType == '5') ? 35 :
+          ((this.contentDTO.newTags?.length > 0 || this.contentDTO.seoTags?.length > 0) || this.contentDTO.objectType == '5' || this.contentDTO.top === 1) ? 35 :
             0 )
       }.alignContent(Alignment.TopStart)
 

@@ -55,6 +55,9 @@ export struct Card4Component {
             if (this.contentDTO.newTags) {
               Notes({ newTags: this.contentDTO.newTags }).height(19).align(Alignment.Center)
             }
+            if (this.contentDTO.top === 1) {
+              Notes({ newTags: '置顶' }).height(20).align(Alignment.Center)
+            }
           }
           Text() {
             if (this.titleMarked) {
@@ -76,7 +79,7 @@ export struct Card4Component {
           .textOverflow({ overflow: TextOverflow.Ellipsis })
           .textIndent((this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) > 2 &&
             (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) < 5 ? 58 :
-            ((this.contentDTO.newTags?.length > 0 || this.contentDTO.seoTags?.length > 0) || this.contentDTO.objectType == '5') ? 35 :
+            ((this.contentDTO.newTags?.length > 0 || this.contentDTO.seoTags?.length > 0) || this.contentDTO.objectType == '5' || this.contentDTO.top === 1) ? 35 :
               0 )
         }.alignContent(Alignment.TopStart)
         //新闻标题

@@ -82,6 +82,9 @@ export struct Card5Component {
               if (this.contentDTO.newTags) {
                 Notes({ newTags: this.contentDTO.newTags }).height(20).align(Alignment.Center)
               }
+              if (this.contentDTO.top === 1) {
+                Notes({ newTags: '置顶' }).height(20).align(Alignment.Center)
+              }
             }
 
             Text() {
@@ -106,7 +109,7 @@ export struct Card5Component {
             .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
             .textIndent((this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) > 2 &&
               (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) < 5 ? 58 :
-              ((this.contentDTO.newTags?.length > 0 || this.contentDTO.seoTags?.length > 0) || this.contentDTO.objectType == '5') ? 35 :
+              ((this.contentDTO.newTags?.length > 0 || this.contentDTO.seoTags?.length > 0) || this.contentDTO.objectType == '5' || this.contentDTO.top === 1) ? 35 :
                 0 )
           }.alignContent(Alignment.TopStart)
         }

@@ -18,6 +18,7 @@ const TAG: string = 'Card6Component-Card13Component';
 @Component
 export struct Card6Component {
   @State pageId: string = '';
+  @State textHeight: number = 0 ; //获取文本的高度
   @State pageName: string = '';
   @State loadImg: boolean = false;
   @State clicked: boolean = false;
@@ -61,9 +62,14 @@ export struct Card6Component {
               if (this.contentDTO.newTags) {
                 Notes({ newTags: this.contentDTO.newTags }).height(28).align(Alignment.Center)
               }
+              if (this.contentDTO.top === 1) {
+                Notes({ newTags: '置顶' }).height(28).align(Alignment.Center)
               }
+            }
+
+            Text()
+            {
 
-            Text() {
               if (this.titleMarked) {
                 ForEach(this.textArr, (textItem: textItem) => {
                   if (textItem.isRed) {
@@ -77,19 +83,20 @@ export struct Card6Component {
                 Span(this.contentDTO.newsTitle)
               }
             }
+
             .fontColor(this.clicked ? 0x848484 : 0x222222)
             .fontSize(18)
             .lineHeight(27)
             .fontWeight(FontWeight.Normal)
-            .maxLines(3)
+            .maxLines(2)
             .alignSelf(ItemAlign.Start)
             .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
             .textIndent((this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) > 2 &&
               (this.contentDTO.newTags?.length || this.contentDTO.seoTags?.length) < 5 ? 58 :
-              ((this.contentDTO.newTags?.length > 0 || this.contentDTO.seoTags?.length > 0) || this.contentDTO.objectType == '5') ? 35 :
+              ((this.contentDTO.newTags?.length > 0 || this.contentDTO.seoTags?.length > 0) || this.contentDTO.objectType == '5' || this.contentDTO.top === 1) ? 35 :
                 0 )
           }.alignContent(Alignment.TopStart)
-          // .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 60: 156)
+
 
         }
         .justifyContent(FlexAlign.Start)
@@ -98,8 +105,12 @@ export struct Card6Component {
         CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
 
       }
+
       .alignItems(HorizontalAlign.Start)
-      .justifyContent(FlexAlign.Start)
+      .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 78: 156)
+
+
+      .justifyContent(FlexAlign.SpaceBetween)
       .width('64%')
 
 
@@ -132,3 +143,4 @@ export struct Card6Component {
     .alignItems(VerticalAlign.Top)
   }
 }
+

@@ -98,6 +98,9 @@ export struct Card9Component {
           if (this.contentDTO.newTags) {
             Notes({ newTags: this.contentDTO.newTags }).height(20).align(Alignment.Center)
           }
+          if (this.contentDTO.top === 1) {
+            Notes({ newTags: '置顶' }).height(20).align(Alignment.Center)
+          }
         }
 
       }.alignContent(Alignment.BottomStart)

@@ -40,6 +40,7 @@ export struct ZhSingleRow02 {
         }
         .listDirection(Axis.Horizontal)
         .scrollBar(BarState.Off)
+        .edgeEffect(EdgeEffect.None)
       }
       .width(CommonConstants.FULL_WIDTH)
       .height(208)

@@ -11,7 +11,6 @@ import {
 import { LiveInfoDTO } from 'wdBean/src/main/ets/bean/detail/LiveInfoDTO'
 import { VoiceInfoDTO } from 'wdBean/src/main/ets/bean/detail/VoiceInfoDTO'
 import { LazyDataSource,  StringUtils,  UserDataLocal } from 'wdKit/Index'
-import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import MinePageDatasModel from '../../model/MinePageDatasModel'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import { CreatorDetailRequestItem } from '../../viewmodel/CreatorDetailRequestItem'
@@ -30,6 +29,7 @@ import { SearchCreatorComponent } from './SearchCreatorComponent'
 import { JSON } from '@kit.ArkTS'
 import { MoreComponent } from '../cardview/MoreComponent'
 import { Card9Component } from '../cardview/Card9Component'
+import { WDRouterRule, WDRouterPage } from 'wdRouter/Index'
 
 const TAG = "SearchResultContentComponent"
 
@@ -46,6 +46,12 @@ export struct SearchResultContentComponent {
   curPageNum: number = 1;
   @State bean: FollowListDetailItem = new FollowListDetailItem("", "", "", "", "", "", "", "", "", -1, -1, "")
   scroller: Scroller = new Scroller()
+  private scroller2: Scroller = new Scroller()
+  @State ellipseW: number = 0
+  @State moreWidth:number = 20
+  @State listLeft: number = 0
+  @State isEnd: boolean = false
+
 
   aboutToAppear(): void {
     if (this.searchType == "全部") {
@@ -243,7 +249,7 @@ export struct SearchResultContentComponent {
       if (this.count == 0) {
         ListHasNoMoreDataUI({ style: 2 })
       } else {
-        List() {
+        List({scroller:this.scroller2}) {
           if (this.data_rmh != null && this.data_rmh.length > 0){
             if (this.data_rmh.length === 1){
               ListItem(){
@@ -306,7 +312,8 @@ export struct SearchResultContentComponent {
 
   @Builder
   SearchListUI() {
-    List({space:'8lpx'}) {
+    List({initialIndex: 0,space:'8lpx',scroller: this.scroller}) {
+      ListItemGroup(){
         ForEach(this.data_rmh, (item: SearchRmhDescription, index: number) => {
           ListItem() {
             SearchCreatorComponent({item:item})
@@ -314,36 +321,61 @@ export struct SearchResultContentComponent {
           .width('150lpx')
           .height('100%')
         })
+      }.offset({ left: this.listLeft })
 
       ListItem(){
-        Column(){
-          Text("查看更多")
-            .width('19lpx')
-            .fontSize('19lpx')
-            .fontWeight('400lpx')
-            .lineHeight('27lpx')
-            .fontColor($r('app.color.color_9E9E9E'))
-        }.borderRadius({topLeft:'4lpx',bottomLeft:'4lpx'})
-        .height('180lpx')
-        .width('77lpx')
-        .backgroundColor($r('app.color.color_EDEDED'))
-        .justifyContent(FlexAlign.Center)
-
+        this.itemEnd()
       }.height('100%')
       .margin({left:'23lpx'})
-      .onClick(()=>{
-        let params: Params = {
-          pageID: this.keywords
     }
-        WDRouterRule.jumpWithPage(WDRouterPage.searchCreatorPage,params)
-      })
-    }
-    .cachedCount(6)
     .edgeEffect(EdgeEffect.None)
     .scrollBar(BarState.Off)
     .listDirection(Axis.Horizontal)
     .width('100%')
     .height('219lpx')
+    .onReachEnd(() => {
+      this.isEnd = true
+      console.log(TAG,'is end')
+    })
+    .onScrollFrameBegin((offset: number, state: ScrollState) => {
+      console.log(TAG,'offset', offset)
+      if (!this.scroller.isAtEnd()) {
+        this.isEnd = false
+      }
+      if (this.ellipseW > 0) {
+        return { offsetRemain: 0 }
+      }
+      return { offsetRemain: offset }
+    })
+    .parallelGesture(
+      PanGesture({ direction: PanDirection.Horizontal, distance: 1 })
+        .onActionStart((event: GestureEvent) => {
+          console.info(TAG,'Pan start')
+        })
+        .onActionUpdate((event: GestureEvent) => {
+          if (event && this.isEnd) {
+            // console.log('event.offsetX',event.offsetX)
+            this.listLeft = event.offsetX < -60 ? -60 : event.offsetX > 0 ? 0 : event.offsetX
+            this.ellipseW = (-this.listLeft) / 1.5
+
+            console.log(TAG,"this.ellipseW==>" + this.ellipseW)
+          }
+        })
+        .onActionEnd((event: GestureEvent) => {
+          console.info(TAG,'Pan end')
+          this.listLeft = 0
+          // this.moreWidth = 20
+
+          if (event.offsetX < 0 && this.ellipseW >=20) {
+            console.log(TAG,'跳转')
+            let params: Params = {
+              pageID: this.keywords
+            }
+            WDRouterRule.jumpWithPage(WDRouterPage.searchCreatorPage,params)
+          }
+          this.ellipseW = 0
+        })
+    )
 
     Divider()
       .width('100%')
@@ -352,6 +384,32 @@ export struct SearchResultContentComponent {
       .strokeWidth('12lpx')
   }
 
+
+  @Builder
+  itemEnd() {
+    Row() {
+      Ellipse()
+        .width(2* this.ellipseW)
+        .height('100%')
+        .fill('rgb(240,235,238)')
+        .position({ left: -this.ellipseW, top: 0 })
+
+      Column(){
+        Text(this.ellipseW === 0 ? '' : this.ellipseW < 20? '查看更多' : '松手查看')
+          .width('19lpx')
+          .fontSize('19lpx')
+          .fontWeight('400lpx')
+          .lineHeight('27lpx')
+          .fontColor("#9E9E9E")
+      }
+      .height('100%')
+      .width(this.moreWidth)
+      .backgroundColor("#EDEDED")
+      .justifyContent(FlexAlign.Center)
+    }
+    .height('100%')
+  }
+
    private dataTransform(rem:CreatorDetailResponseItem[],value: SearchResultContentItem, photos: FullColumnImgUrlDTO[]): ContentDTO {
         let rmhInfo = this.getRmhInfo(rem,value)
      console.log('获取photos',JSON.stringify(photos))

@@ -9,6 +9,8 @@ import {
 } from 'wdBean';
 import { LiveModel } from '../../viewmodel/LiveModel';
 import { HttpUtils } from 'wdNetwork/Index';
+import vibrator from '@ohos.vibrator';
+import { BusinessError } from '@ohos.base';
 
 const TAG = 'LiveLikeComponent';
 
@@ -106,38 +108,63 @@ export struct LiveLikeComponent {
 
   @Builder
   likeCompStyle() {
-    Stack({ alignContent: Alignment.Bottom }) {
+    Stack({ alignContent: Alignment.TopEnd }) {
       Column() {
         Image(this.transLikeStyle().url)
           .width(24)
           .height(24)
-          .onClick(() => {
-            this.clickButtonEvent()
-          })
       }
       .justifyContent(FlexAlign.Center)
       .width(36)
       .height(36)
       .borderRadius(18)
       .backgroundColor((this.pageComponentType === 4 || this.pageComponentType === 2) ? '#4D000000' : this.pageComponentType === 8 ? Color.Transparent : '#FFF5F5F5')
-      Row() {
-        Text(NumberFormatterUtils.formatNumberWithWan(this.likeCount || ''))
-          .fontSize(8)
-          .fontColor(Color.White)
-          .padding({ left: 8, right: 2 })
+      if (this.likeCount != 0) {
+        RelativeContainer() {
+          Image(this.styleType == 1 ? $r('app.media.comment_icon_number_bg') : $r('app.media.ic_like_back_Select'))
+            .objectFit(ImageFit.Fill)
+            .resizable({
+              slice: {
+                top: 1,
+                left: 20,
+                right: 1,
+                bottom: 1
               }
+            })
+            .alignRules({
+              top: { anchor: "Text", align: VerticalAlign.Top },
+              left: { anchor: "Text", align: HorizontalAlign.Start },
+              right: { anchor: "Text", align: HorizontalAlign.End },
+              bottom: { anchor: "Text", align: VerticalAlign.Bottom },
+            })
+            .id("Image")
+
+          Text(NumberFormatterUtils.formatNumberWithWan(this.likeCount || ''))// Text("44444444")
+            .fontSize(8)
+            .fontColor('#ffffff')// .backgroundColor('#ED2800')
             .height(12)
-      .alignItems(VerticalAlign.Center)
-      .position({ x: '100%', y: 10 })
-      .markAnchor({ x: '100%' })
-      .backgroundImage($r('app.media.ic_like_back'))
-      .backgroundImageSize({height: 13})
+            .textAlign(TextAlign.Center)
+            .alignRules({
+              top: { anchor: "__container__", align: VerticalAlign.Top },
+              left: { anchor: "__container__", align: HorizontalAlign.Start }
+            })// .margin({left: 4,right:4
+              // })
+              /*动态计算文字宽度*/
             .width(this.getMeasureText(NumberFormatterUtils.formatNumberWithWan(this.likeCount || '')) +
-        12)
+              12)// .backgroundColor(Color.Green)
+            .id("Text")
             .visibility(this.likeCount > 0 ? Visibility.Visible : Visibility.Hidden)
         }
+        .offset({
+          x: 18
+        })
+      }
+    }
     .width(36)
-    .height(42)
+    .height(36)
+    .onClick(() => {
+      this.clickButtonEvent()
+    })
     .visibility(this.likesStyle == 'empty' || !this.openLikes ? Visibility.None : Visibility.Visible)
 
   }
@@ -164,6 +191,25 @@ export struct LiveLikeComponent {
     this.LiveModel.getLiveRoomNumberLike(this.likeBean['contentId'], 1, HttpUtils.getDeviceId()).then((data) => {
 
       console.log(TAG, '点赞接口调用成功', JSON.stringify(data))
+      try {
+        // 触发马达振动
+        vibrator.startVibration({
+          type: 'time',
+          duration: 100,
+        }, {
+          id: 0,
+          usage: 'alarm'
+        }, (error: BusinessError) => {
+          if (error) {
+            console.error(`Failed to start vibration. Code: ${error.code}, message: ${error.message}`);
+            return;
+          }
+          console.info('Succeed in starting vibration');
+        });
+      } catch (err) {
+        let e: BusinessError = err as BusinessError;
+        console.error(`An unexpected error occurred. Code: ${e.code}, message: ${e.message}`);
+      }
       this.likeCount++
 
     }).catch(() => {

@@ -12,6 +12,9 @@
     "requestPermissions": [
       {
         "name": "ohos.permission.INTERNET"
+      },
+      {
+        "name": "ohos.permission.VIBRATE"
       }
     ],
     "pages": "$profile:main_pages"

@@ -7,7 +7,7 @@ import { MinePageComponent } from 'wdComponent/src/main/ets/components/page/Mine
 import { CompUtils, TopNavigationComponent, TopNavigationComponentNew } from 'wdComponent/Index';
 import { VideoChannelPage } from './VideoChannelPage';
 import ChannelViewModel from 'wdComponent/src/main/ets/viewmodel/ChannelViewModel';
-import { ImageKnifeComponent, ImageKnifeOption, NONE } from '@ohos/imageknife';
+import { ALL, ImageKnifeComponent, ImageKnifeOption, NONE } from '@ohos/imageknife';
 
 const TAG = 'BottomNavigationComponent';
 PersistentStorage.persistProp('channelIds', '');
@@ -188,8 +188,8 @@ export struct BottomNavigationComponent {
       errorholderSrc: defaultIcon,
       // 是否开启一级内存缓存
       isCacheable: true,
-      // 磁盘缓存none
-      strategy: new NONE()
+      // 磁盘缓存
+      strategy: new ALL()
     };
     return imageKnifeOption
   }
@@ -263,6 +263,7 @@ export struct BottomNavigationComponent {
   }
 
   onBottomNavigationDataUpdated() {
+    Logger.error('yyyy','onBottomNavigationDataUpdated '+JSON.stringify(this.bottomNavList))
     // Logger.info(TAG, `onBottomNavigationDataUpdated currentNavIndex: ${this.currentNavIndex},length:${this.bottomNavItemList.length}`);
   }