修改直播入口

@@ -50,11 +50,7 @@ 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 || action.params?.detailPageType == 6) {
-      if (action.params?.liveStyle === 0) {
-        return WDRouterPage.detailPlayLivePage
-      } else {
-        return WDRouterPage.detailPlayVLivePage
-      }
+      return WDRouterPage.detailPlayLiveCommon
     } else if (action.params?.detailPageType == 7 || action.params?.detailPageType == 8) {
     } else if (action.params?.detailPageType == 7 || action.params?.detailPageType == 8) {
       return WDRouterPage.detailVideoListPage
       return WDRouterPage.detailVideoListPage
     } else if (action.params?.detailPageType == 9) {
     } else if (action.params?.detailPageType == 9) {

@@ -54,6 +54,7 @@ export class WDRouterPage {
   // 直播详情页
   // 直播详情页
   static detailPlayLivePage = new WDRouterPage("wdDetailPlayLive", "ets/pages/DetailPlayLivePage");
   static detailPlayLivePage = new WDRouterPage("wdDetailPlayLive", "ets/pages/DetailPlayLivePage");
   static detailPlayVLivePage = new WDRouterPage("wdDetailPlayLive", "ets/pages/DetailPlayVLivePage");
   static detailPlayVLivePage = new WDRouterPage("wdDetailPlayLive", "ets/pages/DetailPlayVLivePage");
+  static detailPlayLiveCommon = new WDRouterPage("wdDetailPlayLive", "ets/pages/DetailPlayLiveCommon");
   // 多图(图集)详情页
   // 多图(图集)详情页
   static multiPictureDetailPage = new WDRouterPage("phone", "ets/pages/detail/MultiPictureDetailPage");
   static multiPictureDetailPage = new WDRouterPage("phone", "ets/pages/detail/MultiPictureDetailPage");
   //大图列表页
   //大图列表页

@@ -4,6 +4,7 @@ import { Logger } from 'wdKit';
 import { StringUtils } from 'wdKit/src/main/ets/utils/StringUtils';
 import { StringUtils } from 'wdKit/src/main/ets/utils/StringUtils';
 import { WDRouterRule } from '../router/WDRouterRule';
 import { WDRouterRule } from '../router/WDRouterRule';
 import { ContentConstants } from 'wdConstant';
 import { ContentConstants } from 'wdConstant';
+
 // import { LiveModel } from '../viewmodel/LiveModel';
 // import { LiveModel } from '../viewmodel/LiveModel';
 
 
 const TAG = 'ProcessUtils';
 const TAG = 'ProcessUtils';
@@ -25,7 +26,7 @@ export class ProcessUtils {
       return;
       return;
     }
     }
     let type = content.objectType;
     let type = content.objectType;
-    console.log(TAG,'objectType',`${JSON.stringify(content)}`);
+    console.log(TAG, 'objectType', `${JSON.stringify(content)}`);
     switch (type) {
     switch (type) {
       case ContentConstants.TYPE_NONE:
       case ContentConstants.TYPE_NONE:
         Logger.debug(TAG, "processPage, do nothing");
         Logger.debug(TAG, "processPage, do nothing");
@@ -164,15 +165,11 @@ export class ProcessUtils {
   }
   }
 
 
   private static async gotoLive(content: ContentDTO) {
   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 = {
     let taskAction: Action = {
       type: 'JUMP_DETAIL_PAGE',
       type: 'JUMP_DETAIL_PAGE',
       params: {
       params: {
         detailPageType: 2,
         detailPageType: 2,
         contentID: content?.objectId,
         contentID: content?.objectId,
-        // liveStyle: liveState === 'wait' ? 0 : liveStyle,
         extra: {
         extra: {
           relType: content?.relType,
           relType: content?.relType,
           relId: content?.relId,
           relId: content?.relId,

@@ -68,20 +68,12 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
   }
   }
 
 
   async gotoLive(content: ContentDTO) {
   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
-
-
-    console.error('liveDetail===', liveDetail)
-
 
 
     let taskAction: Action = {
     let taskAction: Action = {
       type: 'JUMP_DETAIL_PAGE',
       type: 'JUMP_DETAIL_PAGE',
       params: {
       params: {
         detailPageType: 2,
         detailPageType: 2,
         contentID: content?.objectId,
         contentID: content?.objectId,
-        liveStyle: liveState === 'wait' ? 0 : liveStyle,
         extra: {
         extra: {
           relType: content?.relType,
           relType: content?.relType,
           relId: content?.relId,
           relId: content?.relId,

@@ -108,20 +108,12 @@ export struct LiveHorizontalReservationComponent {
   }
   }
 
 
   async gotoLive(content: ContentDTO) {
   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
-
-
-    console.error('liveDetail===', liveDetail)
-
 
 
     let taskAction: Action = {
     let taskAction: Action = {
       type: 'JUMP_DETAIL_PAGE',
       type: 'JUMP_DETAIL_PAGE',
       params: {
       params: {
         detailPageType: 2,
         detailPageType: 2,
         contentID: content?.objectId,
         contentID: content?.objectId,
-        liveStyle: liveState === 'wait' ? 0 : liveStyle,
         extra: {
         extra: {
           relType: content?.relType,
           relType: content?.relType,
           relId: content?.relId,
           relId: content?.relId,

 {
 {
   "src": [
   "src": [
     "pages/DetailPlayLivePage",
     "pages/DetailPlayLivePage",
-    "pages/DetailPlayVLivePage"
+    "pages/DetailPlayVLivePage",
+    "pages/DetailPlayLiveCommon"
   ]
   ]
 }
 }