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

@@ -98,6 +98,7 @@ export struct OtherHomePageBottomCommentComponent {
         }).onVisibleAreaChange([0.0, 1.0], (isVisible: boolean, currentRatio: number) => {
         }).onVisibleAreaChange([0.0, 1.0], (isVisible: boolean, currentRatio: number) => {
           if (isVisible) {
           if (isVisible) {
             let contentDTO = getParams(item)
             let contentDTO = getParams(item)
+            //埋点crash 后面看看
             TrackingContent.common(TrackConstants.EventType.Show, TrackConstants.PageName.Customer_Personal,TrackConstants.PageName.Customer_Personal, TrackParamConvert.program(contentDTO))
             TrackingContent.common(TrackConstants.EventType.Show, TrackConstants.PageName.Customer_Personal,TrackConstants.PageName.Customer_Personal, TrackParamConvert.program(contentDTO))
           }
           }
         })
         })
@@ -110,13 +111,6 @@ export struct OtherHomePageBottomCommentComponent {
         }
         }
       }
       }
     }
     }
-    // .onReachEnd(()=>{
-    //   if (!this.isLoading) {
-    //     this.isLoading = true
-    //     //加载分页数据
-    //     this.getNewPageData()
-    //   }
-    // })
     .cachedCount(5)
     .cachedCount(5)
     .layoutWeight(1)
     .layoutWeight(1)
     .scrollBar(BarState.Off)
     .scrollBar(BarState.Off)

@@ -63,6 +63,7 @@ struct OtherNormalUserHomePage {
 
 
 
 
   build() {
   build() {
+    Column(){
       if(this.isConnectNetwork){
       if(this.isConnectNetwork){
         Stack({ alignContent: Alignment.Top }){
         Stack({ alignContent: Alignment.Top }){
           Stack({ alignContent: Alignment.Top }){
           Stack({ alignContent: Alignment.Top }){
@@ -269,7 +270,7 @@ struct OtherNormalUserHomePage {
             .width('100%')
             .width('100%')
         }
         }
       }
       }
-
+    }.padding({bottom:px2vp(this.bottomSafeHeight)})
   }
   }
   @Builder MineHomeTitleTransparent() {
   @Builder MineHomeTitleTransparent() {
     RelativeContainer() {
     RelativeContainer() {

@@ -2,7 +2,7 @@ import { Logger } from 'wdKit/Index';
 import { TrackingModule } from '../TrackingModule';
 import { TrackingModule } from '../TrackingModule';
 import sensors from '@sensorsdata/analytics';
 import sensors from '@sensorsdata/analytics';
 import { ParamType, PublicParams } from '../common/PublicParams';
 import { ParamType, PublicParams } from '../common/PublicParams';
-import { HashMap } from '@kit.ArkTS';
+import { taskpool } from '@kit.ArkTS';
 import { TrackConstants } from '../common/TrackConstants';
 import { TrackConstants } from '../common/TrackConstants';
 
 
 const TAG = "WDTracking"
 const TAG = "WDTracking"
@@ -18,7 +18,28 @@ export class Tracking {
     }
     }
 
 
     //TODO: 添加运行单独线程？
     //TODO: 添加运行单独线程？
+    taskpool.execute(doTrack, eventId, params).then(() => {
+      Logger.error('yyyy','event track success')
+    }).catch(()=>{
+      Logger.error('yyyy','event track failed')
+    })
 
 
+    // let publicParams = new PublicParams()
+    // publicParams.getPublicParams().then((pubParams) => {
+    //
+    //   if (params) {
+    //     for (const obj of Object.entries(params)) {
+    //       // Logger.info(TAG, ` ${obj[0]} => ` + `${obj[1]}`);
+    //       pubParams[obj[0]] = obj[1]
+    //     }
+    //   }
+    //   sensors.track(eventId, pubParams)
+    // })
+  }
+}
+
+@Concurrent
+function doTrack(eventId: string, params?: ParamType): void {
   let publicParams = new PublicParams()
   let publicParams = new PublicParams()
   publicParams.getPublicParams().then((pubParams) => {
   publicParams.getPublicParams().then((pubParams) => {
 
 
@@ -30,5 +51,4 @@ export class Tracking {
     }
     }
     sensors.track(eventId, pubParams)
     sensors.track(eventId, pubParams)
   })
   })
-  }
 }
 }