ref |> 调整分享链接

采用华为App Link手动构造部分 暂时未通

@@ -15,3 +15,5 @@ export { AssignChannelParam } from './src/main/ets/utils/HomeChannelUtils';
 export { RouterJumpInterceptor, JumpInterceptorAction } from './src/main/ets/router/RouterJumpInterceptor'
 export { RouterJumpInterceptor, JumpInterceptorAction } from './src/main/ets/router/RouterJumpInterceptor'
 
 
 export { AppInnerLink } from './src/main/ets/utils/AppInnerLink'
 export { AppInnerLink } from './src/main/ets/utils/AppInnerLink'
+
+export { ContentType } from './src/main/ets/common/ContentType'

+export enum ContentType {
+
+  /// 不跳转
+  Unknown = 0,
+  ///点播
+  Video = 1,
+
+  ///直播
+  Live = 2,
+
+  ///活动
+  Activity = 3,
+
+  ///信息流广告
+  InfoflowAD = 4,
+
+  ///专题
+  Subject = 5,
+
+  ///链接
+  Link = 6,
+
+  ///榜单
+  RankList      = 7,
+
+  /// 图文
+  ImageText     = 8,
+  /// 组图
+  Pictures      = 9,
+
+  /// H5新闻  （仅海外版存在，视界和中文端无此类型。中文端按照图文8类型+link）
+  H5News        = 10,
+  /// 频道
+  Channel       = 11,
+  ///组件
+  Module       = 12,
+  ///音频
+  Audio        = 13,
+  ///动态图文
+  DynamicImageText = 14,
+
+  ///动态视频
+  DynamicVideo     = 15,
+
+  ///问政留言
+  Ask              = 16,
+
+  /// 金刚位
+  KeyPosition      = 30,
+
+  /// 合集
+  Serials      = 101,
+
+
+
+}

@@ -39,6 +39,8 @@ export interface ShareContentLink {
   desc?: string
   desc?: string
   link: string
   link: string
   icon?: string
   icon?: string
+  deeplink: string  // 根据内容详情，生成的深度链接 如：rmrbapp://rmrb.app/openwith?type=article&subType=h5_template_article&contentId=30000762651&relId=500000038702&skipType=1&relType=1
+
 }
 }
 
 
 export type ShareContent = ShareContentText | ShareContentImageAndText | ShareContentLink
 export type ShareContent = ShareContentText | ShareContentImageAndText | ShareContentLink

@@ -6,6 +6,9 @@ import { AsyncCallback } from '@kit.BasicServicesKit';
 import { common } from '@kit.AbilityKit';
 import { common } from '@kit.AbilityKit';
 import { systemShare } from '@kit.ShareKit';
 import { systemShare } from '@kit.ShareKit';
 import { uniformTypeDescriptor as utd } from '@kit.ArkData';
 import { uniformTypeDescriptor as utd } from '@kit.ArkData';
+import { JSON } from '@kit.ArkTS';
+
+const TAG = "WDSystemShare"
 
 
 export class WDSystemShare implements WDShareInterface {
 export class WDSystemShare implements WDShareInterface {
 
 
@@ -14,7 +17,8 @@ export class WDSystemShare implements WDShareInterface {
     return new Promise((resolve, fail) => {
     return new Promise((resolve, fail) => {
       try {
       try {
 
 
-        let controller: systemShare.ShareController = new systemShare.ShareController(this.getShareData(content, contentType));
+        let data = this.getShareData(content, contentType)
+        let controller: systemShare.ShareController = new systemShare.ShareController(data);
         let context: common.UIAbilityContext = getContext(this) as common.UIAbilityContext
         let context: common.UIAbilityContext = getContext(this) as common.UIAbilityContext
 
 
         controller.on('dismiss', () => {
         controller.on('dismiss', () => {
@@ -53,7 +57,7 @@ export class WDSystemShare implements WDShareInterface {
       });
       });
       data.addRecord({
       data.addRecord({
         utd: utd.UniformDataType.PNG,
         utd: utd.UniformDataType.PNG,
-        uri: imageAndText.imgURI
+        uri: imageAndText.imgURI  // 这里必须为本地连接
       });
       });
       return data
       return data
     }
     }
@@ -64,6 +68,8 @@ export class WDSystemShare implements WDShareInterface {
       utd: utd.UniformDataType.PLAIN_TEXT,
       utd: utd.UniformDataType.PLAIN_TEXT,
       content: link.title
       content: link.title
     });
     });
+    let shareLink = this.generateShareLink(link)
+    console.log("分享 shareLink ==> " + shareLink)
     data.addRecord({
     data.addRecord({
       utd: utd.UniformDataType.HYPERLINK,
       utd: utd.UniformDataType.HYPERLINK,
       // uri: link.link // SDK 设计 不能传这里
       // uri: link.link // SDK 设计 不能传这里
@@ -72,5 +78,16 @@ export class WDSystemShare implements WDShareInterface {
     return data
     return data
   }
   }
 
 
-
+  generateShareLink(shareContent: ShareContentLink) {
+    let link = "https://peopledailychinahosactivity.drcn.agconnect.link/?deeplink=" + encodeURI(shareContent.deeplink)
+    link += "&harmonyos_deeplink=" + encodeURI(shareContent.deeplink)
+    link += "&harmonyos_package_name=com.peopledailychina.hosactivity"
+    link += "&harmonyos_fallback_url=" + encodeURI(shareContent.link)
+    link += "&landing_page_type=1"
+    // link += "&social_desc=" + encodeURIComponent(shareContent.desc || " ")
+    // link += "&social_image=" + encodeURI(shareContent.icon || " ")
+    // link += "&social_title=" + encodeURIComponent(shareContent.title)
+    link += "&region_id=0"
+    return link
+  }
 }
 }

@@ -2,6 +2,7 @@ import { ContentDetailDTO, ContentDTO, PageInfoDTO, ShareInfoDTO, TopicInfo } fr
 import { SharePosterItemBean } from 'wdBean/src/main/ets/bean/detail/SharePosterItemBean';
 import { SharePosterItemBean } from 'wdBean/src/main/ets/bean/detail/SharePosterItemBean';
 import { ShareScene, ShareType, WDShareBase } from 'wdShareBase/Index';
 import { ShareScene, ShareType, WDShareBase } from 'wdShareBase/Index';
 import { ShareContentType } from 'wdShareBase/src/main/ets/Constant';
 import { ShareContentType } from 'wdShareBase/src/main/ets/Constant';
+import { DeepLinkUtil } from './utils/DeepLinkUtil';
 
 
 export class WDShare {
 export class WDShare {
 
 
@@ -17,6 +18,7 @@ export class WDShare {
         title: content.shareInfo.shareTitle,
         title: content.shareInfo.shareTitle,
         desc: content.shareInfo.shareSummary,
         desc: content.shareInfo.shareSummary,
         link: content.shareInfo.shareUrl,
         link: content.shareInfo.shareUrl,
+        deeplink:DeepLinkUtil.generateDeepLinkWithConent(content),
       }
       }
     })
     })
   }
   }
@@ -32,6 +34,7 @@ export class WDShare {
         title: program.shareInfo.shareTitle,
         title: program.shareInfo.shareTitle,
         desc: program.shareInfo.shareSummary,
         desc: program.shareInfo.shareSummary,
         link: program.shareInfo.shareUrl,
         link: program.shareInfo.shareUrl,
+        deeplink:DeepLinkUtil.generateDeepLinkWithProgram(program),
       }
       }
     })
     })
   }
   }

+import { ContentDetailDTO, ContentDTO } from 'wdBean/Index';
+import { BreakpointSystem } from 'wdKit/Index';
+import { ContentType } from 'wdRouter/Index';
+
+export class DeepLinkUtil {
+
+  private static DEEP_LINK_PREFIX = "rmrbapp:rmrb.app/openwith"
+
+  static generateDeepLinkWithConent(content: ContentDetailDTO): string {
+
+    return DeepLinkUtil.generate(content.newsType, content.newsId +'', content.reLInfo?.relId, content.newsLinkUrl)
+  }
+
+  static generateDeepLinkWithProgram(content: ContentDTO) {
+
+    return DeepLinkUtil.generate(Number(content.objectType), content.objectId +'', content.relId, content.linkUrl)
+  }
+
+  private static generate(contentType: number, contentId?: string, relId?: string, link?: string): string {
+    let deeplink = DeepLinkUtil.DEEP_LINK_PREFIX
+
+    let pubParam = `&contentId=${contentId}}&relId=${relId}&skipType=1`
+
+    let type: ContentType = Number(contentType)
+    switch (type) {
+      case ContentType.Video:
+        deeplink += "?type=video&subType=vod_video"
+        break
+      case ContentType.Live:
+        deeplink += "?type=live"
+        break
+      case ContentType.ImageText:
+        if (link && link.length) {
+          deeplink += "?type=article&subType=h5"
+          deeplink += "&url=" + encodeURIComponent(link)
+        } else {
+          deeplink += "type=article&subType=h5_template_article"
+        }
+        break
+      case ContentType.DynamicImageText:
+        deeplink += "?type=dynamic"
+        break
+      case ContentType.DynamicVideo:
+        deeplink += "?type=dynamic"
+        break
+      case ContentType.Pictures:
+        deeplink += "?type=picture"
+        break
+      case ContentType.Audio:
+        deeplink += "?type=audio"
+        break
+      case ContentType.Ask:
+        deeplink += "?type=ask"
+        break
+      default:
+        pubParam = ""
+        break;
+    }
+
+    deeplink += pubParam
+    return deeplink
+  }
+
+
+}