ref |> 统一优化跳转详情页detailPageType

Signed-off-by: xugenyuan <xugenyuan@wondertek.com.cn>

@@ -49,9 +49,9 @@ export function registerRouter() {
   // })
   // })
 
 
   Action2Page.register("JUMP_DETAIL_PAGE", (action: Action) => {
   Action2Page.register("JUMP_DETAIL_PAGE", (action: Action) => {
-    if (action.params?.detailPageType == 2 || action.params?.detailPageType == 6) {
+    if (action.params?.detailPageType == 2) {
       return WDRouterPage.detailPlayLiveCommon
       return WDRouterPage.detailPlayLiveCommon
-    } else if (action.params?.detailPageType == 7 || action.params?.detailPageType == 8) {
+    } else if (action.params?.detailPageType == 1) {
       return WDRouterPage.detailVideoListPage
       return WDRouterPage.detailVideoListPage
     } else if (action.params?.detailPageType == 9) {
     } else if (action.params?.detailPageType == 9) {
       //图集详情页
       //图集详情页
@@ -59,16 +59,19 @@ export function registerRouter() {
     } else if (action.params?.detailPageType == 14 || action.params?.detailPageType == 15) {
     } else if (action.params?.detailPageType == 14 || action.params?.detailPageType == 15) {
       //动态详情页
       //动态详情页
       return WDRouterPage.dynamicDetailPage
       return WDRouterPage.dynamicDetailPage
-    } else if (action.params?.detailPageType == 17) {
-      return WDRouterPage.multiPictureDetailPage
     } else if (action.params?.detailPageType == 13) {
     } else if (action.params?.detailPageType == 13) {
       return WDRouterPage.audioDetail
       return WDRouterPage.audioDetail
-    } else if (action.params?.detailPageType == 18) {
+    } else if (action.params?.detailPageType == 30) {
+      return WDRouterPage.themeListPage
+    } else if (action.params?.detailPageType == 8) {
+      return WDRouterPage.imageTextDetailPage
+    }
+
+    //TODO: 以下两个最好改为pageID方式，以上都是有具体内容类型 对应详情页面
+    else if (action.params?.detailPageType == 18) {
       return WDRouterPage.multiPictureListPage
       return WDRouterPage.multiPictureListPage
     } else if (action.params?.detailPageType == 19) {
     } else if (action.params?.detailPageType == 19) {
       return WDRouterPage.videoPlayPage
       return WDRouterPage.videoPlayPage
-    }else if (action.params?.detailPageType == 30) {
-      return WDRouterPage.themeListPage
     }
     }
     return WDRouterPage.detailPlayVodPage
     return WDRouterPage.detailPlayVodPage
   })
   })

@@ -3,6 +3,7 @@ import App from '@system.app'
 import { Action, Params } from 'wdBean/Index'
 import { Action, Params } from 'wdBean/Index'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { Logger } from 'wdKit/Index'
 import { Logger } from 'wdKit/Index'
+import { ContentType } from '../common/ContentType'
 import { WDRouterRule } from '../router/WDRouterRule'
 import { WDRouterRule } from '../router/WDRouterRule'
 import { ProcessUtils } from './ProcessUtils'
 import { ProcessUtils } from './ProcessUtils'
 
 
@@ -111,13 +112,13 @@ export class AppInnerLink {
   }
   }
   private static contentTypeWithType(type?: string) : number | undefined {
   private static contentTypeWithType(type?: string) : number | undefined {
     switch (type) {
     switch (type) {
-      case "video": return 1
-      case "dynamic": return 14
-      case "live": return 2
-      case "audio": return 13
-      case "picture": return 9
-      case "article": return 8
-      case "ask": return 16
+      case "video": return ContentType.Video
+      case "dynamic": return ContentType.DynamicImageText
+      case "live": return ContentType.Live
+      case "audio": return ContentType.Audio
+      case "picture": return ContentType.Pictures
+      case "article": return ContentType.ImageText
+      case "ask": return ContentType.Ask
     }
     }
     return
     return
   }
   }

@@ -304,7 +304,7 @@ export class ProcessUtils {
     let taskAction: Action = {
     let taskAction: Action = {
       type: 'JUMP_DETAIL_PAGE',
       type: 'JUMP_DETAIL_PAGE',
       params: {
       params: {
-        detailPageType: 7,
+        detailPageType: 1,
         contentID: content?.objectId,
         contentID: content?.objectId,
         extra: {
         extra: {
           relType: content?.relType,
           relType: content?.relType,
@@ -382,7 +382,7 @@ export class ProcessUtils {
     let taskAction: Action = {
     let taskAction: Action = {
       type: 'JUMP_DETAIL_PAGE',
       type: 'JUMP_DETAIL_PAGE',
       params: {
       params: {
-        detailPageType: 17,
+        detailPageType: 9,
         contentID: content?.objectId,
         contentID: content?.objectId,
         extra: {
         extra: {
           relType: content?.relType,
           relType: content?.relType,

@@ -10,16 +10,13 @@ export interface Params {
   // 详情页类型
   // 详情页类型
   // 1.点播详情页
   // 1.点播详情页
   // 2.直播详情页
   // 2.直播详情页
-  // 3.图文详情页
-  // 4.全民播详情页
-  // 5.欢喜详情页
-  // 6.挂件详情页
-  // 7.沉浸式竖屏详情页
-  // 8.专辑竖屏详情页
-  // 13.音频详情页
-  // 17.多图（图集）详情页
-  // 18.大图列表页
-  // 19.单个视频播放页
+  // 8.图文详情页
+  // 9.多图（图集）详情页
+  // 14和15 动态详情页
+  // 13 音频详情页
+  // 30 金刚位
+  // 18.大图列表页 - 图片预览  ------ 需要变更待定
+  // 19.单个视频播放页 - 视频播放 ----- 需要变更待定
   detailPageType?: number; // 详情页类型
   detailPageType?: number; // 详情页类型
   liveStyle?: number; // 直播类型：0横屏，1竖屏
   liveStyle?: number; // 直播类型：0横屏，1竖屏
   creatorId?: string; //号主id
   creatorId?: string; //号主id

@@ -116,7 +116,7 @@ export struct Card17Component {
         let taskAction: Action = {
         let taskAction: Action = {
           type: 'JUMP_DETAIL_PAGE',
           type: 'JUMP_DETAIL_PAGE',
           params: {
           params: {
-            detailPageType: 17,
+            detailPageType: 9,
             contentID: this.contentDTO.objectId,
             contentID: this.contentDTO.objectId,
             extra: {
             extra: {
               relType: this.contentDTO.relType,
               relType: this.contentDTO.relType,