fix |> 桌面组件--早晚报中含有专题页内容时桌面组件无法跳转对应的专题页

http://192.168.1.3:8080/zentao/bug-view-19105.html

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

@@ -6,6 +6,7 @@ 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 { ContentType } from '../common/ContentType'
 import { WDRouterRule } from '../router/WDRouterRule'
 import { WDRouterRule } from '../router/WDRouterRule'
+import HomeChannelUtils from './HomeChannelUtils'
 import { ProcessUtils } from './ProcessUtils'
 import { ProcessUtils } from './ProcessUtils'
 
 
 const TAG = "AppInnerLink"
 const TAG = "AppInnerLink"
@@ -123,8 +124,18 @@ export class AppInnerLink {
       WDRouterRule.jumpWithAction(taskAction)
       WDRouterRule.jumpWithAction(taskAction)
     }
     }
 
 
-    if (params.type == "channel") {
+    if (params.type == "topic" && params.subType == "audio_news") {
+    }
+    if (params.type == "topic" && params.subType == "moring_evening_news") {
+      ProcessUtils.gotoMorningEveningPaper()
+    }
 
 
+    if (params.type == "channel") {
+      if (params.subType == "electronic_newspapers") {
+        ProcessUtils.gotoENewsPaper();
+        return
+      }
+      HomeChannelUtils.jumpChannelTab(params.firstChannelId ?? "", params.pageId ?? "", "")
     }
     }
 
 
   }
   }

@@ -12,14 +12,16 @@ export class AppInnerLinkGenerator {
 
 
   static generateDeepLinkWithProgram(content: ContentDTO) {
   static generateDeepLinkWithProgram(content: ContentDTO) {
 
 
-    return AppInnerLinkGenerator.generate(Number(content.objectType), content.objectId +'', content.relId, content.linkUrl)
+    return AppInnerLinkGenerator.generate(Number(content.objectType), content.objectId +'', content.relId
+      , content.linkUrl, content.pageId, Number(content.objectLevel))
   }
   }
 
 
   static generateDeepLinkWithFrontObjectLink(content: FrontLinkObject) {
   static generateDeepLinkWithFrontObjectLink(content: FrontLinkObject) {
-    return AppInnerLinkGenerator.generate(Number(content.newsType), content.newsId +'', content.newsRelId + '', content.linkUrl)
+    return AppInnerLinkGenerator.generate(Number(content.newsType), content.newsId +''
+      , content.newsRelId + '', content.linkUrl, content.newsPageId, Number(content.newsLevel))
   }
   }
 
 
-  static generate(contentType: number, contentId?: string, relId?: string, link?: string): string {
+  static generate(contentType: number, contentId?: string, relId?: string, link?: string, pageId?: string, objectLevel?: number): string {
     let deeplink = AppInnerLinkGenerator.DEEP_LINK_PREFIX
     let deeplink = AppInnerLinkGenerator.DEEP_LINK_PREFIX
 
 
     let pubParam = `&contentId=${contentId ?? ""}&relId=${relId ?? ""}&skipType=1`
     let pubParam = `&contentId=${contentId ?? ""}&relId=${relId ?? ""}&skipType=1`
@@ -55,6 +57,20 @@ export class AppInnerLinkGenerator {
       case ContentType.Ask:
       case ContentType.Ask:
         deeplink += "?type=ask"
         deeplink += "?type=ask"
         break
         break
+      case ContentType.Subject:
+        if (objectLevel && objectLevel == 25) { // 早晚报专题
+          deeplink += `?type=topic&subType=moring_evening_news&pageId=${pageId}&relId=${relId}&skipType=1`
+          return deeplink
+        }
+        if (objectLevel && objectLevel == 22) { // 音频专题
+          deeplink += `?type=topic&subType=audio_news&pageId=${pageId}&relId=${relId}&skipType=1`
+          return deeplink
+        }
+        if (link) {
+          deeplink += `?type=topic&subType=h5&pageId=${pageId}&relId=&url=${encodeURIComponent(link)}&skipType=1`
+          return deeplink
+        }
+        break
       default:
       default:
         pubParam = ""
         pubParam = ""
         break;
         break;

@@ -4,9 +4,9 @@ export interface FrontLinkObject {
   linkUrl: string;
   linkUrl: string;
   newsId: string;
   newsId: string;
   newsLevel: string;
   newsLevel: string;
-  // newsPageId?: any;
+  newsPageId: string;
   newsRelId: number;
   newsRelId: number;
-  // newsRelType?: any;
+  newsRelType: string;
   newsType: number;
   newsType: number;
   publishTime: string;
   publishTime: string;
   source: string;
   source: string;