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

@@ -8,7 +8,7 @@
   "version": "1.0.0",
   "version": "1.0.0",
   "dependencies": {
   "dependencies": {
     "@tingyun/harmonyos": "file:./src/main/ets/tingyunAPM/tingyun_0.0.6.har",
     "@tingyun/harmonyos": "file:./src/main/ets/tingyunAPM/tingyun_0.0.6.har",
-    "@umeng/common": "^1.0.21",
+    "@umeng/common": "^1.0.31",
     "@umeng/analytics": "^1.0.19",
     "@umeng/analytics": "^1.0.19",
     "@mpaas/udid": "0.0.2",
     "@mpaas/udid": "0.0.2",
     "@mpaas/upgrade": "0.0.2",
     "@mpaas/upgrade": "0.0.2",

@@ -23,13 +23,17 @@ struct MultiPictureDetailPage {
   @Provide pageName: string = TrackConstants.PageName.Atlas_Detail
   @Provide pageName: string = TrackConstants.PageName.Atlas_Detail
   @Provide bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @Provide bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
   @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
   @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
+  action: Action = {} as Action
+
+
   build() {
   build() {
     Row() {
     Row() {
       Column() {
       Column() {
         MultiPictureDetailPageComponent({
         MultiPictureDetailPageComponent({
             relId: this.relId,
             relId: this.relId,
             contentId: this.contentId,
             contentId: this.contentId,
-            relType: this.relType
+            relType: this.relType,
+            action: this.action
           })
           })
       }
       }
 
 
@@ -53,13 +57,15 @@ struct MultiPictureDetailPage {
 
 
     Logger.info(TAG, 'aboutToDisappear');
     Logger.info(TAG, 'aboutToDisappear');
 
 
-    let par:Action =  router.getParams() as Action;
-    let params = par?.params;
+    let action:Action =  router.getParams() as Action;
+    let params = action?.params;
     this.relId = params?.extra?.relId || '';
     this.relId = params?.extra?.relId || '';
     this.relType = params?.extra?.relType || '';
     this.relType = params?.extra?.relType || '';
     this.contentId = params?.contentID || '';
     this.contentId = params?.contentID || '';
     Logger.info(TAG, 'aboutToAppear');
     Logger.info(TAG, 'aboutToAppear');
     Logger.info(TAG, 'params', JSON.stringify(params));
     Logger.info(TAG, 'params', JSON.stringify(params));
+
+    this.action = action
   }
   }
 
 
   onBackPress() {
   onBackPress() {

@@ -7,7 +7,8 @@ import {
   PhotoListBean,
   PhotoListBean,
   postBatchAttentionStatusParams,
   postBatchAttentionStatusParams,
   postInteractAccentionOperateParams,
   postInteractAccentionOperateParams,
-  postInteractBrowsOperateParams
+  postInteractBrowsOperateParams,
+  Action
 } from 'wdBean';
 } from 'wdBean';
 import { DateTimeUtils } from 'wdKit/Index';
 import { DateTimeUtils } from 'wdKit/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
@@ -65,6 +66,7 @@ export struct MultiPictureDetailPageComponent {
   @State isScrollerTop: boolean = false;
   @State isScrollerTop: boolean = false;
   @Provide duration: number = 0
   @Provide duration: number = 0
   @State executedStartTime: number = new Date().getTime()
   @State executedStartTime: number = new Date().getTime()
+  action: Action = {} as Action
 
 
   //watch监听页码回调
   //watch监听页码回调
   onCurrentPageNumUpdated(): void {
   onCurrentPageNumUpdated(): void {
@@ -97,6 +99,12 @@ export struct MultiPictureDetailPageComponent {
     // })
     // })
     this.getDetail()
     this.getDetail()
     this.contentTrackingDict()
     this.contentTrackingDict()
+
+    if(this.action.params?.targetLayout == "comment"){
+      setTimeout(() => {
+        this.showCommentList = true
+      }, 1000)
+    }
   }
   }
 
 
   contentTrackingDict() {
   contentTrackingDict() {