developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
wangliang_wd
ba0e1612 2 parents 5bc81554 327e6671

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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  ref |> 修复 19885 功能缺陷-进入直播频道，无网络环境访问直播稿件，应提示：网络出小差了，请检查网络后重试
  ref |>修复缺陷 18780-进入直播间，未评论，评论后，切换直播间，然后在切到大家聊后，数据消失
  fix: 20432 热点频道下面广告关掉，再下拉刷新，未重新展示广告
  fix |> 20055 直播频道，接口返回数据存在楼层无数据时，未做兼容处理，客户端展示空白页。
  fix: 人民号横屏视频详情页全屏播放后的标题文字样式和分享按钮图标与安卓不一致
  ref |> 更新umeng 新版本
  fix |> 18815 互动消息-点击历史评论，鸿蒙版视频和图集详情页无法直接跳转到对应详情页的评论区
  ref |> 横屏直播详情直播间/大家聊无网加载失败时显示缺省图
  ref |> 去除调试代码
  ref |> 观看直播全屏时，点击关注退出全屏
  fix: 点播视频返回按钮位置偏低，已上调
Inline Side-by-side
Showing 13 changed files with 117 additions and 65 deletions
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 "version": "1.0.0", 8 "version": "1.0.0",
9 "dependencies": { 9 "dependencies": {
10 "@tingyun/harmonyos": "file:./src/main/ets/tingyunAPM/tingyun_0.0.6.har", 10 "@tingyun/harmonyos": "file:./src/main/ets/tingyunAPM/tingyun_0.0.6.har",
11 - "@umeng/common": "^1.0.21", 11 + "@umeng/common": "^1.0.31",
12 "@umeng/analytics": "^1.0.19", 12 "@umeng/analytics": "^1.0.19",
13 "@mpaas/udid": "0.0.2", 13 "@mpaas/udid": "0.0.2",
14 "@mpaas/upgrade": "0.0.2", 14 "@mpaas/upgrade": "0.0.2",
@@ -18,7 +18,7 @@ export struct LiveFollowComponent { @@ -18,7 +18,7 @@ export struct LiveFollowComponent {
18 @Prop rmhInfo: RmhInfoDTO 18 @Prop rmhInfo: RmhInfoDTO
19 @Consume contentDetailData: ContentDetailDTO 19 @Consume contentDetailData: ContentDetailDTO
20 @Consume @Watch('getBatchAttentionStatus') pageShow: number 20 @Consume @Watch('getBatchAttentionStatus') pageShow: number
21 - 21 + clickFollowButton?:()=>void
22 aboutToAppear(): void { 22 aboutToAppear(): void {
23 this.getBatchAttentionStatus() 23 this.getBatchAttentionStatus()
24 } 24 }
@@ -90,6 +90,9 @@ export struct LiveFollowComponent { @@ -90,6 +90,9 @@ export struct LiveFollowComponent {
90 .backgroundColor(this.followStatus === '0' ? $r('app.color.color_ED2800') : $r('app.color.color_CCCCCC')) 90 .backgroundColor(this.followStatus === '0' ? $r('app.color.color_ED2800') : $r('app.color.color_CCCCCC'))
91 .visibility(this.followStatus === '0' ? Visibility.Visible : Visibility.None) 91 .visibility(this.followStatus === '0' ? Visibility.Visible : Visibility.None)
92 .onClick(() => { 92 .onClick(() => {
  93 + if (this.clickFollowButton) {
  94 + this.clickFollowButton()
  95 + }
93 this.handleAccention() 96 this.handleAccention()
94 }) 97 })
95 } 98 }
@@ -65,6 +65,8 @@ export struct EmptyComponent { @@ -65,6 +65,8 @@ export struct EmptyComponent {
65 @State timeNum: number = 10 65 @State timeNum: number = 10
66 ///占位图上是否显示返回按钮 66 ///占位图上是否显示返回按钮
67 @State showBackButton: boolean = true 67 @State showBackButton: boolean = true
  68 +
  69 + @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
68 /** 70 /**
69 * The empty image width percentage setting. 71 * The empty image width percentage setting.
70 */ 72 */
@@ -114,16 +116,25 @@ export struct EmptyComponent { @@ -114,16 +116,25 @@ export struct EmptyComponent {
114 Stack({alignContent:Alignment.Bottom}) { 116 Stack({alignContent:Alignment.Bottom}) {
115 this.noProgrammeData(); 117 this.noProgrammeData();
116 if (this.showBackButton) { 118 if (this.showBackButton) {
117 - Image($r("app.media.icon_arrow_left_white"))  
118 - .width(24)  
119 - .height(24)  
120 - .onClick(() => {  
121 - router.back();  
122 - })  
123 - .position({  
124 - bottom: 15,  
125 - left: 16  
126 - }) 119 + Column(){
  120 + Image($r("app.media.icon_arrow_left_white"))
  121 + .width(24)
  122 + .height(24)
  123 + .onClick(() => {
  124 + router.back();
  125 + })
  126 + .position({
  127 + bottom: 16,
  128 + left: 16
  129 + })
  130 + }
  131 + .height(56)
  132 + .width('100%')
  133 + .justifyContent(FlexAlign.Center)
  134 + .alignItems(HorizontalAlign.Start)
  135 + .margin({
  136 + bottom: px2vp(this.bottomSafeHeight)
  137 + })
127 } 138 }
128 } 139 }
129 } 140 }
@@ -109,6 +109,7 @@ export class PageHelper { @@ -109,6 +109,7 @@ export class PageHelper {
109 } 109 }
110 110
111 getPageInfo(pageModel: PageModel, pageAdvModel: PageAdModel) { 111 getPageInfo(pageModel: PageModel, pageAdvModel: PageAdModel) {
  112 + let cacheIsSame = false;
112 pageModel.currentPage = 1; 113 pageModel.currentPage = 1;
113 if (pageModel.pageType == 1) { 114 if (pageModel.pageType == 1) {
114 PageViewModel.postThemeList(pageModel.currentPage, pageModel.pageSize, pageModel.extra).then((liveReviewDTO) => { 115 PageViewModel.postThemeList(pageModel.currentPage, pageModel.pageSize, pageModel.extra).then((liveReviewDTO) => {
@@ -139,6 +140,7 @@ export class PageHelper { @@ -139,6 +140,7 @@ export class PageHelper {
139 if (pageInfo.md5 == pageModel.displayPageInfoMd5) { 140 if (pageInfo.md5 == pageModel.displayPageInfoMd5) {
140 // 缓存一致，不解析 141 // 缓存一致，不解析
141 // Logger.debug(TAG, 'getPageInfo 与缓存一致，不解析广告。。。') 142 // Logger.debug(TAG, 'getPageInfo 与缓存一致，不解析广告。。。')
  143 + cacheIsSame = true;
142 } else { 144 } else {
143 // Logger.debug(TAG, 'getPageInfo 要解析广告') 145 // Logger.debug(TAG, 'getPageInfo 要解析广告')
144 if (pageModel.currentPage == 1) { 146 if (pageModel.currentPage == 1) {
@@ -148,9 +150,10 @@ export class PageHelper { @@ -148,9 +150,10 @@ export class PageHelper {
148 pageModel.displayPageInfoMd5 = pageInfo.md5 150 pageModel.displayPageInfoMd5 = pageInfo.md5
149 //解析页面挂角广告资源 151 //解析页面挂角广告资源
150 pageAdvModel.analysisAdvSource(pageInfo); 152 pageAdvModel.analysisAdvSource(pageInfo);
  153 + cacheIsSame = false;
151 } 154 }
152 // Logger.debug(TAG, 'getPageInfo go on') 155 // Logger.debug(TAG, 'getPageInfo go on')
153 - this.parseGroup(pageModel, false) 156 + this.parseGroup(pageModel, cacheIsSame)
154 }).catch(() => { 157 }).catch(() => {
155 this.refreshUIEnd(pageModel, false) 158 this.refreshUIEnd(pageModel, false)
156 if (this.isPageLoaded(pageModel)) { 159 if (this.isPageLoaded(pageModel)) {
@@ -197,7 +200,8 @@ export class PageHelper { @@ -197,7 +200,8 @@ export class PageHelper {
197 pageModel.displayGroupInfoMd5 = pageDto.md5 200 pageModel.displayGroupInfoMd5 = pageDto.md5
198 } else { 201 } else {
199 pageDto = await PageViewModel.getPageGroupCompData(pageModel.bizCopy()) as PageDTO 202 pageDto = await PageViewModel.getPageGroupCompData(pageModel.bizCopy()) as PageDTO
200 - if (pageDto.md5 == pageModel.displayGroupInfoMd5) { 203 + //增加楼层数据异常判断条件
  204 + if (pageDto.md5 == pageModel.displayGroupInfoMd5 || pageDto.compList == null || pageDto.compList.length === 0 ) {
201 // Logger.debug(TAG, 'parseGroup cache load, return: ' + pageDto.md5) 205 // Logger.debug(TAG, 'parseGroup cache load, return: ' + pageDto.md5)
202 // 下拉刷新场景，数据没变，拦截刷新UI，重置相关参数 206 // 下拉刷新场景，数据没变，拦截刷新UI，重置相关参数
203 if (pageModel.loadStrategy === 2) { 207 if (pageModel.loadStrategy === 2) {
@@ -151,7 +151,7 @@ export struct DetailPlayLiveCommon { @@ -151,7 +151,7 @@ export struct DetailPlayLiveCommon {
151 .catch((error:Error) => { 151 .catch((error:Error) => {
152 Logger.debug(TAG + "error",error.message,error.name) 152 Logger.debug(TAG + "error",error.message,error.name)
153 this.isHideLoading = true; 153 this.isHideLoading = true;
154 - ToastUtils.shortToast('内容不存在'); 154 + ToastUtils.shortToast('网络出小差了，请检查网络后重试');
155 router.back(); 155 router.back();
156 reject(); 156 reject();
157 }); 157 });
@@ -40,7 +40,7 @@ export class LiveDetailPageLogic { @@ -40,7 +40,7 @@ export class LiveDetailPageLogic {
40 * @returns 40 * @returns
41 */ 41 */
42 isVerticalScreenVideo(): boolean { 42 isVerticalScreenVideo(): boolean {
43 - 43 +
44 return this.liveLandscape === 'general' 44 return this.liveLandscape === 'general'
45 } 45 }
46 46
@@ -34,6 +34,7 @@ export struct TabChatComponent { @@ -34,6 +34,7 @@ export struct TabChatComponent {
34 updateData() { 34 updateData() {
35 35
36 if (this.index === this.parentComponentIndex && this.initUI) { 36 if (this.index === this.parentComponentIndex && this.initUI) {
  37 + this.initUI = false
37 this.getLiveList() 38 this.getLiveList()
38 } 39 }
39 40
@@ -75,9 +76,7 @@ export struct TabChatComponent { @@ -75,9 +76,7 @@ export struct TabChatComponent {
75 Stack() { 76 Stack() {
76 if (this.pageModel.viewType == ViewType.LOADING) { 77 if (this.pageModel.viewType == ViewType.LOADING) {
77 this.LoadingLayout() 78 this.LoadingLayout()
78 - } else if (this.pageModel.viewType == ViewType.ERROR) {  
79 - ErrorComponent()  
80 - } else if (this.pageModel.viewType == ViewType.EMPTY) { 79 + } else if (this.pageModel.viewType == ViewType.EMPTY || this.pageModel.viewType == ViewType.ERROR) {
81 EmptyComponent({ emptyType: WDViewDefaultType.WDViewDefaultType_NoComment1, showBackButton:false}) 80 EmptyComponent({ emptyType: WDViewDefaultType.WDViewDefaultType_NoComment1, showBackButton:false})
82 } else { 81 } else {
83 82
@@ -89,7 +88,7 @@ export struct TabChatComponent { @@ -89,7 +88,7 @@ export struct TabChatComponent {
89 this.ListLayout() 88 this.ListLayout()
90 }, 89 },
91 onRefresh: (resolve) => { 90 onRefresh: (resolve) => {
92 - this.pageModel.currentPage = 1 91 + this.pageModel.currentPage ++
93 this.getLiveList(resolve) 92 this.getLiveList(resolve)
94 }, 93 },
95 94
@@ -138,7 +137,6 @@ export struct TabChatComponent { @@ -138,7 +137,6 @@ export struct TabChatComponent {
138 return 137 return
139 } 138 }
140 this.pageModel.isLoading = true 139 this.pageModel.isLoading = true
141 - this.pageModel.currentPage = 1  
142 this.liveViewModel.getLiveChatList( 140 this.liveViewModel.getLiveChatList(
143 this.pageModel.currentPage, 141 this.pageModel.currentPage,
144 this.contentDetailData?.liveInfo?.mlive?.mliveId, 142 this.contentDetailData?.liveInfo?.mlive?.mliveId,
@@ -154,34 +152,37 @@ export struct TabChatComponent { @@ -154,34 +152,37 @@ export struct TabChatComponent {
154 resolve('') 152 resolve('')
155 } 153 }
156 } 154 }
157 - if (this.pageModel.currentPage === 1) {  
158 - this.liveChatList.clear()  
159 - } 155 + // if (this.pageModel.currentPage === 1) {
  156 + // this.liveChatList.clear()
  157 + // }
160 Logger.debug(TAG, `${JSON.stringify(data)}`) 158 Logger.debug(TAG, `${JSON.stringify(data)}`)
161 if (data.barrageResponses && data.barrageResponses.length > 0) { 159 if (data.barrageResponses && data.barrageResponses.length > 0) {
162 this.pageModel.viewType = ViewType.LOADED; 160 this.pageModel.viewType = ViewType.LOADED;
163 this.liveChatList.push(...data.barrageResponses) 161 this.liveChatList.push(...data.barrageResponses)
164 162
165 - if (this.initUI) {  
166 - this.initUI = false 163 + if (this.pageModel.currentPage === 1) {
167 setTimeout(() => { 164 setTimeout(() => {
168 this.scroller.scrollToIndex(this.liveChatList.totalCount() - 1) 165 this.scroller.scrollToIndex(this.liveChatList.totalCount() - 1)
169 }, 300) 166 }, 300)
170 } 167 }
171 -  
172 - if (data.barrageResponses.length === this.pageModel.pageSize) {  
173 - this.pageModel.currentPage++;  
174 - this.pageModel.hasMore = true;  
175 - } else {  
176 - this.pageModel.hasMore = false;  
177 - } 168 + // this.pageModel.currentPage++;
  169 + // if (data.barrageResponses.length === this.pageModel.pageSize) {
  170 + //
  171 + // this.pageModel.hasMore = true;
  172 + // } else {
  173 + // this.pageModel.hasMore = false;
  174 + // }
178 } else { 175 } else {
179 - this.pageModel.viewType = ViewType.EMPTY; 176 + if (this.liveChatList.totalCount() == 0 ) {
  177 + this.pageModel.viewType = ViewType.EMPTY;
  178 + }
180 } 179 }
181 }, 180 },
182 () => { 181 () => {
183 Logger.debug(TAG, `error`) 182 Logger.debug(TAG, `error`)
184 - this.pageModel.viewType = ViewType.ERROR; 183 + if (this.liveChatList.totalCount() == 0) {
  184 + this.pageModel.viewType = ViewType.ERROR;
  185 + }
185 }) 186 })
186 } 187 }
187 188
@@ -72,9 +72,7 @@ export struct TabLiveComponent { @@ -72,9 +72,7 @@ export struct TabLiveComponent {
72 Stack() { 72 Stack() {
73 if (this.pageModel.viewType == ViewType.LOADING) { 73 if (this.pageModel.viewType == ViewType.LOADING) {
74 this.LoadingLayout() 74 this.LoadingLayout()
75 - } else if (this.pageModel.viewType == ViewType.ERROR) {  
76 - ErrorComponent()  
77 - } else if (this.pageModel.viewType == ViewType.EMPTY) { 75 + } else if (this.pageModel.viewType == ViewType.EMPTY || this.pageModel.viewType == ViewType.ERROR) {
78 EmptyComponent({ emptyType: WDViewDefaultType.WDViewDefaultType_NoContent1, showBackButton:false }) 76 EmptyComponent({ emptyType: WDViewDefaultType.WDViewDefaultType_NoContent1, showBackButton:false })
79 } else { 77 } else {
80 CustomPullToRefresh({ 78 CustomPullToRefresh({
@@ -121,12 +121,7 @@ export struct PlayUIComponent { @@ -121,12 +121,7 @@ export struct PlayUIComponent {
121 right: 10 121 right: 10
122 }) 122 })
123 .onClick(() => { 123 .onClick(() => {
124 - this.displayDirection = DisplayDirection.VERTICAL  
125 - WindowModel.shared.setPreferredOrientation(this.displayDirection == DisplayDirection.VERTICAL ?  
126 - window.Orientation.PORTRAIT :  
127 - window.Orientation.LANDSCAPE)  
128 - WindowModel.shared.setSpecificSystemBarEnabled(true)  
129 - 124 + this.quitFullScreen()
130 }) 125 })
131 if (this.contentDetailData.liveInfo?.liveState != 'wait') { 126 if (this.contentDetailData.liveInfo?.liveState != 'wait') {
132 //标题 127 //标题
@@ -160,7 +155,12 @@ export struct PlayUIComponent { @@ -160,7 +155,12 @@ export struct PlayUIComponent {
160 Row() { 155 Row() {
161 if (this.contentDetailData?.rmhInfo) { 156 if (this.contentDetailData?.rmhInfo) {
162 LiveFollowComponent({ 157 LiveFollowComponent({
163 - rmhInfo: this.contentDetailData.rmhInfo 158 + rmhInfo: this.contentDetailData.rmhInfo,
  159 + clickFollowButton:() => {
  160 + if (this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL) {
  161 + this.quitFullScreen()
  162 + }
  163 + }
164 }) 164 })
165 .margin({ 165 .margin({
166 // top:-7, 166 // top:-7,
@@ -450,4 +450,12 @@ export struct PlayUIComponent { @@ -450,4 +450,12 @@ export struct PlayUIComponent {
450 this.playerController?.setSeekTime(value, mode); 450 this.playerController?.setSeekTime(value, mode);
451 }) 451 })
452 } 452 }
  453 +
  454 + quitFullScreen() {
  455 + this.displayDirection = DisplayDirection.VERTICAL
  456 + WindowModel.shared.setPreferredOrientation(this.displayDirection == DisplayDirection.VERTICAL ?
  457 + window.Orientation.PORTRAIT :
  458 + window.Orientation.LANDSCAPE)
  459 + WindowModel.shared.setSpecificSystemBarEnabled(true)
  460 + }
453 } 461 }
@@ -52,21 +52,7 @@ export struct PlayerTitleComponent { @@ -52,21 +52,7 @@ export struct PlayerTitleComponent {
52 right: 10 52 right: 10
53 }) 53 })
54 .onClick(() => { 54 .onClick(() => {
55 - WindowModel.shared.setPreferredOrientation((this.isLarge && this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL) ?  
56 - window.Orientation.PORTRAIT :  
57 - window.Orientation.LANDSCAPE)  
58 - WindowModel.shared.setSpecificSystemBarEnabled(true)  
59 - this.isLarge = false  
60 - this.displayDirection = DisplayDirection.VERTICAL  
61 - if(this.playerController){  
62 - if(this.playerController.onVideoSizePlayerComponentBack){  
63 - this.playerController.onVideoSizePlayerComponentBack(2,1);  
64 - }  
65 - // if(this.playerController.onVideoSizePlayerUIComponentMethod){  
66 - // this.playerController.onVideoSizePlayerUIComponentMethod(2,1);  
67 - // }  
68 - }  
69 - this.isFullScreen = false 55 + this.quitFullScreen()
70 }) 56 })
71 Text(this.contentDetailData.newsTitle || '') 57 Text(this.contentDetailData.newsTitle || '')
72 .maxLines(2) 58 .maxLines(2)
@@ -104,7 +90,12 @@ export struct PlayerTitleComponent { @@ -104,7 +90,12 @@ export struct PlayerTitleComponent {
104 getLiveStatusView() { 90 getLiveStatusView() {
105 if (this.contentDetailData.rmhInfo?.rmhName) { 91 if (this.contentDetailData.rmhInfo?.rmhName) {
106 LiveFollowComponent({ 92 LiveFollowComponent({
107 - rmhInfo: this.contentDetailData.rmhInfo 93 + rmhInfo: this.contentDetailData.rmhInfo,
  94 + clickFollowButton:()=> {
  95 + if (this.isFullScreen) {
  96 + this.quitFullScreen()
  97 + }
  98 + }
108 }).margin({ 99 }).margin({
109 right: 10 100 right: 10
110 }) 101 })
@@ -159,4 +150,24 @@ export struct PlayerTitleComponent { @@ -159,4 +150,24 @@ export struct PlayerTitleComponent {
159 } : 4) 150 } : 4)
160 } 151 }
161 } 152 }
  153 +
  154 + quitFullScreen() {
  155 + WindowModel.shared.setPreferredOrientation((this.isLarge && this.displayDirection == DisplayDirection.VIDEO_HORIZONTAL) ?
  156 + window.Orientation.PORTRAIT :
  157 + window.Orientation.LANDSCAPE)
  158 + WindowModel.shared.setSpecificSystemBarEnabled(true)
  159 + this.isLarge = false
  160 + this.displayDirection = DisplayDirection.VERTICAL
  161 + if(this.playerController){
  162 + if(this.playerController.onVideoSizePlayerComponentBack){
  163 + this.playerController.onVideoSizePlayerComponentBack(2,1);
  164 + }
  165 + // if(this.playerController.onVideoSizePlayerUIComponentMethod){
  166 + // this.playerController.onVideoSizePlayerUIComponentMethod(2,1);
  167 + // }
  168 + }
  169 + this.isFullScreen = false
  170 + }
162 } 171 }
  172 +
  173 +
@@ -97,6 +97,8 @@ export struct PlayerFullScreenView { @@ -97,6 +97,8 @@ export struct PlayerFullScreenView {
97 }) 97 })
98 Text(this.getTitle()) 98 Text(this.getTitle())
99 .fontSize(18) 99 .fontSize(18)
  100 + .lineHeight(24)
  101 + .fontWeight(600)
100 .fontColor(Color.White) 102 .fontColor(Color.White)
101 .maxLines(1) 103 .maxLines(1)
102 .textOverflow({ overflow: TextOverflow.Ellipsis }) 104 .textOverflow({ overflow: TextOverflow.Ellipsis })
@@ -23,13 +23,17 @@ struct MultiPictureDetailPage { @@ -23,13 +23,17 @@ struct MultiPictureDetailPage {
23 @Provide pageName: string = TrackConstants.PageName.Atlas_Detail 23 @Provide pageName: string = TrackConstants.PageName.Atlas_Detail
24 @Provide bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0 24 @Provide bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
25 @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0 25 @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
  26 + action: Action = {} as Action
  27 +
  28 +
26 build() { 29 build() {
27 Row() { 30 Row() {
28 Column() { 31 Column() {
29 MultiPictureDetailPageComponent({ 32 MultiPictureDetailPageComponent({
30 relId: this.relId, 33 relId: this.relId,
31 contentId: this.contentId, 34 contentId: this.contentId,
32 - relType: this.relType 35 + relType: this.relType,
  36 + action: this.action
33 }) 37 })
34 } 38 }
35 39
@@ -53,13 +57,15 @@ struct MultiPictureDetailPage { @@ -53,13 +57,15 @@ struct MultiPictureDetailPage {
53 57
54 Logger.info(TAG, 'aboutToDisappear'); 58 Logger.info(TAG, 'aboutToDisappear');
55 59
56 - let par:Action = router.getParams() as Action;  
57 - let params = par?.params; 60 + let action:Action = router.getParams() as Action;
  61 + let params = action?.params;
58 this.relId = params?.extra?.relId || ''; 62 this.relId = params?.extra?.relId || '';
59 this.relType = params?.extra?.relType || ''; 63 this.relType = params?.extra?.relType || '';
60 this.contentId = params?.contentID || ''; 64 this.contentId = params?.contentID || '';
61 Logger.info(TAG, 'aboutToAppear'); 65 Logger.info(TAG, 'aboutToAppear');
62 Logger.info(TAG, 'params', JSON.stringify(params)); 66 Logger.info(TAG, 'params', JSON.stringify(params));
  67 +
  68 + this.action = action
63 } 69 }
64 70
65 onBackPress() { 71 onBackPress() {
@@ -7,7 +7,8 @@ import { @@ -7,7 +7,8 @@ import {
7 PhotoListBean, 7 PhotoListBean,
8 postBatchAttentionStatusParams, 8 postBatchAttentionStatusParams,
9 postInteractAccentionOperateParams, 9 postInteractAccentionOperateParams,
10 - postInteractBrowsOperateParams 10 + postInteractBrowsOperateParams,
  11 + Action
11 } from 'wdBean'; 12 } from 'wdBean';
12 import { DateTimeUtils } from 'wdKit/Index'; 13 import { DateTimeUtils } from 'wdKit/Index';
13 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'; 14 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
@@ -65,6 +66,7 @@ export struct MultiPictureDetailPageComponent { @@ -65,6 +66,7 @@ export struct MultiPictureDetailPageComponent {
65 @State isScrollerTop: boolean = false; 66 @State isScrollerTop: boolean = false;
66 @Provide duration: number = 0 67 @Provide duration: number = 0
67 @State executedStartTime: number = new Date().getTime() 68 @State executedStartTime: number = new Date().getTime()
  69 + action: Action = {} as Action
68 70
69 //watch监听页码回调 71 //watch监听页码回调
70 onCurrentPageNumUpdated(): void { 72 onCurrentPageNumUpdated(): void {
@@ -97,6 +99,12 @@ export struct MultiPictureDetailPageComponent { @@ -97,6 +99,12 @@ export struct MultiPictureDetailPageComponent {
97 // }) 99 // })
98 this.getDetail() 100 this.getDetail()
99 this.contentTrackingDict() 101 this.contentTrackingDict()
  102 +
  103 + if(this.action.params?.targetLayout == "comment"){
  104 + setTimeout(() => {
  105 + this.showCommentList = true
  106 + }, 1000)
  107 + }
100 } 108 }
101 109
102 contentTrackingDict() { 110 contentTrackingDict() {