ref |> 早晚报桌面组件跳转App页面处理

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

@@ -4,7 +4,7 @@ import { ContentType } from 'wdRouter/Index';
 
 
 export class DeepLinkUtil {
 export class DeepLinkUtil {
 
 
-  private static DEEP_LINK_PREFIX = "rmrbapp:rmrb.app/openwith"
+  private static DEEP_LINK_PREFIX = "rmrbapp://rmrb.app/openwith"
 
 
   static generateDeepLinkWithConent(content: ContentDetailDTO): string {
   static generateDeepLinkWithConent(content: ContentDetailDTO): string {
 
 
@@ -23,7 +23,7 @@ export class DeepLinkUtil {
   private static generate(contentType: number, contentId?: string, relId?: string, link?: string): string {
   private static generate(contentType: number, contentId?: string, relId?: string, link?: string): string {
     let deeplink = DeepLinkUtil.DEEP_LINK_PREFIX
     let deeplink = DeepLinkUtil.DEEP_LINK_PREFIX
 
 
-    let pubParam = `&contentId=${contentId}}&relId=${relId}&skipType=1`
+    let pubParam = `&contentId=${contentId}&relId=${relId}&skipType=1`
 
 
     let type: ContentType = Number(contentType)
     let type: ContentType = Number(contentType)
     switch (type) {
     switch (type) {
@@ -38,7 +38,7 @@ export class DeepLinkUtil {
           deeplink += "?type=article&subType=h5"
           deeplink += "?type=article&subType=h5"
           deeplink += "&url=" + encodeURIComponent(link)
           deeplink += "&url=" + encodeURIComponent(link)
         } else {
         } else {
-          deeplink += "type=article&subType=h5_template_article"
+          deeplink += "?type=article&subType=h5_template_article"
         }
         }
         break
         break
       case ContentType.DynamicImageText:
       case ContentType.DynamicImageText:

@@ -151,14 +151,12 @@ function jumpWithDeepLink(deepLink: string, component: Object) {
   if (deepLink.length == 0) {
   if (deepLink.length == 0) {
     return
     return
   }
   }
-  const deepLinkKey: string = NewspaperWidgetCommon.JumpParam.DeepLinkKey
-  const fromDailyNewspaperKey: string = NewspaperWidgetCommon.JumpParam.FromNewspaperWidgetKey
   postCardAction(component, {
   postCardAction(component, {
     action: NewspaperWidgetCommon.PosterCardAction.ActionRouter,
     action: NewspaperWidgetCommon.PosterCardAction.ActionRouter,
     abilityName: NewspaperWidgetCommon.PosterCardAction.MainAbilityName,
     abilityName: NewspaperWidgetCommon.PosterCardAction.MainAbilityName,
     params: {
     params: {
-      deepLinkKey: deepLink,
-      fromDailyNewspaperKey: true
+      "newspaper.widget.jump.deeplink": deepLink,
+      "newspaper.widget.jump.fromNewspaperWidget": 1
     }
     }
   });
   });
 }
 }

@@ -12,13 +12,14 @@ import { DeviceUtil,
   UmengStats } from 'wdKit/Index'
   UmengStats } from 'wdKit/Index'
 import { LoginModule } from 'wdLogin/Index'
 import { LoginModule } from 'wdLogin/Index'
 import { HostEnum, HostManager, WDHttp } from 'wdNetwork/Index'
 import { HostEnum, HostManager, WDHttp } from 'wdNetwork/Index'
-import { registerRouter } from 'wdRouter/Index'
+import { AppInnerLink, registerRouter } from 'wdRouter/Index'
 import { TrackingModule } from 'wdTracking/Index'
 import { TrackingModule } from 'wdTracking/Index'
 import { JSON } from '@kit.ArkTS'
 import { JSON } from '@kit.ArkTS'
 import app from '@system.app'
 import app from '@system.app'
 import { GetuiPush, HWLocationUtils } from 'wdHwAbility/Index'
 import { GetuiPush, HWLocationUtils } from 'wdHwAbility/Index'
 import { ImageKnife, ImageKnifeGlobal } from '@ohos/imageknife'
 import { ImageKnife, ImageKnifeGlobal } from '@ohos/imageknife'
 import { webview } from '@kit.ArkWeb'
 import { webview } from '@kit.ArkWeb'
+import { NewspaperWidgetCommon } from '../dailynewspaperwidget/common/NewspaperWidgetCommon'
 
 
 const TAG = "[StartupManager]"
 const TAG = "[StartupManager]"
 
 
@@ -26,6 +27,7 @@ const TAG = "[StartupManager]"
 export class StartupManager {
 export class StartupManager {
 
 
   private context?: common.UIAbilityContext
   private context?: common.UIAbilityContext
+  private lastStartupWant?: Want
 
 
   private constructor() {
   private constructor() {
   }
   }
@@ -74,10 +76,14 @@ export class StartupManager {
     // 通知栏点击后启动
     // 通知栏点击后启动
     GetuiPush.sharedInstance().onWant(want)
     GetuiPush.sharedInstance().onWant(want)
     Logger.debug(TAG, "App onCreate: finised")
     Logger.debug(TAG, "App onCreate: finised")
+
+    this.lastStartupWant = want
   }
   }
 
 
   appOnNewWant(want: Want, launchParam: AbilityConstant.LaunchParam) {
   appOnNewWant(want: Want, launchParam: AbilityConstant.LaunchParam) {
     GetuiPush.sharedInstance().onNewWant(want)
     GetuiPush.sharedInstance().onNewWant(want)
+
+    this.dealWithDeepLink(want)
   }
   }
 
 
   appOnDestory() {
   appOnDestory() {
@@ -124,6 +130,10 @@ export class StartupManager {
       //TODO:
       //TODO:
       // 提前初始化webview
       // 提前初始化webview
       webview.WebviewController.initializeWebEngine()
       webview.WebviewController.initializeWebEngine()
+
+      if (this.lastStartupWant && this.dealWithDeepLink(this.lastStartupWant)) {
+          this.lastStartupWant = undefined
+      }
       resolve()
       resolve()
     })
     })
   }
   }
@@ -195,4 +205,20 @@ export class StartupManager {
   private initOthers() {
   private initOthers() {
 
 
   }
   }
+
+  private dealWithDeepLink(want: Want): boolean {
+
+    if (!want.parameters) {
+      return false
+    }
+
+    let deepLink = want.parameters[NewspaperWidgetCommon.JumpParam.DeepLinkKey] as string
+
+    if (deepLink && deepLink.length) {
+
+      AppInnerLink.jumpWithLink(deepLink)
+      return true
+    }
+    return false
+  }
 }
 }