feat:启动页广告优化端内端外web跳转

@@ -256,4 +256,20 @@ export class ProcessUtils {
       Logger.error(TAG, 'jumpExternalWebPage success, error: ' + JSON.stringify(err))
       Logger.error(TAG, 'jumpExternalWebPage success, error: ' + JSON.stringify(err))
     })
     })
   }
   }
+
+  /**
+   * 打开端内web页面
+   * @param url web地址
+   */
+  public static gotoDefaultWebPage(url: string) {
+    let taskAction: Action = {
+      type: 'JUMP_H5_BY_WEB_VIEW',
+      params: {
+        url: url,
+      } as Params,
+    };
+    WDRouterRule.jumpWithAction(taskAction)
+  }
+
+
 }
 }

 import router from '@ohos.router'
 import router from '@ohos.router'
-import { WDRouterRule } from 'wdRouter';
+import { ProcessUtils, WDRouterRule } from 'wdRouter';
 import { WDRouterPage } from 'wdRouter';
 import { WDRouterPage } from 'wdRouter';
 import { Logger, SPHelper } from 'wdKit/Index';
 import { Logger, SPHelper } from 'wdKit/Index';
 import { SpConstants } from 'wdConstant/Index';
 import { SpConstants } from 'wdConstant/Index';
@@ -178,23 +178,14 @@ struct LaunchAdvertisingPage {
     // openType 端外 端内 打开
     // openType 端外 端内 打开
     if (this.model.launchAdInfo[0].matInfo.openType == '2') {
     if (this.model.launchAdInfo[0].matInfo.openType == '2') {
       //端外打开
       //端外打开
-      let context = getContext(this) as common.UIAbilityContext;
-      let wantInfo: Want = {
-        // uncomment line below if wish to implicitly query only in the specific bundle.
-        // bundleName: 'com.example.myapplication',
-        action: 'ohos.want.action.viewData',
-        // entities can be omitted.
-        entities: ['entity.system.browsable'],
-        uri: 'https://news.bjd.com.cn/2024/03/19/10724331.shtml'
-      }
-      context.startAbility(wantInfo).then(() => {
-        // ...
-      }).catch((err: BusinessError) => {
-        // ...
-      })
+
+      ProcessUtils.jumpExternalWebPage(this.model.launchAdInfo[0].matInfo.linkUrl)
+      clearInterval(this.timer)
+
     }else {
     }else {
       //端内打开
       //端内打开
-
+      ProcessUtils.gotoDefaultWebPage(this.model.launchAdInfo[0].matInfo.linkUrl)
+      clearInterval(this.timer)
 
 
     }
     }
   }
   }

@@ -98,6 +98,12 @@ struct LaunchPage {
           //获取本地存储的启动页数据
           //获取本地存储的启动页数据
 
 
           let dataModelStr : string = SPHelper.default.getSync(SpConstants.APP_LAUNCH_PAGE_DATA_MODEL,'') as string
           let dataModelStr : string = SPHelper.default.getSync(SpConstants.APP_LAUNCH_PAGE_DATA_MODEL,'') as string
+          if (!dataModelStr) {
+            //直接跳转首页
+            WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
+            return
+          }
+          
           let dataModel : LaunchDataModel = JSON.parse(dataModelStr)
           let dataModel : LaunchDataModel = JSON.parse(dataModelStr)
           console.log(dataModelStr)
           console.log(dataModelStr)