Merge remote-tracking branch 'origin/main'

@@ -37,7 +37,7 @@ export struct ENewspaperItemComponent {
         .onComplete(() => {
           this.isShowSkeleton = false
         })
-        .objectFit(ImageFit.Contain)
+        .objectFit(ImageFit.Fill)
         .visibility(this.isShowSkeleton ? Visibility.None : Visibility.Visible)
 
       Canvas(this.context)

@@ -224,7 +224,7 @@ export struct MorningEveningPaperComponent {
     if (imageSource) {
       const pixelMap: image.PixelMap = await imageNet2PixelMap(imageSource);
       effectKit.createColorPicker(pixelMap, (err, colorPicker) => {
-        let color = colorPicker.getMainColorSync();
+        let color = colorPicker.getLargestProportionColor();
         Logger.debug(TAG, "compInfoBean compStyle = " + color)
         // color = ColorUtils.getMorningEveningPaperRgb({red:color.red,green:color.green,blue:color.blue,alpha:color.alpha})
         // 将取色器选取的color示例转换为十六进制颜色代码
@@ -273,6 +273,7 @@ export struct MorningEveningPaperComponent {
         }
       }
       // .height(`calc(100% - ${this.bottomSafeHeight + this.topSafeHeight + 'vp'})`)
+      .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
       .scrollBar(BarState.Off)
       .onWillScroll(scrollOffset =>{
         this.scrollOffset = this.scrollOffset + scrollOffset as number

@@ -4,6 +4,7 @@ import { DateTimeUtils, StringUtils, ToastUtils } from 'wdKit/Index'
 import { LiveViewModel } from '../../viewModel/LiveViewModel'
 import { HttpUtils } from 'wdNetwork/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
+import { ParamType, TrackConstants, TrackingContent } from 'wdTracking/Index'
 
 @Component
 export struct LiveCountdownComponent {
@@ -19,6 +20,7 @@ export struct LiveCountdownComponent {
   //是否预约过直播
   @State isAppointmentLive: boolean = false
   liveViewModel: LiveViewModel = new LiveViewModel()
+  pageParam: ParamType = {}
 
   aboutToAppear(): void {
     //注册字体
@@ -30,6 +32,15 @@ export struct LiveCountdownComponent {
       this.textTimerController.start()
     }, 0)
     this.updateData()
+    this.contentTrackingDict()
+  }
+
+  contentTrackingDict() {
+    this.pageParam = {
+      'contentType': `${this.liveDetailsBean.newsType}`,
+      'contentId': `${this.liveDetailsBean.newsId}`,
+      'contentName': `${this.liveDetailsBean.newsTitle || ''}`,
+    }
   }
 
   build() {
@@ -141,7 +152,7 @@ export struct LiveCountdownComponent {
     }
     //2024-04-01 19:44:00-trim->2024-04-0119:44:00
     if (StringUtils.isNotEmpty(this.liveDetailsBean.liveInfo?.planStartTime)) {
-      let playStartTimeTmp = this.liveDetailsBean.liveInfo?.planStartTime+''
+      let playStartTimeTmp = this.liveDetailsBean.liveInfo?.planStartTime + ''
       this.month = Number(playStartTimeTmp.substring(5, 7)).toString()
       this.day = playStartTimeTmp.substring(8, 10)
       this.hour = playStartTimeTmp.substring(11, 13)
@@ -152,7 +163,7 @@ export struct LiveCountdownComponent {
   getLiveAppointmentStatus() {
     this.liveViewModel.getLiveAppointmentStatus(
       this.liveDetailsBean.reLInfo ? this.liveDetailsBean.reLInfo.relId : '',
-      this.liveDetailsBean.newsId+''
+      this.liveDetailsBean.newsId + ''
     ).then(
       (data) => {
         this.isAppointmentLive = data
@@ -165,15 +176,19 @@ export struct LiveCountdownComponent {
   liveAppointment() {
     this.liveViewModel.liveAppointment(
       this.liveDetailsBean.reLInfo ? this.liveDetailsBean.reLInfo.relId : '',
-      this.liveDetailsBean.newsId+'',
+      this.liveDetailsBean.newsId + '',
       !this.isAppointmentLive).then(
       (data) => {
         if (data.success) {
           this.isAppointmentLive = !this.isAppointmentLive
           if (this.isAppointmentLive) {
             ToastUtils.showToast('预约成功', 1000)
+            TrackingContent.subscribeClick(true, TrackConstants.PageName.Live_Detail,
+              TrackConstants.PageName.Live_Detail, this.pageParam)
           } else {
             ToastUtils.showToast('取消预约成功', 1000)
+            TrackingContent.subscribeClick(false, TrackConstants.PageName.Live_Detail,
+              TrackConstants.PageName.Live_Detail, this.pageParam)
           }
         }
       },

@@ -34,7 +34,6 @@ export struct TabComponent {
 
   build() {
     Column() {
-
       // 页签
       Row() {
         Scroll() {

@@ -36,11 +36,11 @@ export struct TopPlayComponent {
 
   aboutToAppear(): void {
     if (this.playerController) {
+
       this.playerController.onCanplay = () => {
         this.isCanPlay = true
         this.isLoading = true
         this.playerController?.play()
-
       }
 
       this.playerController.onStatusChange = (status: number) => {

@@ -7,8 +7,8 @@ struct GuidePages {
   // guideImage = [$r('app.media.guide_static1'), $r('app.media.guide_static2'), $r('app.media.guide_static3'), $r('app.media.guide_static4'),$r('app.media.guide_static5')]
   // guideTitle = [$r('app.media.guide_title1'), $r('app.media.guide_title2'), $r('app.media.guide_title3'), $r('app.media.guide_title4'),$r('app.media.guide_title5')]
   // guideIndex = [$r('app.media.guide_index1'), $r('app.media.guide_index2'), $r('app.media.guide_index3'),$r('app.media.guide_index4'), $r('app.media.guide_button')]
-  guideImage = [$r('app.media.guide_Static')]
-  guideIndex = [$r('app.media.guide_button')]
+  guideImage = [$r('app.media.guide_Static'),'']
+  guideIndex = [$r('app.media.guide_button'),'']
 
   build() {
     Column() {
@@ -17,10 +17,16 @@ struct GuidePages {
           this.ChildItem(index)
 
         }, (item: number) => JSON.stringify(item))
-      }.loop(false).disableSwipe(true)
+      }.loop(false)
       .indicator(false)
       .width('100%')
       .height('100%')
+      .effectMode(EdgeEffect.None)
+      .onChange(index => {
+        if (index == 1) {
+          WDRouterRule.jumpWithReplacePage(WDRouterPage.launchInterestsPage)
+        }
+      })
     }.width('100%')
     .height('100%')
 

@@ -113,6 +113,29 @@ export class TrackingContent {
 
   }
 
+
+  /**
+   *  直播预约埋点
+   * @param isSubscribeFlag
+   * @param pageId
+   * @param pageName
+   * @param extParams
+   */
+  static subscribeClick(isSubscribeFlag:boolean ,pageId: string, pageName: string,extParams?: ParamType){
+    let params = TrackingUtils.generateParams(extParams)
+    if (pageId.length) {
+      params["pageId"] = pageId
+    }
+    if (pageName.length) {
+      params["pageName"] = pageName
+    }
+
+    let event = isSubscribeFlag?'live_subscribe_click':'cancel_live_subscribe_click'
+    TrackingUtils.fillPositionWith(params)
+    Tracking.event(event, params)
+  }
+
+
   // 内容下载点击事件  1.图片   2.音频  3.视频
   static download(donwloadContentType: number, pageId: string, pageName: string, extParams?: ParamType) {
     let params = TrackingUtils.generateParams(extParams)

@@ -103,8 +103,8 @@ struct LaunchAdvertisingPage {
                 .fontSize('24lpx')
                 .width('72lpx')
                 .height('36lpx')
-                .borderRadius(5)
-                .margin({top:'10lpx',left:'19lpx'})
+                .borderRadius(2)
+                .margin({top:'15lpx',left:'19lpx'})
                 .backgroundColor('#80000000')
             }
             .width('100%')
@@ -191,7 +191,7 @@ struct LaunchAdvertisingPage {
     this.trackingLaunchClick()
 
     if(this.defaultModel.linkUrl.length > 0){
-      if (this.defaultModel.objectType == '2') {
+      if (this.defaultModel.openType == '2') {
         //端外打开
         ProcessUtils.jumpExternalWebPage(this.defaultModel.linkUrl)
       }else {

@@ -3,8 +3,9 @@ import { WDRouterRule } from 'wdRouter';
 import { WDRouterPage } from 'wdRouter';
 import { SPHelper } from 'wdKit/Index';
 import { SpConstants } from 'wdConstant/Index';
-import { ButtonOptions, promptAction } from '@kit.ArkUI';
+import { ButtonOptions, promptAction, window } from '@kit.ArkUI';
 import { ParamType, TrackConstants, TrackingContent } from 'wdTracking/Index';
+import { ImageKnifeComponent } from '@ohos/imageknife';
 
 @Entry
 @Component
@@ -13,7 +14,6 @@ struct LaunchInterestsHobbiesPage {
   @State selectCount: number = 0
   @State interestsArray: InterestsList[] = []
 
-
   aboutToAppear(){
     //请求接口，获取兴趣偏好数据
     this.requestInterestsData()
@@ -21,6 +21,8 @@ struct LaunchInterestsHobbiesPage {
 
   build() {
     Column() {
+      Stack(){
+        Column(){
           Row(){
             Blank()
             Text('跳过')
@@ -28,7 +30,7 @@ struct LaunchInterestsHobbiesPage {
               .fontColor('#333333')
               .width('54lpx')
               .height('35lpx')
-          .margin({top:'27lpx',right:'46lpx'})
+              .margin({right:'46lpx'})
               .onClick(()=>{
                 //直接跳过到首页
                 //跳转首页
@@ -60,12 +62,16 @@ struct LaunchInterestsHobbiesPage {
             ForEach(this.interestsArray,(item:InterestsList,index:number)=>{
               GridItem(){
                 Stack({alignContent:Alignment.TopStart}){
-
-              Image(item.pic)
+                  ImageKnifeComponent({imageKnifeOption:{loadSrc:item.pic}})
                     .width('100%')
                     .height('100%')
                     .backgroundColor(Color.White)
                     .borderRadius(5)
+                  // Image(item.pic)
+                  //   .width('100%')
+                  //   .height('100%')
+                  //   .backgroundColor(Color.White)
+                  //   .borderRadius(5)
                   Stack(){
                     Image('')
                       .width('100%')
@@ -74,7 +80,6 @@ struct LaunchInterestsHobbiesPage {
                       .opacity(item.choose?0.5:0)
                       .borderRadius(5)
                   }
-
                   Stack(){
                     Column({}){
                       Text(item.name)
@@ -111,16 +116,21 @@ struct LaunchInterestsHobbiesPage {
               })
 
             })
-
           }
           .width('90%')
-      .height('70%')
-      .margin({top:'61lpx'})
+          // .height('70%')
+          .margin({top:'61lpx',bottom:'240lpx'})
           .columnsTemplate('1fr 1fr 1fr')
-      // .rowsTemplate('1fr 1fr 1fr 1fr')
           .columnsGap('23lpx')
           .rowsGap('23lpx')
           .scrollBar(BarState.Off)
+        }
+        .width('100%')
+        .height('100%')
+      }
+      .width('100%')
+      .height(`calc(100% - ${108 + 'lpx'})`)
+      // .backgroundColor(Color.Red)
 
       Stack({alignContent:Alignment.Center}){
         Button(this.selectCount == 0?'选好了':'选好了(' + this.selectCount + ')')
@@ -131,9 +141,11 @@ struct LaunchInterestsHobbiesPage {
           .borderRadius('10lpx')
           .width('662lpx')
           .height('84lpx')
+          .margin({top:'10lpx'})
         Image('')
           .width('662lpx')
           .height('84lpx')
+          .margin({top:'10lpx'})
           .backgroundColor(Color.White)
           .opacity(this.selectCount == 0 ? 0.6 : 0)
           .borderRadius('10lpx')
@@ -156,10 +168,8 @@ struct LaunchInterestsHobbiesPage {
       }
       .width('100%')
       .height('108lpx')
-      // .position({y:})
-      // .margin({bottom:'1',top:'1'})
-      .backgroundColor('#FFFFFF')
-
+      .margin({top:0})
+      // .backgroundColor(Color.Orange)
     }
     .width('100%')
     .height('100%')