直播列表item跳图文详情页,其他bug修复

@@ -86,9 +86,8 @@ struct ReserveMorePage {
     // .title('直播列表')
     // .title('直播列表')
 
 
     Column() {
     Column() {
+      this.TabbarNormal()
       Column() {
       Column() {
-        this.TabbarNormal()
-
         this.ListLayout()
         this.ListLayout()
       }
       }
       .padding({
       .padding({

@@ -6,6 +6,8 @@ import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { ExtraDTO } from 'wdBean/src/main/ets/bean/component/extra/ExtraDTO'
 import { LiveModel } from '../../viewmodel/LiveModel'
 import { LiveModel } from '../../viewmodel/LiveModel'
+import { ContentConstants } from '../../constants/ContentConstants'
+import { ProcessUtils } from '../../utils/ProcessUtils'
 
 
 @Component
 @Component
 export struct LiveHorizontalCardComponent {
 export struct LiveHorizontalCardComponent {
@@ -25,7 +27,7 @@ export struct LiveHorizontalCardComponent {
             .fontWeight(600)
             .fontWeight(600)
         }
         }
 
 
-        if (this.compDTO.operDataList.length > 2) {
+        if (this.compDTO.dataSourceType === 'LIVE_HORIZONTAL_CARD' || this.compDTO.dataSourceType === 'LIVE_MONTHLY_RANKING') {
           Row() {
           Row() {
             Text("更多")
             Text("更多")
               .fontSize($r("app.float.font_size_14"))
               .fontSize($r("app.float.font_size_14"))
@@ -118,26 +120,34 @@ export struct LiveHorizontalCardComponent {
 
 
   async gotoLive(content: ContentDTO) {
   async gotoLive(content: ContentDTO) {
     const liveDetail = await LiveModel.getLiveDetails(content?.objectId || '', content?.relId || '', content?.relType || '')
     const liveDetail = await LiveModel.getLiveDetails(content?.objectId || '', content?.relId || '', content?.relType || '')
-    const liveStyle = liveDetail[0].liveInfo.liveStyle
-    const liveState = liveDetail[0].liveInfo.liveState
+    if (content && content.objectType) {
+      if (content.objectType === ContentConstants.TYPE_LIVE) {
+        if (liveDetail && liveDetail[0] && liveDetail[0].liveInfo) {
+          const liveStyle = liveDetail[0].liveInfo.liveStyle
+          const liveState = liveDetail[0].liveInfo.liveState
 
 
+          console.error('liveDetail===', liveDetail)
 
 
-    console.error('liveDetail===', liveDetail)
+          let taskAction: Action = {
+            type: 'JUMP_DETAIL_PAGE',
+            params: {
+              detailPageType: 2,
+              contentID: content?.objectId,
+              liveStyle: liveState === 'wait' ? 0 : liveStyle,
+              extra: {
+                relType: content?.relType,
+                relId: content?.relId,
+              } as ExtraDTO
+            } as Params,
+          };
+          WDRouterRule.jumpWithAction(taskAction)
+          // Logger.debug(TAG, `gotoLive, ${content.objectId}`);
+        }
+      } else if (content.objectType === ContentConstants.TYPE_TELETEXT) {
+        ProcessUtils.processPage(content)
+      }
+    }
 
 
 
 
-    let taskAction: Action = {
-      type: 'JUMP_DETAIL_PAGE',
-      params: {
-        detailPageType: 2,
-        contentID: content?.objectId,
-        liveStyle: liveState === 'wait' ? 0 : liveStyle,
-        extra: {
-          relType: content?.relType,
-          relId: content?.relId,
-        } as ExtraDTO
-      } as Params,
-    };
-    WDRouterRule.jumpWithAction(taskAction)
-    // Logger.debug(TAG, `gotoLive, ${content.objectId}`);
   }
   }
 }
 }

@@ -26,7 +26,7 @@ export struct LiveHorizontalReservationComponent {
             .fontWeight(600)
             .fontWeight(600)
         }
         }
 
 
-        if (this.compDTO.operDataList.length > 2) {
+        if (this.compDTO.dataSourceType === 'LIVE_RESERVATION') {
           Row() {
           Row() {
             Text("更多")
             Text("更多")
               .fontSize($r("app.float.font_size_14"))
               .fontSize($r("app.float.font_size_14"))