developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
chenqs
df584660 1 parent 31683f4e

ref |> H5专题页面pageinfo数据来源调整为由H5提供

Inline Side-by-side
Showing 6 changed files with 176 additions and 136 deletions
@@ -24,7 +24,7 @@ interface dataObject { @@ -24,7 +24,7 @@ interface dataObject {
24 // 9、活动投稿 视频跳转 24 // 9、活动投稿 视频跳转
25 // 10、活动投稿 动态跳转 25 // 10、活动投稿 动态跳转
26 // 11、活动投稿 图集跳转 26 // 11、活动投稿 图集跳转
27 - dataSource: string 27 + dataSource: WDH5WebDataSource
28 operateType?: string 28 operateType?: string
29 webViewHeight?: string 29 webViewHeight?: string
30 dataJson?: string 30 dataJson?: string
@@ -68,4 +68,21 @@ export class Message { @@ -68,4 +68,21 @@ export class Message {
68 toList(jsonStr: string): Array<Message> { 68 toList(jsonStr: string): Array<Message> {
69 return JSON.parse(jsonStr) 69 return JSON.parse(jsonStr)
70 } 70 }
  71 +}
  72 +
  73 +export enum WDH5WebDataSource {
  74 +
  75 + WDH5WebDataSourceUnknown = 0,
  76 + WDH5WebDataSourceImageTextDetail = 1,
  77 + WDH5WebDataSourceContentInfo = 2,
  78 + WDH5WebDataSourcePictures = 3,
  79 + WDH5WebDataSourceTopicPageInfo = 4,
  80 + WDH5WebDataSourceCompPositionData = 5,
  81 + WDH5WebDataSourceArticleRefDataJump = 6,
  82 + WDH5WebDataSourceSharePosterListDatas = 7,
  83 +
  84 + WDH5WebDataSourcePartinActivityPublishArticle = 8,
  85 + WDH5WebDataSourcePartinActivityPublishVideo = 9,
  86 + WDH5WebDataSourcePartinActivityPublishDynamic = 10,
  87 + WDH5WebDataSourcePartinActivityPublishPicture = 11,
71 } 88 }
@@ -5,7 +5,8 @@ import { setDefaultNativeWebSettings } from './WebComponentUtil'; @@ -5,7 +5,8 @@ import { setDefaultNativeWebSettings } from './WebComponentUtil';
5 import { Action } from 'wdBean'; 5 import { Action } from 'wdBean';
6 import { performJSCallNative } from './JsBridgeBiz'; 6 import { performJSCallNative } from './JsBridgeBiz';
7 import { H5CallNativeType } from './H5CallNativeType'; 7 import { H5CallNativeType } from './H5CallNativeType';
8 -import { Message } from 'wdJsBridge/src/main/ets/bean/Message'; 8 +import { Message,WDH5WebDataSource } from 'wdJsBridge/src/main/ets/bean/Message';
  9 +import { JSON } from '@kit.ArkTS';
9 10
10 const TAG = 'WdWebComponent'; 11 const TAG = 'WdWebComponent';
11 12
@@ -14,6 +15,9 @@ export struct WdWebComponent { @@ -14,6 +15,9 @@ export struct WdWebComponent {
14 webviewControl: BridgeWebViewControl = new BridgeWebViewControl() 15 webviewControl: BridgeWebViewControl = new BridgeWebViewControl()
15 onWebPrepared: () => void = () => { 16 onWebPrepared: () => void = () => {
16 } 17 }
  18 + receiveH5SendToNativeData: (dataString:string | undefined) => void = () =>{
  19 +
  20 + }
17 @Prop webUrl: string = '' 21 @Prop webUrl: string = ''
18 @Prop @Watch('onReloadStateChanged') reload: number = 0 22 @Prop @Watch('onReloadStateChanged') reload: number = 0
19 @Link isPageEnd: boolean 23 @Link isPageEnd: boolean
@@ -61,15 +65,25 @@ export struct WdWebComponent { @@ -61,15 +65,25 @@ export struct WdWebComponent {
61 * 默认【CallNative】逻辑处理 65 * 默认【CallNative】逻辑处理
62 */ 66 */
63 private defaultPerformJSCallNative: (data: Message, f: Callback) => void = (data: Message, f: Callback) => { 67 private defaultPerformJSCallNative: (data: Message, f: Callback) => void = (data: Message, f: Callback) => {
  68 + // H5内部跳转逻辑（前端调用原生的js方法处理）
64 performJSCallNative(data, f) 69 performJSCallNative(data, f)
65 } 70 }
66 71
67 /** 72 /**
  73 + * 获取前端返回的数据
68 */ 74 */
69 private defaultGetReceiveSubjectData: (data: Message, f: Callback) => void = (data: Message, f: Callback) => { 75 private defaultGetReceiveSubjectData: (data: Message, f: Callback) => void = (data: Message, f: Callback) => {
70 if(data.handlerName === H5CallNativeType.jsCall_receiveSubjectData) { 76 if(data.handlerName === H5CallNativeType.jsCall_receiveSubjectData) {
71 f('') 77 f('')
  78 + return
72 } 79 }
  80 + if (data.handlerName === H5CallNativeType.jsCall_receiveH5Data) {
  81 + if (data.data?.dataSource === WDH5WebDataSource.WDH5WebDataSourceTopicPageInfo) {
  82 + this.receiveH5SendToNativeData(data.data?.dataJson)
  83 + return
  84 + }
  85 + }
  86 +
73 } 87 }
74 onPageBegin: (url?: string) => void = () => { 88 onPageBegin: (url?: string) => void = () => {
75 Logger.debug(TAG, 'onPageBegin'); 89 Logger.debug(TAG, 'onPageBegin');
@@ -175,6 +175,7 @@ export { MasterDetailRes } from './src/main/ets/bean/user/MasterDetailRes'; @@ -175,6 +175,7 @@ export { MasterDetailRes } from './src/main/ets/bean/user/MasterDetailRes';
175 export { ReserveItemBean } from './src/main/ets/bean/live/ReserveItemBean'; 175 export { ReserveItemBean } from './src/main/ets/bean/live/ReserveItemBean';
176 export { PageTrackBean } from './src/main/ets/bean/component/PageTrackBean'; 176 export { PageTrackBean } from './src/main/ets/bean/component/PageTrackBean';
177 177
  178 +export { TopicDetailData,GroupItem } from './src/main/ets/bean/content/TopicDetailData'
178 179
179 180
180 export { FeedbackTypeBean } from './src/main/ets/bean/detail/FeedbackTypeBean'; 181 export { FeedbackTypeBean } from './src/main/ets/bean/detail/FeedbackTypeBean';
  1 +import { TopicInfo } from '../morningevening/TopicInfo';
  2 +import { ArrayList } from '@kit.ArkTS';
  3 +
  4 +export interface GroupItem {
  5 + id: number;
  6 + blockDesc: string;
  7 + groupStrategy: number;
  8 + itemNum: number;
  9 + showType: number;
  10 + sortValue: number;
  11 +}
  12 +
  13 +export interface TopicDetailData {
  14 + backIconUrl: string;
  15 + shareSummary: string;
  16 + id: number;
  17 + baselineCopywriting: string;
  18 + cornersAdv: string;
  19 + backgroundImgUrl: string;
  20 + description: string;
  21 + imgSize: string;
  22 + pageTopType: number;
  23 + pushupLogoImgUrl: string;
  24 + backgroundColor: string;
  25 + shareCoverUrl: string;
  26 + shareName: string;
  27 + mainLogoImgUrl: string;
  28 + titleColor: string;
  29 + baselineShow: number;
  30 + pageType: number;
  31 + shareIconUrl: string;
  32 + shareUrl: string;
  33 + name: string;
  34 + hasAdInfo: number;
  35 + hasPopUp: number;
  36 + statusBarColor: string;
  37 + templateType: number;
  38 + topicInfo: TopicInfo;
  39 + baselineColor: string;
  40 + groups: ArrayList<GroupItem>;
  41 +}
1 -import { Action, H5ReceiveDetailBean, ContentDetailDTO, InteractDataDTO, TopicInfo } from 'wdBean'; 1 +import { Action, H5ReceiveDetailBean, ContentDetailDTO, InteractDataDTO, TopicInfo,TopicDetailData,ShareInfoDTO } from 'wdBean';
2 import { WdWebComponent } from 'wdWebComponent'; 2 import { WdWebComponent } from 'wdWebComponent';
3 import { CommonConstants } from 'wdConstant' 3 import { CommonConstants } from 'wdConstant'
4 import { BridgeWebViewControl } from 'wdJsBridge/Index'; 4 import { BridgeWebViewControl } from 'wdJsBridge/Index';
@@ -7,7 +7,7 @@ import { OperRowListView } from './view/OperRowListView'; @@ -7,7 +7,7 @@ import { OperRowListView } from './view/OperRowListView';
7 import DetailViewModel from '../viewmodel/DetailViewModel'; 7 import DetailViewModel from '../viewmodel/DetailViewModel';
8 import { publishCommentModel } from '../components/comment/model/PublishCommentModel'; 8 import { publishCommentModel } from '../components/comment/model/PublishCommentModel';
9 import { EmptyComponent } from '../components/view/EmptyComponent'; 9 import { EmptyComponent } from '../components/view/EmptyComponent';
10 -import { NetworkUtil, WindowModel } from 'wdKit'; 10 +import { NetworkUtil, WindowModel,Logger } from 'wdKit';
11 import { viewBlogItemInsightIntentShare } from '../utils/InsightIntentShare' 11 import { viewBlogItemInsightIntentShare } from '../utils/InsightIntentShare'
12 import { common } from '@kit.AbilityKit'; 12 import { common } from '@kit.AbilityKit';
13 import { PageRepository } from '../repository/PageRepository'; 13 import { PageRepository } from '../repository/PageRepository';
@@ -34,7 +34,7 @@ export struct SpacialTopicPageComponent { @@ -34,7 +34,7 @@ export struct SpacialTopicPageComponent {
34 @Provide contentDetailData: ContentDetailDTO = {} as ContentDetailDTO 34 @Provide contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
35 private h5ReceiveAppData: H5ReceiveDetailBean = { dataSource: '2' } as H5ReceiveDetailBean 35 private h5ReceiveAppData: H5ReceiveDetailBean = { dataSource: '2' } as H5ReceiveDetailBean
36 private webPrepared = false; 36 private webPrepared = false;
37 - private dataPrepared = false; 37 + // private dataPrepared = false;
38 @State publishCommentModel: publishCommentModel = new publishCommentModel() 38 @State publishCommentModel: publishCommentModel = new publishCommentModel()
39 @State operationButtonList: string[] = ['comment', 'collect', 'share'] 39 @State operationButtonList: string[] = ['comment', 'collect', 'share']
40 @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0 40 @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
@@ -42,9 +42,12 @@ export struct SpacialTopicPageComponent { @@ -42,9 +42,12 @@ export struct SpacialTopicPageComponent {
42 @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0 42 @Provide topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
43 @State showComment: boolean = false 43 @State showComment: boolean = false
44 @State topicInfo: TopicInfo = {} as TopicInfo 44 @State topicInfo: TopicInfo = {} as TopicInfo
  45 + @State topicDetail: TopicDetailData = {} as TopicDetailData
  46 + @State shareInfo: ShareInfoDTO = {} as ShareInfoDTO
  47 + @State showBottomView: boolean = false;
45 48
46 private trySendData2H5() { 49 private trySendData2H5() {
47 - if (!this.webPrepared || !this.dataPrepared) { 50 + if (!this.webPrepared) {
48 return 51 return
49 } 52 }
50 // 数据、web组件，都准备好了，开始塞详情数据 53 // 数据、web组件，都准备好了，开始塞详情数据
@@ -57,133 +60,93 @@ export struct SpacialTopicPageComponent { @@ -57,133 +60,93 @@ export struct SpacialTopicPageComponent {
57 } 60 }
58 61
59 private sendContentData2H5(h5ReceiveAppData: H5ReceiveDetailBean) { 62 private sendContentData2H5(h5ReceiveAppData: H5ReceiveDetailBean) {
  63 + Logger.debug('SpacialTopicPageComponent', 'jsCall_receiveAppData',JSON.stringify(h5ReceiveAppData));
60 this.webviewControl.callHandle(NativeCallH5Type.jsCall_receiveAppData, 64 this.webviewControl.callHandle(NativeCallH5Type.jsCall_receiveAppData,
61 JSON.stringify(h5ReceiveAppData), (data: string) => { 65 JSON.stringify(h5ReceiveAppData), (data: string) => {
  66 + Logger.debug('SpacialTopicPageComponent', "from js data = " + data);
62 }) 67 })
63 } 68 }
64 69
65 - //意图上报  
66 - private viewBlogInsightIntentShare(){  
67 - let context = getContext(this) as common.UIAbilityContext;  
68 - viewBlogItemInsightIntentShare(context,this.contentDetailData)  
69 - }  
70 - async getWebviewPageData (){  
71 - let pageId = this.action.params?.extra?.pageId  
72 - let relId: string = ''  
73 - let relType: string = ''  
74 - let contentId: string = ''  
75 - if (this.action && this.action.params) {  
76 - if (this.action.params.contentID) {  
77 - contentId = this.action.params.contentID;  
78 - }  
79 - if (this.action && this.action.params && this.action.params.extra) {  
80 - if (this.action.params.extra.relId) {  
81 - relId = this.action.params.extra.relId;  
82 - }  
83 - if (this.action.params.extra.relType) {  
84 - relType = this.action.params.extra.relType  
85 - }  
86 - }  
87 - }  
88 - if(pageId){  
89 - // let pageInfoMsg = await PageRepository.fetchMorningEveningPageInfo(pageId)  
90 - // let pageCompInfoMsg = await PageRepository.fetchMorningEveningCompInfo(Number(pageId), groupId, refreshTime, topicId, 1, 20)  
91 - // let res = {  
92 - // dataJson: {  
93 - // pageInfoResponseMap: pageInfoMsg,  
94 - // compInfoResponseMap: pageCompInfoMsg,  
95 - // },  
96 - // } 70 + private receiveH5SendToNativeData(dataString:string | undefined) {
  71 + // this.topicDetail = JSON.parse(dataString);
  72 + if (dataString == undefined) {
  73 + return
97 } 74 }
98 - } 75 + Logger.debug('SpacialTopicPageComponent111',dataString);
99 76
  77 + this.topicDetail = JSON.parse(dataString);
  78 + this.topicInfo = this.topicDetail.topicInfo;
100 79
101 - private async getDetail() {  
102 - this.isNetConnected = NetworkUtil.isNetConnected()  
103 - let contentId: string = ''  
104 - let relId: string = ''  
105 - let relType: string = ''  
106 - if (this.action && this.action.params) {  
107 - if (this.action.params.contentID) {  
108 - contentId = this.action.params.contentID;  
109 - }  
110 - if (this.action && this.action.params && this.action.params.extra) {  
111 - if (this.action.params.extra.relId) {  
112 - relId = this.action.params.extra.relId;  
113 - }  
114 - if (this.action.params.extra.relType) {  
115 - relType = this.action.params.extra.relType 80 + if(this.topicInfo){
  81 + // 转换详情数据
  82 + this.contentDetailData.openComment = Number(this.topicInfo.commentFlag)
  83 + this.contentDetailData.commentDisplay = Number(this.topicInfo.commentShowFlag)
  84 + this.contentDetailData.newsId = Number(this.topicInfo.topicId)
  85 + this.contentDetailData.newsType = this.topicInfo.topicType
  86 + this.contentDetailData.newsTitle = this.topicInfo.title;
  87 + this.contentDetailData.newsType = this.topicInfo.topicType;
  88 + this.contentDetailData.visitorComment = this.topicInfo.visitorComment;
  89 +
  90 + //转换分享数据
  91 + this.shareInfo.shareCoverUrl = this.topicInfo.shareCoverUrl
  92 + this.shareInfo.shareOpen = this.topicInfo.shareOpen
  93 + this.shareInfo.sharePosterCoverUrl = this.topicInfo.sharePosterCoverUrl
  94 + this.shareInfo.shareSummary = this.topicInfo.shareSummary
  95 + this.shareInfo.shareTitle = this.topicInfo.shareTitle
  96 + this.shareInfo.shareUrl = this.topicInfo.shareUrl
  97 + this.contentDetailData.shareInfo = this.shareInfo
  98 +
  99 + console.log('contentDetailData111', JSON.stringify(this.contentDetailData))
  100 + if(this.topicInfo.shareOpen === 1){
  101 + if (!this.operationButtonList.includes('share')) {
  102 + this.operationButtonList.push('share');
116 } 103 }
  104 + } else {
  105 + this.operationButtonList = this.operationButtonList.filter(e =>e !== 'share')
117 } 106 }
118 - let pageId = this.action.params.extra?.pageId  
119 - console.log('pageIdpageId',pageId)  
120 - if(pageId){  
121 - let pageInfoMsg = await PageRepository.fetchMorningEveningPageInfo(pageId,contentId)  
122 - let detailBeans = await DetailViewModel.getDetailPageData(relId, contentId, relType)  
123 - if (detailBeans?.length > 0) {  
124 - this.contentDetailData = JSON.parse(JSON.stringify(detailBeans[0]));  
125 - this.viewBlogInsightIntentShare()  
126 - // if (this.contentDetailData[0]?.openComment) {  
127 - this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')  
128 - this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId || '')  
129 - this.publishCommentModel.targetTitle = this.contentDetailData?.newsTitle  
130 - this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType || '')  
131 - this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId || '')  
132 - this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle || '')  
133 - this.publishCommentModel.targetType = String(this.contentDetailData?.newsType || '')  
134 - this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')  
135 -  
136 - // }  
137 - this.subjectData = 'dasdasdadas'  
138 -  
139 - //TODO  
140 - // this.trySendData2H5()  
141 - }  
142 - if(pageInfoMsg && pageInfoMsg.data){  
143 - this.contentDetailData.openComment = Number(pageInfoMsg.data.topicInfo?.commentFlag)  
144 - this.contentDetailData.commentDisplay = Number(pageInfoMsg.data.topicInfo?.commentShowFlag)  
145 - console.log('contentDetailData pageInfoMsg.data', JSON.stringify(pageInfoMsg.data))  
146 - this.topicInfo = pageInfoMsg.data.topicInfo  
147 - this.contentDetailData.newsId = Number(this.topicInfo.topicId)  
148 - this.contentDetailData.newsType = this.topicInfo.topicType  
149 - if(this.topicInfo?.shareOpen === 1){  
150 - this.contentDetailData.shareInfo.shareOpen = this.topicInfo?.shareOpen  
151 - console.log('contentDetailData this.topicInfo', JSON.stringify(this.topicInfo))  
152 - if (!this.operationButtonList.includes('share')) {  
153 - this.operationButtonList.push('share');  
154 - }  
155 - } else {  
156 - this.operationButtonList = this.operationButtonList.filter(e =>e !== 'share')  
157 - }  
158 - }  
159 107
160 - console.log('contentDetailData', JSON.stringify(this.contentDetailData))  
161 - } 108 + // 转换评论数据
  109 + this.publishCommentModel.targetId = String(this.contentDetailData?.newsId || '')
  110 + this.publishCommentModel.targetRelId = String(this.contentDetailData?.reLInfo?.relId || '')
  111 + this.publishCommentModel.targetTitle = this.contentDetailData?.newsTitle
  112 + this.publishCommentModel.targetRelType = String(this.contentDetailData?.reLInfo?.relType || '')
  113 + this.publishCommentModel.targetRelObjectId = String(this.contentDetailData?.reLInfo?.relObjectId || '')
  114 + this.publishCommentModel.keyArticle = String(this.contentDetailData?.keyArticle || '')
  115 + this.publishCommentModel.targetType = String(this.contentDetailData?.newsType || '')
  116 + this.publishCommentModel.visitorComment = String(this.contentDetailData?.visitorComment || '')
  117 + this.showBottomView = true
  118 +
162 } 119 }
  120 + // this.viewBlogInsightIntentShare();
  121 + }
  122 +
  123 + //意图上报
  124 + private viewBlogInsightIntentShare(){
  125 + let context = getContext(this) as common.UIAbilityContext;
  126 + viewBlogItemInsightIntentShare(context,this.contentDetailData)
163 } 127 }
164 128
165 build() { 129 build() {
166 Column() { 130 Column() {
167 Stack({ alignContent: Alignment.Bottom }) { 131 Stack({ alignContent: Alignment.Bottom }) {
168 Column() { 132 Column() {
169 - Text(this.contentDetailData?.newsTitle)  
170 - .backgroundColor(Color.White)  
171 - .width('100%')  
172 - .height(40)  
173 - .fontSize(18)  
174 - .textAlign(TextAlign.Center)  
175 - .fontWeight(500)  
176 - .visibility(this.action?.params?.backVisibility && this.isPageEnd ? Visibility.Visible : Visibility.None)  
177 - if(this.subjectData.length > 0){  
178 - WdWebComponent({  
179 - webviewControl: this.webviewControl,  
180 - webUrl: this.webUrl,  
181 - reload: this.reload,  
182 - onWebPrepared: this.onWebPrepared.bind(this),  
183 - isPageEnd: $isPageEnd,  
184 - subjectData: this.subjectData  
185 - })  
186 - } 133 + // Text(this.contentDetailData?.newsTitle)
  134 + // .backgroundColor(Color.White)
  135 + // .width('100%')
  136 + // .height(40)
  137 + // .fontSize(18)
  138 + // .textAlign(TextAlign.Center)
  139 + // .fontWeight(500)
  140 + // .visibility(this.action?.params?.backVisibility && this.isPageEnd ? Visibility.Visible : Visibility.None)
  141 +
  142 + WdWebComponent({
  143 + webviewControl: this.webviewControl,
  144 + webUrl: this.webUrl,
  145 + reload: this.reload,
  146 + onWebPrepared: this.onWebPrepared.bind(this),
  147 + isPageEnd: $isPageEnd,
  148 + receiveH5SendToNativeData: this.receiveH5SendToNativeData.bind(this)
  149 + })
187 } 150 }
188 .width(CommonConstants.FULL_WIDTH) 151 .width(CommonConstants.FULL_WIDTH)
189 .height(CommonConstants.FULL_HEIGHT) 152 .height(CommonConstants.FULL_HEIGHT)
@@ -194,7 +157,8 @@ export struct SpacialTopicPageComponent { @@ -194,7 +157,8 @@ export struct SpacialTopicPageComponent {
194 emptyType: 1, 157 emptyType: 1,
195 emptyButton: true, 158 emptyButton: true,
196 retry: () => { 159 retry: () => {
197 - this.getDetail() 160 + // this.getDetail()
  161 + this.reload ++
198 } 162 }
199 }).padding({ bottom: 200 }) 163 }).padding({ bottom: 200 })
200 } else { 164 } else {
@@ -203,24 +167,26 @@ export struct SpacialTopicPageComponent { @@ -203,24 +167,26 @@ export struct SpacialTopicPageComponent {
203 } 167 }
204 } 168 }
205 //底部交互区 169 //底部交互区
206 - OperRowListView({  
207 - contentDetailData: this.contentDetailData,  
208 - publishCommentModel: this.publishCommentModel,  
209 - operationButtonList: this.operationButtonList,  
210 - topicInfo: this.topicInfo,  
211 - styleType: 1,  
212 - onCommentIconClick:()=>{  
213 - this.showCommentList = true  
214 - }  
215 - })  
216 - //全部评论  
217 - CommentDialogView({  
218 - index: $index,  
219 - currentIndex: $currentIndex,  
220 - showCommentList: $showCommentList,  
221 - publishCommentModel: $publishCommentModel,  
222 - interactData: $interactData,  
223 - }).visibility(this.showComment?Visibility.Visible:Visibility.Hidden) 170 + if (this.showBottomView){
  171 + OperRowListView({
  172 + contentDetailData: this.contentDetailData,
  173 + publishCommentModel: this.publishCommentModel,
  174 + operationButtonList: this.operationButtonList,
  175 + topicInfo: this.topicInfo,
  176 + styleType: 1,
  177 + onCommentIconClick:()=>{
  178 + this.showCommentList = true
  179 + }
  180 + })
  181 + //全部评论
  182 + CommentDialogView({
  183 + index: $index,
  184 + currentIndex: $currentIndex,
  185 + showCommentList: $showCommentList,
  186 + publishCommentModel: $publishCommentModel,
  187 + interactData: $interactData,
  188 + }).visibility(this.showComment?Visibility.Visible:Visibility.Hidden)
  189 + }
224 } 190 }
225 }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT) 191 }.width(CommonConstants.FULL_WIDTH).height(CommonConstants.FULL_HEIGHT)
226 } 192 }
@@ -230,7 +196,8 @@ export struct SpacialTopicPageComponent { @@ -230,7 +196,8 @@ export struct SpacialTopicPageComponent {
230 // WindowModel.shared.setWindowLayoutFullScreen(true) 196 // WindowModel.shared.setWindowLayoutFullScreen(true)
231 } 197 }
232 this.webUrl = this.action?.params?.url || '' 198 this.webUrl = this.action?.params?.url || ''
233 - this.getDetail() 199 + this.isNetConnected = NetworkUtil.isNetConnected()
  200 + // this.getDetail()
234 } 201 }
235 202
236 aboutToDisappear() { 203 aboutToDisappear() {
@@ -312,7 +312,7 @@ export class PageRepository { @@ -312,7 +312,7 @@ export class PageRepository {
312 // 批量查询内容当前用户点赞、收藏状态 312 // 批量查询内容当前用户点赞、收藏状态
313 static fetchInteractDataStatus(param: object) { 313 static fetchInteractDataStatus(param: object) {
314 let url = PageRepository.getInteractDataStatusUrl() 314 let url = PageRepository.getInteractDataStatusUrl()
315 - return WDHttp.post<ResponseDTO<batchLikeAndCollectResult[]>>(url, param) 315 + return HttpBizUtil.post<ResponseDTO<batchLikeAndCollectResult[]>>(url, param)
316 }; 316 };
317 317
318 /** 318 /**