通用跳转方法挪至 common

@@ -22,3 +22,6 @@ export { ScreenType } from './src/main/ets/enum/ScreenType';
 export { SpConstants } from './src/main/ets/constants/SpConstants';
 export { SpConstants } from './src/main/ets/constants/SpConstants';
 
 
 export { DisplayDirection } from './src/main/ets/constants/VideoConstants';
 export { DisplayDirection } from './src/main/ets/constants/VideoConstants';
+
+export { ContentConstants } from './src/main/ets/constants/ContentConstants';
+

+export class ContentConstants {
+  /* content#objectType，跳转类型：0:不跳转 1:点播,2:直播,3:活动,4:广告,5:专题,6:链接,7:榜单,8:图文,9:组图,10:H5新闻,11:频道,12:组件,13:音频,14动态图文,15动态视频 */
+  /**
+   * 0:不跳转
+   */
+  static readonly TYPE_NONE: string = "0";
+  /**
+   * 1:点播
+   */
+  static readonly TYPE_VOD: string = "1";
+  /**
+   * 2:直播
+   */
+  static readonly TYPE_LIVE: string = "2";
+  /**
+   * 5:专题详情
+   */
+  static readonly TYPE_SPECIAL_TOPIC: string = "5";
+
+  /**
+   * 6:链接
+   */
+  static readonly TYPE_LINK: string = "6";
+
+  /**
+   * 8:图文详情，这里是h5页面
+   */
+  static readonly TYPE_TELETEXT: string = "8";
+  /**
+   * 9:图集
+   */
+  static readonly TYPE_NINE: string = "9";
+  /**
+   * 13:音频详情
+   */
+  static readonly TYPE_AUDIO: string = "13";
+
+  /**
+   * 14:动态图文
+   */
+  static readonly TYPE_FOURTEEN: string = "14";
+
+  /**
+   * 15:动态视频
+   */
+  static readonly TYPE_FIFTEEN: string = "15";
+
+
+}

@@ -3,3 +3,5 @@ export { WDRouterRule } from './src/main/ets/router/WDRouterRule'
 export { WDRouterPage } from './src/main/ets/router/WDRouterPage'
 export { WDRouterPage } from './src/main/ets/router/WDRouterPage'
 
 
 export { registerRouter } from './src/main/ets/router/Action2Page'
 export { registerRouter } from './src/main/ets/router/Action2Page'
+
+export { ProcessUtils } from './src/main/ets/utils/ProcessUtils'

@@ -9,6 +9,7 @@
   "dependencies": {
   "dependencies": {
     "wdKit": "file:../wdKit",
     "wdKit": "file:../wdKit",
     "wdBean": "file:../../features/wdBean",
     "wdBean": "file:../../features/wdBean",
-    "wdNetwork": "file:../../commons/wdNetwork"
+    "wdNetwork": "file:../../commons/wdNetwork",
+    "wdConstant": "file:../../commons/wdConstant"
   }
   }
 }
 }

+import { Action, ContentDTO, Params } from 'wdBean';
+import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO';
+import { Logger } from 'wdKit';
+import { StringUtils } from 'wdKit/src/main/ets/utils/StringUtils';
+import { WDRouterRule } from '../router/WDRouterRule';
+import { ContentConstants } from 'wdConstant';
+// import { LiveModel } from '../viewmodel/LiveModel';
+
+const TAG = 'ProcessUtils';
+
+/**
+ * 页面跳转业务封装
+ */
+export class ProcessUtils {
+  /**
+   * 页面跳转
+   */
+  static processPage(content: ContentDTO) {
+    if (content == null) {
+      Logger.error(TAG, "processPage, content is null");
+      return;
+    }
+    if (StringUtils.isEmpty(content.objectType)) {
+      Logger.error(TAG, "processPage, objectType is empty");
+      return;
+    }
+    let type = content.objectType;
+    console.log(TAG,'objectType',`${JSON.stringify(content)}`);
+    switch (type) {
+      case ContentConstants.TYPE_NONE:
+        Logger.debug(TAG, "processPage, do nothing");
+        break;
+      case ContentConstants.TYPE_VOD:
+        Logger.debug(TAG, "processPage, nonsupport!!!");
+        ProcessUtils.gotoVod(content)
+        break;
+      case ContentConstants.TYPE_LIVE:
+        ProcessUtils.gotoLive(content)
+        break
+      case ContentConstants.TYPE_AUDIO:
+        ProcessUtils.gotoAudio(content)
+        break;
+      case ContentConstants.TYPE_TELETEXT:
+      // 图文详情，跳转h5
+        ProcessUtils.gotoWeb(content);
+        break;
+      case ContentConstants.TYPE_LINK:
+        ProcessUtils.gotoDefaultWeb(content);
+        break;
+    //图集详情页
+      case ContentConstants.TYPE_NINE:
+        ProcessUtils.gotoAtlasDetailPage(content);
+        break;
+      case ContentConstants.TYPE_SPECIAL_TOPIC:
+      // 专题详情，跳转h5
+        ProcessUtils.gotoSpecialTopic(content);
+        break;
+    //动态详情页（动态图文）
+      case ContentConstants.TYPE_FOURTEEN:
+        break;
+    //动态详情页（动态视频）
+      case ContentConstants.TYPE_FIFTEEN:
+        ProcessUtils.gotoWeb(content);
+        break;
+      default:
+        break;
+    }
+  }
+
+  /**
+   * 动态详情页（动态视频/动态图片）
+   * @param content
+   * */
+  private static gotoDynamicDetailPage(content: ContentDTO) {
+    let taskAction: Action = {
+      type: 'JUMP_DETAIL_PAGE',
+      params: {
+        detailPageType: 14,
+        contentID: content?.objectId,
+        extra: {
+          relType: content?.relType,
+          relId: content?.relId,
+        } as ExtraDTO
+      } as Params,
+    };
+    WDRouterRule.jumpWithAction(taskAction)
+    Logger.debug(TAG, `gotoDynamicDetailPage, ${content.objectId}`);
+  }
+
+  /**
+   * 图集详情页
+   * @param content
+   * */
+  private static gotoAtlasDetailPage(content: ContentDTO) {
+    let taskAction: Action = {
+      type: 'JUMP_DETAIL_PAGE',
+      params: {
+        detailPageType: 17,
+        contentID: content?.objectId,
+        extra: {
+          relType: content?.relType,
+          relId: content?.relId,
+        } as ExtraDTO
+      } as Params,
+    };
+    WDRouterRule.jumpWithAction(taskAction)
+    Logger.debug(TAG, `gotoAtlasDetailPage, ${content.objectId}`);
+  }
+
+  private static gotoSpecialTopic(content: ContentDTO) {
+    let taskAction: Action = {
+      type: 'JUMP_INNER_NEW_PAGE',
+      params: {
+        url: content.linkUrl,
+        pageID: 'SPACIAL_TOPIC_PAGE',
+      } as Params,
+    };
+    WDRouterRule.jumpWithAction(taskAction)
+  }
+
+  private static gotoDefaultWeb(content: ContentDTO) {
+    let taskAction: Action = {
+      type: 'JUMP_H5_BY_WEB_VIEW',
+      params: {
+        url: content.linkUrl,
+      } as Params,
+    };
+    WDRouterRule.jumpWithAction(taskAction)
+    Logger.debug(TAG, `gotoWeb, ${content.objectId}`);
+  }
+
+  private static gotoWeb(content: ContentDTO) {
+    let taskAction: Action = {
+      type: 'JUMP_INNER_NEW_PAGE',
+      params: {
+        contentID: content?.objectId,
+        pageID: 'IMAGE_TEXT_DETAIL',
+        extra: {
+          relType: content?.relType,
+          relId: content?.relId,
+          channelId: content?.channelId,
+          sourcePage: '5'
+        } as ExtraDTO
+      } as Params,
+    };
+    WDRouterRule.jumpWithAction(taskAction)
+    Logger.debug(TAG, `gotoWeb, ${content.objectId}`);
+  }
+
+  private static gotoVod(content: ContentDTO) {
+    let taskAction: Action = {
+      type: 'JUMP_DETAIL_PAGE',
+      params: {
+        detailPageType: 7,
+        contentID: content?.objectId,
+        extra: {
+          relType: content?.relType,
+          relId: content?.relId,
+        } as ExtraDTO
+      } as Params,
+    };
+    WDRouterRule.jumpWithAction(taskAction)
+    Logger.debug(TAG, `gotoVod, ${content.objectId}`);
+  }
+
+  private static async gotoLive(content: ContentDTO) {
+    // const liveDetail = await LiveModel.getLiveDetails(content?.objectId || '', content?.relId || '', content?.relType || '')
+    // const liveStyle = liveDetail[0].liveInfo.liveStyle
+    // const liveState = liveDetail[0].liveInfo.liveState
+    let taskAction: Action = {
+      type: 'JUMP_DETAIL_PAGE',
+      params: {
+        detailPageType: 2,
+        contentID: content?.objectId,
+        // liveStyle: liveState === 'wait' ? 0 : liveStyle,
+        liveStyle: 0 ,
+        extra: {
+          relType: content?.relType,
+          relId: content?.relId,
+        } as ExtraDTO
+      } as Params,
+    };
+    WDRouterRule.jumpWithAction(taskAction)
+    Logger.debug(TAG, `gotoLive, ${content.objectId}`);
+  }
+
+  private static gotoAudio(content: ContentDTO) {
+    let taskAction: Action = {
+      type: 'JUMP_DETAIL_PAGE',
+      params: {
+        detailPageType: 13,
+        contentID: content?.objectId,
+        extra: {
+          relType: content?.relType,
+          relId: content?.relId,
+        } as ExtraDTO
+      } as Params,
+    };
+    WDRouterRule.jumpWithAction(taskAction)
+    Logger.debug(TAG, `gotoAudio, ${content.objectId}`);
+  }
+}

@@ -7,7 +7,7 @@ import { performJSCallNative } from './JsBridgeBiz';
 import { H5CallNativeType } from './H5CallNativeType';
 import { H5CallNativeType } from './H5CallNativeType';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
 import { Message } from 'wdJsBridge/src/main/ets/bean/Message';
 
 
-const TAG = 'WdWebLocalComponent';
+const TAG = 'WdWebComponent';
 
 
 @Component
 @Component
 export struct WdWebComponent {
 export struct WdWebComponent {