fix |> 19569 【8.0新需求】APP拉起换端，去掉广告页显示（从启动页直接跳详情页，返回到首页）功能未实现

@@ -64,4 +64,6 @@ export class SpConstants{
    // 个推推送
    // 个推推送
    static GETUI_PUSH_CID = "cid"
    static GETUI_PUSH_CID = "cid"
    static GETUI_PUSH_DEVICE_TOKEN = "deviceToken"
    static GETUI_PUSH_DEVICE_TOKEN = "deviceToken"
+   //link
+   static  HAS_LINK="has_link"
 }
 }

-import { Logger } from 'wdKit'
+import { Logger, SPHelper, StringUtils } from 'wdKit'
 import { Want } from '@kit.AbilityKit'
 import { Want } from '@kit.AbilityKit'
 import { url } from '@kit.ArkTS'
 import { url } from '@kit.ArkTS'
 import { AppInnerLinkGenerator } from './AppInnerLinkGenerator'
 import { AppInnerLinkGenerator } from './AppInnerLinkGenerator'
@@ -6,6 +6,7 @@ import { ContentType } from '../common/ContentType'
 import { AppInnerLink } from './AppInnerLink'
 import { AppInnerLink } from './AppInnerLink'
 import { HttpBizUtil, HttpUrlUtils, ResponseDTO } from 'wdNetwork'
 import { HttpBizUtil, HttpUrlUtils, ResponseDTO } from 'wdNetwork'
 import { ContentDetailDTO } from 'wdBean'
 import { ContentDetailDTO } from 'wdBean'
+import { SpConstants } from 'wdConstant'
 
 
 const TAG = "AppLinkingManager"
 const TAG = "AppLinkingManager"
 
 
@@ -16,6 +17,7 @@ export class AppLinkingManager {
 
 
   private hasEnterMain = false
   private hasEnterMain = false
   private lastUrlObj?: url.URL
   private lastUrlObj?: url.URL
+  private isJumpInnerLink:boolean = true
 
 
   private static manager: AppLinkingManager
   private static manager: AppLinkingManager
   private constructor() {
   private constructor() {
@@ -58,13 +60,19 @@ export class AppLinkingManager {
     this.comsumeLastUriContent()
     this.comsumeLastUriContent()
   }
   }
 
 
-  comsumeLastUriContent() {
+  comsumeLastUriContent(isJump:boolean = true) {
+    this.isJumpInnerLink = isJump
     Logger.debug(TAG, "尝试消费拉起链接: " + this.lastUrlObj?.toString())
     Logger.debug(TAG, "尝试消费拉起链接: " + this.lastUrlObj?.toString())
     if (!this.lastUrlObj) {
     if (!this.lastUrlObj) {
       return
       return
     }
     }
     let path = this.lastUrlObj?.pathname ?? ""
     let path = this.lastUrlObj?.pathname ?? ""
 
 
+    if(!this.isJumpInnerLink && StringUtils.isNotEmpty(path)){
+      SPHelper.default.save(SpConstants.HAS_LINK, true)
+      return
+    }
+
     if (this.dealWithRMHArticle()
     if (this.dealWithRMHArticle()
       || this.dealWithNormalArticle()
       || this.dealWithNormalArticle()
       || this.dealWithCreator()
       || this.dealWithCreator()
@@ -187,7 +195,9 @@ export class AppLinkingManager {
   }
   }
 
 
   jumpInnerLink(innerLink: string) {
   jumpInnerLink(innerLink: string) {
-    Logger.debug(TAG, "即将跳转链接: " + innerLink)
-    AppInnerLink.jumpWithLink(innerLink)
+    if(this.isJumpInnerLink){
+      Logger.debug(TAG, "即将跳转链接: " + innerLink)
+      AppInnerLink.jumpWithLink(innerLink)
+    }
   }
   }
 }
 }

@@ -118,7 +118,6 @@ export struct MoreComponent {
           let contentDTO = MinePageDatasModel.dataTransform(rem,value, photos);
           let contentDTO = MinePageDatasModel.dataTransform(rem,value, photos);
           if(value.type != "13"){
           if(value.type != "13"){
             this.contentDTO.sameContentList.push(contentDTO)
             this.contentDTO.sameContentList.push(contentDTO)
-            console.log("ycg","123")
           }
           }
         })
         })
 
 

@@ -7,6 +7,7 @@ import { BusinessError } from '@ohos.base';
 import { DeviceUtil, EmitterEventId, EmitterUtils, Logger, SPHelper, WindowModel } from 'wdKit';
 import { DeviceUtil, EmitterEventId, EmitterUtils, Logger, SPHelper, WindowModel } from 'wdKit';
 import { ConfigurationConstant } from '@kit.AbilityKit';
 import { ConfigurationConstant } from '@kit.AbilityKit';
 import { StartupManager } from '../startupmanager/StartupManager';
 import { StartupManager } from '../startupmanager/StartupManager';
+import { AppLinkingManager } from 'wdRouter';
 
 
 let floatWindowClass: window.Window | null = null;
 let floatWindowClass: window.Window | null = null;
 const TAG = 'EntryAbility'
 const TAG = 'EntryAbility'
@@ -19,7 +20,8 @@ export default class EntryAbility extends UIAbility {
       StartupManager.sharedInstance().appAgreedProtocol()
       StartupManager.sharedInstance().appAgreedProtocol()
     }
     }
     Logger.info(TAG, 'Ability onCreate');
     Logger.info(TAG, 'Ability onCreate');
-
+    //只判断不跳转
+    AppLinkingManager.sharedInstance().comsumeLastUriContent(false)
     // 还没深色模式需求，暂直接不跟随系统。
     // 还没深色模式需求，暂直接不跟随系统。
     this.context.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_LIGHT);
     this.context.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_LIGHT);
 
 

@@ -59,7 +59,14 @@ struct LaunchPage {
     this.timerId = setTimeout(() => {
     this.timerId = setTimeout(() => {
       this.isJumpToAdvertising = true;
       this.isJumpToAdvertising = true;
 
 
-      WDRouterRule.jumpWithPage(WDRouterPage.launchAdvertisingPage)
+      let hasLink =  SPHelper.default.getSync(SpConstants.HAS_LINK,false)
+      if(hasLink){
+        SPHelper.default.deleteSync(SpConstants.HAS_LINK)
+        WDRouterRule.jumpWithPage(WDRouterPage.mainPage)
+      }else{
+        WDRouterRule.jumpWithPage(WDRouterPage.launchAdvertisingPage)
+      }
+
 
 
       // router.pushUrl({
       // router.pushUrl({
       //   url: 'pages/LaunchAdvertisingPage'
       //   url: 'pages/LaunchAdvertisingPage'

@@ -214,7 +214,7 @@ export struct BottomNavigationComponent {
       },
       },
       onLoadListener:{
       onLoadListener:{
         onLoadFailed:(err)=>{
         onLoadFailed:(err)=>{
-          console.error("ycg","Load Failed Reason: " + err + "  cost " + (new Date().getTime()  ) + " milliseconds");
+          console.error("Load Failed Reason: " + err + "  cost " + (new Date().getTime()  ) + " milliseconds");
         }
         }
       }
       }
     };
     };