Merge remote-tracking branch 'origin/main'

@@ -18,7 +18,6 @@ export function handleJsCallAppService(data: Message, callback: (res: string) =>
     if (queryString) {
       url = url + `?${queryString}`
     }
-    console.log('yzl', queryString, url)
     WDHttp.get(url).then((res) => {
       callback(JSON.stringify({
         netError: '0',

@@ -10,6 +10,7 @@ import { BaseDTO } from '../component/BaseDTO';
 
 @Observed
 export class ContentDTO implements BaseDTO {
+  shareFlag?:string='0';
   appStyle: string = '';
   cityCode: string = '';
   coverSize: string = '';

@@ -34,6 +34,7 @@ export struct CarderInteraction {
 
   build() {
     Row() {
+      if(this.contentDTO.shareFlag === '1'){
         Row() {
           Image($r('app.media.CarderInteraction_share'))
             .width(18)
@@ -47,6 +48,8 @@ export struct CarderInteraction {
         .onClick(() => {
           WDShare.shareContent(this.contentDetailData)
         })
+      }
+
 
       Row() {
         Image($r('app.media.CarderInteraction_comment'))
@@ -66,11 +69,11 @@ export struct CarderInteraction {
     }
     .width('100%')
     .margin({ top: 11 })
-    .padding({
-      left: 21,
-      right: 21
-    })
-    .justifyContent(FlexAlign.SpaceBetween)
+    // .padding({
+    //   left: 21,
+    //   right: 21
+    // })
+    .justifyContent(FlexAlign.SpaceAround)
     .alignItems(VerticalAlign.Center)
   }
 

@@ -23,7 +23,6 @@ export struct ImageAndTextWebComponent {
   private h5ReceiveAppData: H5ReceiveDetailBean = { dataSource: '2' } as H5ReceiveDetailBean
   private webPrepared = false;
   private dataPrepared = false;
-
   async onDetailDataUpdated() {
     if (this.action) {
       let contentId: string = ''

@@ -21,6 +21,8 @@ import { effectKit } from '@kit.ArkGraphics2D';
 import { window } from '@kit.ArkUI';
 import { PeopleShipMainViewModel } from '../../viewmodel/PeopleShipMainViewModel';
 import { AudioSuspensionModel } from '../../viewmodel/AudioSuspensionModel'
+import { viewColumInsightIntentShare } from '../../utils/InsightIntentShare'
+import { common } from '@kit.AbilityKit';
 
 const TAG = 'MorningEveningPaperComponent';
 
@@ -126,6 +128,10 @@ export struct MorningEveningPaperComponent {
       // let pageInfoBean = await MorningEveningViewModel.getMorningEveningPageInfo("" + this.dailyPaperTopicPageId)
       let pageInfoBean = await MorningEveningViewModel.getMorningEveningPageInfo("" + dailyPaperTopicPageId) //"25091"
       this.pageInfoBean = pageInfoBean;
+      //早晚报意图上报
+      let context = getContext(this) as common.UIAbilityContext;
+      viewColumInsightIntentShare(context,String(dailyPaperTopicPageId), this.pageInfoBean)
+
       this.title = this.pageInfoBean?.topicInfo?.title
       let dateTime = DateTimeUtils.parseDate(this.pageInfoBean?.topicInfo?.topicDate ?? '', DateTimeUtils.PATTERN_DATE_HYPHEN)
       const dateShow = new Date(dateTime)

@@ -21,6 +21,7 @@ export struct Card19Component {
 
   async aboutToAppear(): Promise<void> {
     this.titleInit();
+    console.log('card19',JSON.stringify(this.contentDTO))
   }
 
   titleInit() {
@@ -66,7 +67,7 @@ export struct Card19Component {
             const photo: PhotoListBean = {
               width: item.weight,
               height: item.height,
-              picPath: item.fullUrl,
+              picPath: item.fullUrl||item.url,
               picDesc: ''
             }
             return photo
@@ -110,6 +111,7 @@ struct createImg {
         fullUrl: ''
       } as FullColumnImgUrlDTO)
     }
+    console.log('card19-this.fullColumnImgUrls',JSON.stringify(this.fullColumnImgUrls))
   }
 
   caclImageRadius(index: number) {
@@ -163,14 +165,14 @@ struct createImg {
                 alignContent: Alignment.BottomEnd
               }) {
                 if (this.getPicType() === 1) {
-                  Image(this.loadImg ? item.fullUrl : '')
+                  Image(this.loadImg ? item.fullUrl||item.url : '')
                     .backgroundColor(0xf5f5f5)
                     .width('100%')
                     .height(172)
                     .autoResize(true)
                     .borderRadius(this.caclImageRadius(index))
                 } else if (this.getPicType() === 2) {
-                  Image(this.loadImg ? item.fullUrl : '')
+                  Image(this.loadImg ? item.fullUrl||item.url : '')
                     .width('100%')
                     .height(305)
                     .autoResize(true)

@@ -7,7 +7,8 @@ import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
 import { Notes } from './notes';
 import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
 // import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
-
+import { viewBlogInsightIntentShare, ActionMode } from '../../utils/InsightIntentShare'
+import { common } from '@kit.AbilityKit';
 const TAG: string = 'Card2Component';
 
 /**
@@ -104,6 +105,11 @@ export struct Card2Component {
       this.clicked = true;
       // persistentStorage(this.contentDTO.objectId);
       ProcessUtils.processPage(this.contentDTO)
+
+      if (this.contentDTO?.channelId === '2001' || this.contentDTO?.channelId === '2002') {
+        let context = getContext(this) as common.UIAbilityContext;
+        viewBlogInsightIntentShare(context, this.contentDTO?.channelId, [this.compDTO], ActionMode.EXECUTED)
+      }
     })
   }
 }

@@ -15,7 +15,8 @@ import { NoMoreBean } from './NoMoreBean';
 import { RefreshLayoutBean } from '../refresh/RefreshLayoutBean';
 import RefreshLayout from '../refresh/RefreshLayout';
 import json from '@ohos.util.json';
-
+import { viewBlogInsightIntentShare, ActionMode } from '../../utils/InsightIntentShare'
+import { common } from '@kit.AbilityKit';
 const TAG = 'PageComponent';
 
 @Component
@@ -31,7 +32,6 @@ export struct PageComponent {
   @Prop @Watch('onAutoRefresh') autoRefresh: number = 0
   private listScroller: Scroller = new Scroller();
   needload: boolean = true;
-
   build() {
     Column() {
       if (this.pageModel.viewType == ViewType.LOADING) {
@@ -257,7 +257,6 @@ export struct PageComponent {
       this.pageModel.pageTotalCompSize = 0;
       PageHelper.getInitData(this.pageModel, this.pageAdvModel)
     }, 100)
-
   }
 }
 

-import { insightIntent } from '@kit.IntentsKit';
 import { BottomNavDTO, CompDTO, TopNavDTO } from 'wdBean';
 import { SpConstants } from 'wdConstant';
 import { DisplayUtils, LazyDataSource, Logger, NetworkUtil, SPHelper, ToastUtils } from 'wdKit';
@@ -9,8 +8,6 @@ import { FirstTabTopSearchComponent } from '../search/FirstTabTopSearchComponent
 import { AssignChannelParam } from 'wdRouter/src/main/ets/utils/HomeChannelUtils';
 import { PeopleShipMainComponent } from '../peopleShip/PeopleShipMainComponent';
 import { channelSkeleton } from '../skeleton/channelSkeleton';
-import { common } from '@kit.AbilityKit';
-
 
 const TAG = 'TopNavigationComponent';
 
@@ -61,8 +58,6 @@ export struct TopNavigationComponent {
   @Prop @Watch('onAutoRefresh') autoRefresh: number = 0
   // 传递给page的自动刷新通知
   @State autoRefresh2Page: number = 0
-  //保存当前导航选中时的时间戳 意图开始时间
-  @State executedStartTime: number = new Date().getTime()
   // 当前底导index
   @State navIndex: number = 0
   @State animationDuration: number = 0
@@ -190,48 +185,6 @@ export struct TopNavigationComponent {
     return item.channelType === 3
   }
 
-  //意图共享
-  topNavInsightIntentShare(item: TopNavDTO){
-    let tapNavIntent: insightIntent.InsightIntent = {
-      intentName: 'ViewBlog',
-      intentVersion: '1.0.1',
-      identifier: '52dac3b0-6520-4974-81e5-25f0879449b5',
-      intentActionInfo: {
-        actionMode: 'EXPECTED',
-        currentPercentage: 50,
-        executedTimeSlots: {
-          executedEndTime: new Date().getTime(),
-          executedStartTime: this.executedStartTime
-        }
-      },
-      intentEntityInfo: {
-        entityName: 'Blog',
-        entityId: String(item.pageId) || '',
-        displayName: item.name,
-        logoURL: 'https://www-file.huawei.com/-/media/corporate/images/home/logo/huawei_logo.png',
-        rankingHint: 99,
-        isPublicData: true
-      }
-    }
-    console.log('yzl',JSON.stringify(tapNavIntent))
-    try {
-      let context = getContext(this) as common.UIAbilityContext;
-      // 共享数据
-      insightIntent.shareIntent(context, [tapNavIntent], (error) => {
-        if (error?.code) {
-          // 处理业务逻辑错误
-          console.error(`shareIntent failed, error.code: ${error?.code}, error.message: ${error?.message}`);
-          return;
-        }
-        // 执行正常业务
-        console.log('shareIntent succeed');
-      });
-    } catch (error) {
-      // 处理异常
-      console.error(`error.code: ${error?.code}, error.message: ${error?.message}`);
-    }
-  }
-
 
   build() {
     Column() {

@@ -15,6 +15,7 @@ import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import MinePageDatasModel from '../../model/MinePageDatasModel'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import { CreatorDetailRequestItem } from '../../viewmodel/CreatorDetailRequestItem'
+import { CreatorDetailResponseItem } from '../../viewmodel/CreatorDetailResponseItem';
 import { FollowListDetailItem } from '../../viewmodel/FollowListDetailItem'
 import { FollowListStatusRequestItem } from '../../viewmodel/FollowListStatusRequestItem'
 import { QueryListIsFollowedItem } from '../../viewmodel/QueryListIsFollowedItem'
@@ -63,6 +64,7 @@ export struct SearchResultContentComponent {
     if (this.hasMore) {
       SearcherAboutDataModel.getSearchResultListData("15", `${this.curPageNum}`, this.searchType, this.keywords,
         getContext(this)).then((value) => {
+
         if (!this.data || value.list.length == 0) {
           this.hasMore = false
           this.isLoading = false
@@ -70,7 +72,6 @@ export struct SearchResultContentComponent {
         } else {
           if (value.list[0].dataList != null) {
             let data_temp: SearchRmhDescription[] = []
-
             data_temp = value.list[0].dataList
 
             //TODO 查询创作者详情接口
@@ -121,7 +122,6 @@ export struct SearchResultContentComponent {
               data_temp.forEach((data) => {
                 this.data_rmh.push(data)
               })
-
               //只有一条创作者，获取 创作者信息
               if (this.data_rmh.length === 1) {
                 if(StringUtils.isNotEmpty(UserDataLocal.getUserId())){
@@ -178,21 +178,34 @@ export struct SearchResultContentComponent {
           }
         })
       })
+      // 批量号主信息
+      let creatorIdList: string[] = []
+      resultData.list.forEach((value:SearchResultContentItem) => {
+        creatorIdList.push(value.data.creatorId)
+      })
+      SearcherAboutDataModel.getCreatorDetailListData({creatorIdList:creatorIdList}).then((rem) => {
+
 
         resultData.list.forEach((value) => {
           let photos: FullColumnImgUrlDTO[] = []
-        if (value.data.appStyle === 4) {
+          // if (value.data.appStyle === 4) {
             value.data.appStyleImages.split("&&").forEach((value) => {
-            photos.push({ url: value } as FullColumnImgUrlDTO)
+              const resizeParams = this.extractResizeParams(value)
+              photos.push({ fullUrl: value,weight:resizeParams.width,height:resizeParams.height, } as FullColumnImgUrlDTO)
             })
-        }
-
-        let contentDTO = this.dataTransform(value, photos);
+          // }
+          let contentDTO = this.dataTransform(rem,value, photos);
           if(value.data.type != "13"){
             this.data.push(contentDTO)
           }
+        })
+
 
+      }).catch((err: Error) => {
+        console.log(TAG, JSON.stringify(err))
       })
+
+
       this.data.notifyDataReload()
       this.count = this.data.totalCount()
       if (this.data.totalCount() < resultData.totalCount) {
@@ -380,7 +393,10 @@ export struct SearchResultContentComponent {
       .strokeWidth('12lpx')
   }
 
-  private dataTransform(value: SearchResultContentItem, photos: FullColumnImgUrlDTO[]): ContentDTO {
+   private dataTransform(rem:CreatorDetailResponseItem[],value: SearchResultContentItem, photos: FullColumnImgUrlDTO[]): ContentDTO {
+        let rmhInfo = this.getRmhInfo(rem,value)
+     console.log('获取photos',JSON.stringify(photos))
+      console.log('获取value2',JSON.stringify(value))
         let contentDTO = new ContentDTO();
         contentDTO.appStyle = value.data.appStyle + ""
         contentDTO.cityCode = value.data.cityCode
@@ -456,8 +472,92 @@ export struct SearchResultContentComponent {
         contentDTO.openType = '';
         contentDTO.extra = '';
         contentDTO.titleShow = value.data.type == "5" ? 1 : 0;
-    contentDTO.contentText = value.data.contentText;
-
+        contentDTO.rmhInfo = rmhInfo
+        contentDTO.shareFlag =  value.data.shareFlag
         return contentDTO;
+
+
+
+  }
+    // 搜索数据转化rmhInfo
+    private getRmhInfo(rem:CreatorDetailResponseItem[],value:SearchResultContentItem){
+      let obj = value.data
+      let rmhInfo:RmhInfoDTO =  {
+        rmhHeadUrl:obj.headerPhotoUrl,
+        rmhName:obj.creatorName,
+        rmhId:obj.creatorId,
+        authIcon:obj.authIcon,
+        authTitle: obj.authTitle,
+        authTitle2: '',
+        banControl: 0,
+        cnIsAttention: 0,
+        cnAttention: 0,
+        cnlsComment: 0,
+        cnlsLike: 0,
+        cnMainControl: 0,
+        cnShareControl: 0,
+        cnIsComment: 0,
+        cnIsLike:0,
+        posterShareControl: 0,
+        rmhDesc: obj.introduction,
+        userId: obj.userId,
+        userType: obj.userType,
+        honoraryIcon:''
+      }
+      if(rem.length>0){
+        rem.forEach(item=>{
+          if(item.creatorId === obj.creatorId){
+            rmhInfo = {
+              rmhHeadUrl:item.headPhotoUrl,
+              rmhName:item.userName,
+              rmhId:item.creatorId,
+              authIcon:item.authIcon,
+              authTitle: item.authTitle,
+              authTitle2: '',
+              banControl: 0,
+              cnIsAttention:item.isAttention,
+              cnAttention: 0,
+              cnlsComment: 0,
+              cnlsLike: 0,
+              cnMainControl: 0,
+              cnShareControl: 0,
+              cnIsComment: 0,
+              cnIsLike:0,
+              posterShareControl: 0,
+              rmhDesc: item.introduction,
+              userId: item.userId,
+              userType: item.userType,
+              honoraryIcon:''
+            }
+          }
+        })
       }
+      return rmhInfo
+    }
+  private extractResizeParams(url: string) {
+    const heightRegex = /h_(\d+)/; // 匹配高度参数，如h_450
+    const widthRegex = /w_(\d+)/;  // 匹配宽度参数，如w_800
+    const heightMatch = url.match(heightRegex);
+    const widthMatch = url.match(widthRegex);
+      let height = heightMatch ? `h_${heightMatch[1]}` : undefined
+      let width = widthMatch ? `w_${widthMatch[1]}` : undefined
+      let h:number =0
+      let w:number =0
+      if(height){
+        h = Number(height.split('_')[1])
+      }
+      if(width){
+        w = Number(width.split('_')[1])
+      }
+    interface Obj{
+      width:number;
+      height:number
+    }
+    let obj:Obj = {
+      width:w,
+      height:h
+    }
+    return obj
+  }
+
 }
\ No newline at end of file

+import { common } from '@kit.AbilityKit';
+import { insightIntent } from '@kit.IntentsKit';
+import { CompDTO, CompList, ContentDTO, PageInfoBean } from 'wdBean';
+
+function generateUniqueId() {
+  // 生成当前时间戳
+  let timestamp = new Date().getTime();
+
+  // 将时间戳转换成16进制字符串
+  let hexString = timestamp.toString(16);
+
+  // 确保字符串长度为16位，不足的话在前面补0
+  while (hexString.length < 16) {
+    hexString = '0' + hexString;
+  }
+
+  // 格式化为UUID样式
+  let uuid = hexString.substring(0, 8) + '-' +
+  hexString.substring(8, 12) + '-' +
+  hexString.substring(12, 16) + '-' +
+  hexString.substring(16, 20) + '-' +
+  hexString.substring(20);
+
+  return uuid;
+}
+
+export const enum ActionMode {
+  // 将来时
+  EXPECTED = 'EXPECTED',
+  // 完成时
+  EXECUTED = 'EXECUTED',
+}
+
+//ViewBlog意图共享-频道列表
+export function viewBlogInsightIntentShare(context: common.UIAbilityContext, entityGroupId: string,
+  compList: CompDTO[] | CompList[], actionMode: ActionMode) {
+  console.log('viewBlogInsightIntentShare',actionMode)
+  let insightIntentArray: insightIntent.InsightIntent [] = []
+  if (compList?.length > 0) {
+    compList?.forEach((item: CompDTO | CompList) => {
+      item.operDataList.forEach((_item: ContentDTO) => {
+        let viewBlogInsightIntentItem: insightIntent.InsightIntent = {
+          intentName: 'ViewBlog',
+          intentVersion: '1.0.1',
+          identifier: generateUniqueId(),
+          intentActionInfo: {
+            actionMode,
+            currentPercentage: 50,
+            //目前不考虑发生时段
+            // executedTimeSlots: {
+            //   executedEndTime: new Date().getTime(),
+            //   executedStartTime: pageModel.executedStartTime
+            // }
+          },
+          intentEntityInfo: {
+            entityName: 'Blog',
+            entityId: _item?.objectId,
+            displayName: _item?.newsTitle,
+            entityGroupId, //channelId
+            logoURL: _item?.coverUrl,
+            metadataModificationTime: _item?.publishTimestamp,
+            blogTitle: _item?.newsTitle,
+            blogType: 'Normal',
+            blogCategory: item.name,
+            categoryDisplayName: item.name,
+            blogSubTitle: _item?.newsSummary.length > 20 ?
+            _item?.newsSummary.substring(0, 20) : _item?.newsSummary,
+            blogAuthor: _item?.source,
+            blogPublishTime: _item?.publishTimestamp,
+            tag: _item?.newTags,
+            likeCount: _item?.interactData?.likeNum || 0,
+            forwardCount: _item?.interactData?.shareNum || 0,
+            commentCount: _item?.interactData?.commentNum || 0,
+            favorites: _item?.interactData?.collectNum || 0,
+            viewCount: _item?.interactData?.readNum || 0,
+            rankingHint: 99,
+            isPublicData: true
+          }
+        }
+        insightIntentArray.push(viewBlogInsightIntentItem)
+      })
+
+    })
+    console.log('yzl', JSON.stringify(insightIntentArray[0]))
+    try {
+      // 共享数据
+      insightIntent.shareIntent(context, insightIntentArray, (error) => {
+        if (error?.code) {
+          // 处理业务逻辑错误
+          console.error(`shareIntent failed, error.code: ${error?.code}, error.message: ${error?.message}`);
+          return;
+        }
+        // 执行正常业务
+        console.log('shareIntent succeed');
+      });
+    } catch (error) {
+      // 处理异常
+      console.error(`error.code: ${error?.code}, error.message: ${error?.message}`);
+    }
+  }
+}
+
+
+//ViewBlog意图共享-早晚报
+export function viewColumInsightIntentShare(context: common.UIAbilityContext, entityId: string,
+  pageInfoBean: PageInfoBean) {
+  console.log('viewColumInsightIntentShare')
+  let viewBlogInsightIntentItem: insightIntent.InsightIntent = {
+    intentName: 'ViewColumn',
+    intentVersion: '1.0.1',
+    identifier: generateUniqueId(),
+    intentActionInfo: {
+      actionMode: ActionMode.EXECUTED,
+      currentPercentage: 50,
+    },
+    intentEntityInfo: {
+      entityName: 'Column',
+      entityId,
+      displayName:pageInfoBean?.topicInfo?.title,
+      description: pageInfoBean?.shareSummary,
+      logoURL:pageInfoBean?.shareCoverUrl,
+      activityType:['RecentViews'],
+      columnTitle: pageInfoBean?.topicInfo?.title,
+      columnSubTitle: pageInfoBean?.shareSummary,
+      rankingHint: 99,
+      isPublicData: true
+    }
+  }
+
+  try {
+    // 共享数据
+    insightIntent.shareIntent(context, [viewBlogInsightIntentItem], (error) => {
+      if (error?.code) {
+        // 处理业务逻辑错误
+        console.error(`shareIntent failed, error.code: ${error?.code}, error.message: ${error?.message}`);
+        return;
+      }
+      // 执行正常业务
+      console.log('shareIntent succeed');
+    });
+  } catch (error) {
+    // 处理异常
+    console.error(`error.code: ${error?.code}, error.message: ${error?.message}`);
+  }
+}

@@ -11,7 +11,8 @@ import { ArrayList } from '@kit.ArkTS';
 import { WDViewDefaultType } from '../components/view/EmptyComponent';
 import { CompAdvMatInfoBean } from 'wdBean/src/main/ets/bean/adv/CompAdvInfoBean';
 import { BaseDTO } from 'wdBean/src/main/ets/bean/component/BaseDTO';
-
+import { viewBlogInsightIntentShare, ActionMode } from '../utils/InsightIntentShare'
+import { common } from '@kit.AbilityKit';
 const TAG = 'PageHelper';
 
 /**
@@ -349,6 +350,11 @@ export class PageHelper {
     PageViewModel.getInteractData(compList).then((data: InteractDataDTO[]) => {
       // 刷新，替换所有数据
       this.resetInteract(data, pageModel.compList)
+      if(pageModel?.channelId === '2001' || pageModel?.channelId === '2002'){
+        //早晚报意图上报
+        let context = getContext(this) as common.UIAbilityContext;
+        viewBlogInsightIntentShare(context, pageModel?.channelId, compList, ActionMode.EXPECTED)
+      }
     })
 
     // 测试数据