Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool into main

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix |> 今日文章详情页滑动到评论区时评论图标显示正文
  fix: 大数据新上报的稳定性问题

@@ -520,6 +520,11 @@ export struct ImageAndTextPageComponent {
       this.lastTimeoutId = setTimeout(() => {
       this.lastTimeoutId = setTimeout(() => {
         let offSetY = this.info?.globalPosition.y as number
         let offSetY = this.info?.globalPosition.y as number
         Logger.debug(TAG, "即将滚动至yOffset: " + (offSetY - 100))
         Logger.debug(TAG, "即将滚动至yOffset: " + (offSetY - 100))
+        if (offSetY >= (this.screenHeight-this.bottomHeight) ) {
+          this.showMainText = true
+        }else {
+          this.showMainText = false
+        }
         //头部距离48
         //头部距离48
         this.scroller.scrollTo({
         this.scroller.scrollTo({
           yOffset: offSetY - 100,
           yOffset: offSetY - 100,

@@ -47,13 +47,6 @@ struct MainPage {
     })
     })
 
 
     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) {
-      //请求启动页相关接口数据并保存
-      let launchPageModel = new LaunchPageModel()
-      launchPageModel.getLaunchPageData()
-      dataModelStr = SPHelper.default.getSync(SpConstants.APP_LAUNCH_PAGE_DATA_MODEL,'') as string
-
-    }
     let dataModel : LaunchDataModel = JSON.parse(dataModelStr)
     let dataModel : LaunchDataModel = JSON.parse(dataModelStr)
     console.log(dataModelStr)
     console.log(dataModelStr)
     // 处理国殇模式数据
     // 处理国殇模式数据

@@ -105,6 +105,7 @@ 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) {
           if (!dataModelStr) {
+            this.requestLaunchPageData()
             //直接跳转首页
             //直接跳转首页
             WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
             WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
             return
             return
@@ -112,6 +113,8 @@ struct LaunchPage {
 
 
           let dataModel : LaunchDataModel = JSON.parse(dataModelStr)
           let dataModel : LaunchDataModel = JSON.parse(dataModelStr)
           console.log(dataModelStr)
           console.log(dataModelStr)
+          //同意隐私协议后每次启动app请求启动页相关数据，并更新数据
+          this.requestLaunchPageData();
 
 
           if (dataModel.launchPageInfo || dataModel.launchAdInfo.length) {
           if (dataModel.launchPageInfo || dataModel.launchAdInfo.length) {
             //跳转广告页
             //跳转广告页
@@ -123,8 +126,6 @@ struct LaunchPage {
             //直接跳转首页
             //直接跳转首页
             WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
             WDRouterRule.jumpWithReplacePage(WDRouterPage.mainPage)
           }
           }
-          //同意隐私协议后每次启动app请求启动页相关数据，并更新数据
-          this.requestLaunchPageData();
         }
         }
       });
       });
     });
     });