developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
wangliang_wd
76202b19 2 parents 7df2c546 d397a17b

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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix: 号主页全部、视频、下滑为号主视频，动态列表视频详情下滑为随机视频
  fix |> 20564 我的页面，鸿蒙展示的等级背景宽高比安卓小、用户昵称省略展示的方式与安卓不一致，安卓是省略号展示在中间
  fix |> 20566 鸿蒙我的评论列表中，所有的评论时间都是【刚刚】，没有展示出正确时间
  fix |> 19889 疑难-竖屏直播间，评论区顶部应是渐隐效果，见截图，参考安卓。
  fix: 视频详情页获取内容失败，请重试 文字颜色与安卓不一致，有点暗
  fix: 横屏视频详情页全屏播放后的标题文字样式去掉字重
  fix: 20507 设置仅wifi网络加载图片后关闭wifi，新闻频道信息流tab不加载图片，打开wifi后刷新频道列表未加载封面图，预期：加载封面图
  fix: 稿件详情查看图片详情，对图片上滑查看时暂时的页码数字不清楚，与背景色相近时，几乎看不见
  fix |> 桌面组件卡片--左图右文样式显示桌面卡片时未能显示红色的数字排序
  fix |> （文章配置使用外链），详情页顶部缺少标题；互动区不应显示语音播报按钮
  reef |> 统一调整评论输入框背景颜色问题
  fix: 第一次进入点击底部视频tab ，底部直播tab小红点未显示
  ref |> 修复缺陷 18836 功能缺陷-UI还原问题-4g网络环境，进入预约直播间，无预告时，提示如下“这是一个非wifi环境，请注意浏览消耗”，android 没有弹出此提示
  fix |> 20557 直播预告页面，直播简介信息过多时，鸿蒙不支持上滑，导致信息展示不完整
Inline Side-by-side
Showing 67 changed files with 322 additions and 193 deletions
@@ -21,6 +21,7 @@ import { TrackConstants, TrackingPageBrowse } from 'wdTracking/Index'; @@ -21,6 +21,7 @@ import { TrackConstants, TrackingPageBrowse } from 'wdTracking/Index';
21 import { LiveBigImage02Component } from './cardview/LiveBigImage02Component'; 21 import { LiveBigImage02Component } from './cardview/LiveBigImage02Component';
22 import { LiveBigImage01Component } from './cardview/LiveBigImage01Component'; 22 import { LiveBigImage01Component } from './cardview/LiveBigImage01Component';
23 import { behindDivider } from './cardCommon/behindDivider' 23 import { behindDivider } from './cardCommon/behindDivider'
  24 +import PageModel from '../viewmodel/PageModel';
24 25
25 /** 26 /**
26 * card适配器，卡片样式汇总，依据ContentDTO#appStyle 27 * card适配器，卡片样式汇总，依据ContentDTO#appStyle
@@ -28,6 +29,7 @@ import { behindDivider } from './cardCommon/behindDivider' @@ -28,6 +29,7 @@ import { behindDivider } from './cardCommon/behindDivider'
28 */ 29 */
29 @Component 30 @Component
30 export struct CardParser { 31 export struct CardParser {
  32 + @Prop private loadImg: boolean = true;
31 @State pageId: string = ''; 33 @State pageId: string = '';
32 @State pageName: string = ''; 34 @State pageName: string = '';
33 @State contentDTO: ContentDTO = new ContentDTO(); 35 @State contentDTO: ContentDTO = new ContentDTO();
@@ -92,7 +94,8 @@ export struct CardParser { @@ -92,7 +94,8 @@ export struct CardParser {
92 compDTO: this.compDTO, 94 compDTO: this.compDTO,
93 contentDTO, 95 contentDTO,
94 pageId: this.pageId, 96 pageId: this.pageId,
95 - pageName: this.pageName 97 + pageName: this.pageName,
  98 + loadImg: this.loadImg
96 }) 99 })
97 this.getBehindDivider() 100 this.getBehindDivider()
98 } else if (contentDTO.appStyle === CompStyle.Card_03) { 101 } else if (contentDTO.appStyle === CompStyle.Card_03) {
@@ -100,7 +103,7 @@ export struct CardParser { @@ -100,7 +103,7 @@ export struct CardParser {
100 compDTO: this.compDTO, 103 compDTO: this.compDTO,
101 contentDTO, 104 contentDTO,
102 pageId: this.pageId, 105 pageId: this.pageId,
103 - pageName: this.pageName 106 + pageName: this.pageName, loadImg: this.loadImg
104 }) 107 })
105 this.getBehindDivider() 108 this.getBehindDivider()
106 } else if (contentDTO.appStyle === CompStyle.Card_04) { 109 } else if (contentDTO.appStyle === CompStyle.Card_04) {
@@ -108,7 +111,7 @@ export struct CardParser { @@ -108,7 +111,7 @@ export struct CardParser {
108 compDTO: this.compDTO, 111 compDTO: this.compDTO,
109 contentDTO, 112 contentDTO,
110 pageId: this.pageId, 113 pageId: this.pageId,
111 - pageName: this.pageName 114 + pageName: this.pageName, loadImg: this.loadImg
112 }) 115 })
113 this.getBehindDivider() 116 this.getBehindDivider()
114 } else if (contentDTO.appStyle === CompStyle.Card_05) { 117 } else if (contentDTO.appStyle === CompStyle.Card_05) {
@@ -117,7 +120,7 @@ export struct CardParser { @@ -117,7 +120,7 @@ export struct CardParser {
117 contentDTO, 120 contentDTO,
118 titleShowPolicy: this.compDTO.titleShowPolicy, 121 titleShowPolicy: this.compDTO.titleShowPolicy,
119 pageId: this.pageId, 122 pageId: this.pageId,
120 - pageName: this.pageName 123 + pageName: this.pageName, loadImg: this.loadImg
121 }) 124 })
122 this.getBehindDivider() 125 this.getBehindDivider()
123 } else if (contentDTO.appStyle === CompStyle.Card_06 || contentDTO.appStyle === CompStyle.Card_13) { 126 } else if (contentDTO.appStyle === CompStyle.Card_06 || contentDTO.appStyle === CompStyle.Card_13) {
@@ -125,7 +128,7 @@ export struct CardParser { @@ -125,7 +128,7 @@ export struct CardParser {
125 compDTO: this.compDTO, 128 compDTO: this.compDTO,
126 contentDTO: this.contentDTO, 129 contentDTO: this.contentDTO,
127 pageId: this.pageId, 130 pageId: this.pageId,
128 - pageName: this.pageName 131 + pageName: this.pageName, loadImg: this.loadImg
129 }) 132 })
130 this.getBehindDivider() 133 this.getBehindDivider()
131 } else if (contentDTO.appStyle === CompStyle.Card_10 || contentDTO.appStyle === CompStyle.Card_09) { 134 } else if (contentDTO.appStyle === CompStyle.Card_10 || contentDTO.appStyle === CompStyle.Card_09) {
@@ -133,7 +136,7 @@ export struct CardParser { @@ -133,7 +136,7 @@ export struct CardParser {
133 compDTO: this.compDTO, 136 compDTO: this.compDTO,
134 contentDTO, 137 contentDTO,
135 pageId: this.pageId, 138 pageId: this.pageId,
136 - pageName: this.pageName 139 + pageName: this.pageName, loadImg: this.loadImg
137 }) 140 })
138 this.getBehindDivider() 141 this.getBehindDivider()
139 } else if (contentDTO.appStyle === CompStyle.Card_11) { 142 } else if (contentDTO.appStyle === CompStyle.Card_11) {
@@ -149,7 +152,8 @@ export struct CardParser { @@ -149,7 +152,8 @@ export struct CardParser {
149 compDTO: this.compDTO, 152 compDTO: this.compDTO,
150 contentDTO, 153 contentDTO,
151 pageId: this.pageId, 154 pageId: this.pageId,
152 - pageName: this.pageName 155 + pageName: this.pageName, loadImg: this.loadImg
  156 +
153 }) 157 })
154 this.getBehindDivider() 158 this.getBehindDivider()
155 } else if (contentDTO.appStyle === CompStyle.Card_14) { 159 } else if (contentDTO.appStyle === CompStyle.Card_14) {
@@ -157,7 +161,7 @@ export struct CardParser { @@ -157,7 +161,7 @@ export struct CardParser {
157 contentDTO, 161 contentDTO,
158 compDTO: this.compDTO, 162 compDTO: this.compDTO,
159 pageId: this.pageId, 163 pageId: this.pageId,
160 - pageName: this.pageName 164 + pageName: this.pageName, loadImg: this.loadImg
161 }) 165 })
162 this.getBehindDivider() 166 this.getBehindDivider()
163 } else if (contentDTO.appStyle === CompStyle.Card_15) { 167 } else if (contentDTO.appStyle === CompStyle.Card_15) {
@@ -165,7 +169,7 @@ export struct CardParser { @@ -165,7 +169,7 @@ export struct CardParser {
165 contentDTO, 169 contentDTO,
166 compDTO: this.compDTO, 170 compDTO: this.compDTO,
167 pageId: this.pageId, 171 pageId: this.pageId,
168 - pageName: this.pageName 172 + pageName: this.pageName, loadImg: this.loadImg
169 }) 173 })
170 this.getBehindDivider() 174 this.getBehindDivider()
171 } else if (contentDTO.appStyle === CompStyle.Card_16) { 175 } else if (contentDTO.appStyle === CompStyle.Card_16) {
@@ -173,7 +177,7 @@ export struct CardParser { @@ -173,7 +177,7 @@ export struct CardParser {
173 contentDTO, 177 contentDTO,
174 compDTO: this.compDTO, 178 compDTO: this.compDTO,
175 pageId: this.pageId, 179 pageId: this.pageId,
176 - pageName: this.pageName 180 + pageName: this.pageName, loadImg: this.loadImg
177 }) 181 })
178 this.getBehindDivider() 182 this.getBehindDivider()
179 } else if (contentDTO.appStyle === CompStyle.Card_17) { 183 } else if (contentDTO.appStyle === CompStyle.Card_17) {
@@ -181,7 +185,7 @@ export struct CardParser { @@ -181,7 +185,7 @@ export struct CardParser {
181 compDTO: this.compDTO, 185 compDTO: this.compDTO,
182 contentDTO, 186 contentDTO,
183 pageId: this.pageId, 187 pageId: this.pageId,
184 - pageName: this.pageName 188 + pageName: this.pageName, loadImg: this.loadImg
185 }) 189 })
186 this.getBehindDivider() 190 this.getBehindDivider()
187 } else if (contentDTO.appStyle === CompStyle.Card_19) { 191 } else if (contentDTO.appStyle === CompStyle.Card_19) {
@@ -190,7 +194,7 @@ export struct CardParser { @@ -190,7 +194,7 @@ export struct CardParser {
190 compDTO: this.compDTO, 194 compDTO: this.compDTO,
191 pageId: this.pageId, 195 pageId: this.pageId,
192 pageName: this.pageName, 196 pageName: this.pageName,
193 - isPeopleShipHome:this.isPeopleShipHome 197 + isPeopleShipHome:this.isPeopleShipHome, loadImg: this.loadImg
194 }) 198 })
195 this.getBehindDivider() 199 this.getBehindDivider()
196 } else if (contentDTO.appStyle === CompStyle.Card_20) { 200 } else if (contentDTO.appStyle === CompStyle.Card_20) {
@@ -199,7 +203,7 @@ export struct CardParser { @@ -199,7 +203,7 @@ export struct CardParser {
199 compDTO: this.compDTO, 203 compDTO: this.compDTO,
200 pageId: this.pageId, 204 pageId: this.pageId,
201 pageName: this.pageName, 205 pageName: this.pageName,
202 - isPeopleShipHome:this.isPeopleShipHome 206 + isPeopleShipHome:this.isPeopleShipHome, loadImg: this.loadImg
203 }) 207 })
204 this.getBehindDivider() 208 this.getBehindDivider()
205 } else if (contentDTO.appStyle === CompStyle.Card_21) { 209 } else if (contentDTO.appStyle === CompStyle.Card_21) {
@@ -207,7 +211,7 @@ export struct CardParser { @@ -207,7 +211,7 @@ export struct CardParser {
207 contentDTO, 211 contentDTO,
208 compDTO: this.compDTO, 212 compDTO: this.compDTO,
209 pageId: this.pageId, 213 pageId: this.pageId,
210 - pageName: this.pageName 214 + pageName: this.pageName, loadImg: this.loadImg
211 }) 215 })
212 this.getBehindDivider() 216 this.getBehindDivider()
213 } else if (contentDTO.appStyle === CompStyle.Card_Comp_Live_Big_Image_01) { 217 } else if (contentDTO.appStyle === CompStyle.Card_Comp_Live_Big_Image_01) {
@@ -216,7 +220,7 @@ export struct CardParser { @@ -216,7 +220,7 @@ export struct CardParser {
216 compDTO: this.compDTO, 220 compDTO: this.compDTO,
217 pageId: this.pageId, 221 pageId: this.pageId,
218 pageName: this.pageName, 222 pageName: this.pageName,
219 - index: this.compIndex 223 + index: this.compIndex, loadImg: this.loadImg
220 }) 224 })
221 this.getBehindDivider() 225 this.getBehindDivider()
222 } else if (contentDTO.appStyle === CompStyle.Card_Comp_Live_Big_Image_02) { 226 } else if (contentDTO.appStyle === CompStyle.Card_Comp_Live_Big_Image_02) {
@@ -225,7 +229,7 @@ export struct CardParser { @@ -225,7 +229,7 @@ export struct CardParser {
225 compDTO: this.compDTO, 229 compDTO: this.compDTO,
226 pageId: this.pageId, 230 pageId: this.pageId,
227 pageName: this.pageName, 231 pageName: this.pageName,
228 - index:this.compIndex 232 + index:this.compIndex, loadImg: this.loadImg
229 }) 233 })
230 this.getBehindDivider() 234 this.getBehindDivider()
231 } else { 235 } else {
@@ -118,13 +118,13 @@ export struct CompParser { @@ -118,13 +118,13 @@ export struct CompParser {
118 this.getBehindDivider() 118 this.getBehindDivider()
119 } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) { 119 } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
120 if (this.compDTO.operDataList.length > this.audioItems.length) { 120 if (this.compDTO.operDataList.length > this.audioItems.length) {
121 - ZhCarouselLayout01({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) 121 + ZhCarouselLayout01({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
122 } 122 }
123 this.getBehindDivider() 123 this.getBehindDivider()
124 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && 124 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 &&
125 this.compDTO.imageScale === 2) { // && compDTO.name ==="横划卡" 125 this.compDTO.imageScale === 2) { // && compDTO.name ==="横划卡"
126 // Text('LiveHorizontalCardComponent') 126 // Text('LiveHorizontalCardComponent')
127 - LiveHorizontalCardComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) 127 + LiveHorizontalCardComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
128 this.getBehindDivider() 128 this.getBehindDivider()
129 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && this.compDTO.imageScale === 3) { 129 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && this.compDTO.imageScale === 3) {
130 if (this.compDTO.operDataList.length > 1) { 130 if (this.compDTO.operDataList.length > 1) {
@@ -132,22 +132,22 @@ export struct CompParser { @@ -132,22 +132,22 @@ export struct CompParser {
132 HorizontalStrokeCardThreeTwoRadioForMoreComponent({ 132 HorizontalStrokeCardThreeTwoRadioForMoreComponent({
133 compDTO: this.compDTO, 133 compDTO: this.compDTO,
134 pageId: this.pageId, 134 pageId: this.pageId,
135 - pageName: this.pageName 135 + pageName: this.pageName, loadImg: this.pageModel.loadImg
136 }) 136 })
137 } else { 137 } else {
138 // Text('HorizontalStrokeCardThreeTwoRadioForOneComponent') 138 // Text('HorizontalStrokeCardThreeTwoRadioForOneComponent')
139 HorizontalStrokeCardThreeTwoRadioForOneComponent({ 139 HorizontalStrokeCardThreeTwoRadioForOneComponent({
140 compDTO: this.compDTO, 140 compDTO: this.compDTO,
141 pageId: this.pageId, 141 pageId: this.pageId,
142 - pageName: this.pageName 142 + pageName: this.pageName, loadImg: this.pageModel.loadImg
143 }) 143 })
144 } 144 }
145 this.getBehindDivider() 145 this.getBehindDivider()
146 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) { 146 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) {
147 - ZhSingleRow02({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) 147 + ZhSingleRow02({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
148 this.getBehindDivider() 148 this.getBehindDivider()
149 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) { 149 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
150 - ZhSingleRow03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) 150 + ZhSingleRow03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
151 this.getBehindDivider() 151 this.getBehindDivider()
152 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题 152 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题
153 //ZhGridLayout02({ compDTO: this.compDTO }) 153 //ZhGridLayout02({ compDTO: this.compDTO })
@@ -159,20 +159,20 @@ export struct CompParser { @@ -159,20 +159,20 @@ export struct CompParser {
159 compDTO: this.compDTO, 159 compDTO: this.compDTO,
160 operDataList: this.compDTO.operDataList, 160 operDataList: this.compDTO.operDataList,
161 pageId: this.pageId, 161 pageId: this.pageId,
162 - pageName: this.pageName 162 + pageName: this.pageName, loadImg: this.pageModel.loadImg
163 }) 163 })
164 // this.getBehindDivider() 164 // this.getBehindDivider()
165 165
166 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) { 166 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
167 - ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) 167 + ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
168 this.getBehindDivider() 168 this.getBehindDivider()
169 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) { 169 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
170 - ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) 170 + ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
171 this.getBehindDivider() 171 this.getBehindDivider()
172 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) { 172 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
173 // ZhSingleRow05({ compDTO }) 173 // ZhSingleRow05({ compDTO })
174 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) { 174 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) {
175 - ZhSingleRow06({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) 175 + ZhSingleRow06({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
176 this.getBehindDivider() 176 this.getBehindDivider()
177 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) { 177 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
178 //头图卡 和comStyle 2相同， 178 //头图卡 和comStyle 2相同，
@@ -181,7 +181,8 @@ export struct CompParser { @@ -181,7 +181,8 @@ export struct CompParser {
181 contentDTO: this.compDTO.operDataList[0], 181 contentDTO: this.compDTO.operDataList[0],
182 titleShowPolicy: this.compDTO.titleShowPolicy, 182 titleShowPolicy: this.compDTO.titleShowPolicy,
183 pageId: this.pageId, 183 pageId: this.pageId,
184 - pageName: this.pageName 184 + pageName: this.pageName,
  185 + loadImg: this.pageModel.loadImg
185 }) 186 })
186 this.getBehindDivider() 187 this.getBehindDivider()
187 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) { 188 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) {
@@ -190,7 +191,8 @@ export struct CompParser { @@ -190,7 +191,8 @@ export struct CompParser {
190 compDTO: this.compDTO, 191 compDTO: this.compDTO,
191 contentDTO: this.compDTO.operDataList[0], 192 contentDTO: this.compDTO.operDataList[0],
192 pageId: this.pageId, 193 pageId: this.pageId,
193 - pageName: this.pageName 194 + pageName: this.pageName,
  195 + loadImg: this.pageModel.loadImg
194 }) 196 })
195 this.getBehindDivider() 197 this.getBehindDivider()
196 } else if (this.compDTO.compStyle === CompStyle.Card_09) { 198 } else if (this.compDTO.compStyle === CompStyle.Card_09) {
@@ -199,7 +201,7 @@ export struct CompParser { @@ -199,7 +201,7 @@ export struct CompParser {
199 compDTO: this.compDTO, 201 compDTO: this.compDTO,
200 contentDTO: this.compDTO.operDataList[0], 202 contentDTO: this.compDTO.operDataList[0],
201 pageId: this.pageId, 203 pageId: this.pageId,
202 - pageName: this.pageName 204 + pageName: this.pageName, loadImg: this.pageModel.loadImg
203 }) 205 })
204 this.getBehindDivider() 206 this.getBehindDivider()
205 } else if (this.compDTO.compStyle === CompStyle.Card_13) { 207 } else if (this.compDTO.compStyle === CompStyle.Card_13) {
@@ -207,7 +209,7 @@ export struct CompParser { @@ -207,7 +209,7 @@ export struct CompParser {
207 compDTO: this.compDTO, 209 compDTO: this.compDTO,
208 contentDTO: this.compDTO.operDataList[0], 210 contentDTO: this.compDTO.operDataList[0],
209 pageId: this.pageId, 211 pageId: this.pageId,
210 - pageName: this.pageName 212 + pageName: this.pageName, loadImg: this.pageModel.loadImg
211 }) 213 })
212 this.getBehindDivider() 214 this.getBehindDivider()
213 } else if (this.compDTO.compStyle === CompStyle.Card_03) { 215 } else if (this.compDTO.compStyle === CompStyle.Card_03) {
@@ -215,7 +217,7 @@ export struct CompParser { @@ -215,7 +217,7 @@ export struct CompParser {
215 compDTO: this.compDTO, 217 compDTO: this.compDTO,
216 contentDTO: this.compDTO.operDataList[0], 218 contentDTO: this.compDTO.operDataList[0],
217 pageId: this.pageId, 219 pageId: this.pageId,
218 - pageName: this.pageName 220 + pageName: this.pageName, loadImg: this.pageModel.loadImg
219 }) 221 })
220 this.getBehindDivider() 222 this.getBehindDivider()
221 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) { 223 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
@@ -224,7 +226,7 @@ export struct CompParser { @@ -224,7 +226,7 @@ export struct CompParser {
224 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) { 226 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) {
225 // ZhSingleColumn05({ compDTO: compDTO }) 227 // ZhSingleColumn05({ compDTO: compDTO })
226 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) { 228 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) {
227 - ZhSingleColumn09({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, pageModel: this.pageModel, compIndex: this.compIndex }) 229 + ZhSingleColumn09({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, pageModel: this.pageModel, compIndex: this.compIndex, loadImg: this.pageModel.loadImg })
228 this.getBehindDivider() 230 this.getBehindDivider()
229 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告 231 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告
230 AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO }) 232 AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO })
@@ -237,7 +239,8 @@ export struct CompParser { @@ -237,7 +239,8 @@ export struct CompParser {
237 pageId: this.pageId, 239 pageId: this.pageId,
238 pageName: this.pageName, 240 pageName: this.pageName,
239 compIndex: this.compIndex, 241 compIndex: this.compIndex,
240 - nextCompDTO: this.nextCompDTO 242 + nextCompDTO: this.nextCompDTO,
  243 + loadImg: this.pageModel.loadImg
241 }); 244 });
242 } else { 245 } else {
243 // Text(this.compDTO.compStyle) 246 // Text(this.compDTO.compStyle)
@@ -1032,7 +1032,7 @@ export struct DynamicDetailComponent { @@ -1032,7 +1032,7 @@ export struct DynamicDetailComponent {
1032 @Component 1032 @Component
1033 struct createImg { 1033 struct createImg {
1034 @State fullColumnImgUrls: PhotoListBean[] = [] 1034 @State fullColumnImgUrls: PhotoListBean[] = []
1035 - @State loadImg: boolean = false; 1035 + @Prop loadImg: boolean = true;
1036 @State onePicW: number = 0; // 只有一张图时候图片的宽度 1036 @State onePicW: number = 0; // 只有一张图时候图片的宽度
1037 @State onePicH: number = 0; // 只有一张图时候图片的高度 1037 @State onePicH: number = 0; // 只有一张图时候图片的高度
1038 1038
@@ -1042,7 +1042,7 @@ struct createImg { @@ -1042,7 +1042,7 @@ struct createImg {
1042 picPath: '' 1042 picPath: ''
1043 } as PhotoListBean) 1043 } as PhotoListBean)
1044 } 1044 }
1045 - this.loadImg = await onlyWifiLoadImg(); 1045 + // this.loadImg = await onlyWifiLoadImg();
1046 console.log('card19-this.fullColumnImgUrls',JSON.stringify(this.fullColumnImgUrls)) 1046 console.log('card19-this.fullColumnImgUrls',JSON.stringify(this.fullColumnImgUrls))
1047 } 1047 }
1048 1048
@@ -42,7 +42,7 @@ export struct H5NewsWebPageComponent { @@ -42,7 +42,7 @@ export struct H5NewsWebPageComponent {
42 action: Action = {} as Action 42 action: Action = {} as Action
43 @State webUrl: string = ''; 43 @State webUrl: string = '';
44 @Provide contentDetailData: ContentDetailDTO = {} as ContentDetailDTO 44 @Provide contentDetailData: ContentDetailDTO = {} as ContentDetailDTO
45 - @State recommendList: ContentDTO[] = [] 45 + // @State recommendList: ContentDTO[] = []
46 @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态 46 @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
47 @State interactData: InteractDataDTO = {} as InteractDataDTO 47 @State interactData: InteractDataDTO = {} as InteractDataDTO
48 @State isPageEnd: boolean = false 48 @State isPageEnd: boolean = false
@@ -58,7 +58,7 @@ export struct H5NewsWebPageComponent { @@ -58,7 +58,7 @@ export struct H5NewsWebPageComponent {
58 @State showCommentList: boolean = false 58 @State showCommentList: boolean = false
59 @State index: number = 0 59 @State index: number = 0
60 @State currentIndex: number = 0 60 @State currentIndex: number = 0
61 - private navTitle = '人民日报'; 61 + @State navTitle: string = ""
62 62
63 build() { 63 build() {
64 Stack({ alignContent: Alignment.Top }){ 64 Stack({ alignContent: Alignment.Top }){
@@ -137,13 +137,14 @@ export struct H5NewsWebPageComponent { @@ -137,13 +137,14 @@ export struct H5NewsWebPageComponent {
137 console.log(TAG, "dl1111111111", JSON.stringify(detailBeans[0])) 137 console.log(TAG, "dl1111111111", JSON.stringify(detailBeans[0]))
138 if (detailBeans && detailBeans.length > 0) { 138 if (detailBeans && detailBeans.length > 0) {
139 this.contentDetailData = detailBeans[0]; 139 this.contentDetailData = detailBeans[0];
  140 + this.navTitle = this.contentDetailData.newsTitle
140 let dateTime = 141 let dateTime =
141 DateTimeUtils.parseDate(this.contentDetailData?.publishTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN); 142 DateTimeUtils.parseDate(this.contentDetailData?.publishTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN);
142 // let _publishTime = DateTimeUtils.formatDate(dateTime, PATTERN_DATE_CN_RN) 143 // let _publishTime = DateTimeUtils.formatDate(dateTime, PATTERN_DATE_CN_RN)
143 // this.publishTime = DateTimeUtils.removeTrailingZeros(_publishTime) 144 // this.publishTime = DateTimeUtils.removeTrailingZeros(_publishTime)
144 - if (this.contentDetailData?.recommendShow === 1) {  
145 - this.getRecommend()  
146 - } 145 + // if (this.contentDetailData?.recommendShow === 1) {
  146 + // this.getRecommend()
  147 + // }
147 if (this.contentDetailData?.openLikes === 1) { 148 if (this.contentDetailData?.openLikes === 1) {
148 console.log(TAG, '点赞this.getInteractDataStatus()') 149 console.log(TAG, '点赞this.getInteractDataStatus()')
149 this.getInteractDataStatus() 150 this.getInteractDataStatus()
@@ -167,10 +168,10 @@ export struct H5NewsWebPageComponent { @@ -167,10 +168,10 @@ export struct H5NewsWebPageComponent {
167 if (this.contentDetailData.openLikes === 1) { 168 if (this.contentDetailData.openLikes === 1) {
168 this.operationButtonList.push('like') 169 this.operationButtonList.push('like')
169 } 170 }
170 - if (this.contentDetailData?.openAudio && this.contentDetailData?.audioList?.length &&  
171 - this.contentDetailData?.audioList[0].audioUrl) {  
172 - this.operationButtonList.push('listen')  
173 - } 171 + // if (this.contentDetailData?.openAudio && this.contentDetailData?.audioList?.length &&
  172 + // this.contentDetailData?.audioList[0].audioUrl) {
  173 + // this.operationButtonList.push('listen')
  174 + // }
174 this.operationButtonList.push('collect') 175 this.operationButtonList.push('collect')
175 if (this.contentDetailData.shareInfo?.shareOpen === 1) { 176 if (this.contentDetailData.shareInfo?.shareOpen === 1) {
176 this.operationButtonList.push('share') 177 this.operationButtonList.push('share')
@@ -179,23 +180,23 @@ export struct H5NewsWebPageComponent { @@ -179,23 +180,23 @@ export struct H5NewsWebPageComponent {
179 } 180 }
180 } 181 }
181 182
182 - private async getRecommend() {  
183 - let params: postRecommendListParams = {  
184 - imei: HttpUtils.getImei(),  
185 - userId: HttpUtils.getUserId(),  
186 - contentId: String(this.contentDetailData?.newsId),  
187 - recType: 1,  
188 - contentType: this.contentDetailData?.newsType,  
189 - relId: this.contentDetailData?.reLInfo?.relId,  
190 - // channelId: String(this.contentDetailData?.reLInfo?.channelId)  
191 - }  
192 - let recommendList = await DetailViewModel.postRecommendList(params)  
193 - if (recommendList.length > 0) {  
194 - //推荐列表过滤音频和活动入口  
195 - this.recommendList = recommendList.filter(item => item.objectType !== '3' && item.objectType !== '13');  
196 - }  
197 -  
198 - } 183 + // private async getRecommend() {
  184 + // let params: postRecommendListParams = {
  185 + // imei: HttpUtils.getImei(),
  186 + // userId: HttpUtils.getUserId(),
  187 + // contentId: String(this.contentDetailData?.newsId),
  188 + // recType: 1,
  189 + // contentType: this.contentDetailData?.newsType,
  190 + // relId: this.contentDetailData?.reLInfo?.relId,
  191 + // // channelId: String(this.contentDetailData?.reLInfo?.channelId)
  192 + // }
  193 + // let recommendList = await DetailViewModel.postRecommendList(params)
  194 + // if (recommendList.length > 0) {
  195 + // //推荐列表过滤音频和活动入口
  196 + // this.recommendList = recommendList.filter(item => item.objectType !== '3' && item.objectType !== '13');
  197 + // }
  198 + //
  199 + // }
199 200
200 // 已登录->查询用户对作品点赞、收藏状态 201 // 已登录->查询用户对作品点赞、收藏状态
201 private async getInteractDataStatus() { 202 private async getInteractDataStatus() {
@@ -25,7 +25,7 @@ export struct RmhTitle { @@ -25,7 +25,7 @@ export struct RmhTitle {
25 @State pageName: string = ''; 25 @State pageName: string = '';
26 @Prop rmhInfo: RmhInfoDTO 26 @Prop rmhInfo: RmhInfoDTO
27 @Prop publishTime: string | undefined 27 @Prop publishTime: string | undefined
28 - @State loadImg: boolean = false; 28 + @Prop loadImg: boolean = true;
29 isPeopleShipHome: boolean = false; 29 isPeopleShipHome: boolean = false;
30 // 当前页面没有使用，并且会导致奔溃 30 // 当前页面没有使用，并且会导致奔溃
31 // @Consume @Watch('pageShowForUpdateData') pageShow:number 31 // @Consume @Watch('pageShowForUpdateData') pageShow:number
@@ -108,7 +108,7 @@ export struct RmhTitle { @@ -108,7 +108,7 @@ export struct RmhTitle {
108 this.hideTime = true; 108 this.hideTime = true;
109 } 109 }
110 110
111 - this.loadImg = await onlyWifiLoadImg(); 111 + // this.loadImg = await onlyWifiLoadImg();
112 } 112 }
113 113
114 pageShowForUpdateData(): void { 114 pageShowForUpdateData(): void {
@@ -31,20 +31,20 @@ export struct AdvCardParser { @@ -31,20 +31,20 @@ export struct AdvCardParser {
31 @Builder 31 @Builder
32 contentBuilder(pageModel: PageModel, compDTO: CompDTO) { 32 contentBuilder(pageModel: PageModel, compDTO: CompDTO) {
33 if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_5) { //三图广告 33 if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_5) { //三图广告
34 - CardAdvThreeImageComponent({ pageModel, compDTO }) 34 + CardAdvThreeImageComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg })
35 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_6) { //小图广告 35 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_6) { //小图广告
36 - CardAdvSmallImageComponent({ pageModel, compDTO }) 36 + CardAdvSmallImageComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg })
37 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_7 || 37 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_7 ||
38 compDTO.matInfo.advSubType === CompStyle.Card_Adv_12) { // 长通栏广告 和 顶部长通栏广告 38 compDTO.matInfo.advSubType === CompStyle.Card_Adv_12) { // 长通栏广告 和 顶部长通栏广告
39 - CardAdvLongImageComponent({ pageModel, compDTO }) 39 + CardAdvLongImageComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg })
40 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_8) { //大图广告 40 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_8) { //大图广告
41 - CardAdvBigImageComponent({ pageModel, compDTO }) 41 + CardAdvBigImageComponent({ pageModel, compDTO , loadImg: this.pageModel.loadImg})
42 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_9) { //视频广告 42 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_9) { //视频广告
43 - CardAdvVideoComponent({ pageModel, compDTO }) 43 + CardAdvVideoComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg })
44 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_10) { //展会广告 44 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_10) { //展会广告
45 - CardAdvVideoExComponent({ pageModel, compDTO}) 45 + CardAdvVideoExComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg})
46 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_11) { //冠名广告 46 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_11) { //冠名广告
47 - CardAdvGanMiComponent({ pageModel, compDTO }) 47 + CardAdvGanMiComponent({ pageModel, compDTO , loadImg: this.pageModel.loadImg})
48 } 48 }
49 } 49 }
50 } 50 }
@@ -19,10 +19,10 @@ const TAG: string = 'Card2Component'; @@ -19,10 +19,10 @@ const TAG: string = 'Card2Component';
19 export struct CardAdvBigImageComponent { 19 export struct CardAdvBigImageComponent {
20 @State compDTO: CompDTO = {} as CompDTO 20 @State compDTO: CompDTO = {} as CompDTO
21 21
22 - @State loadImg: boolean = false; 22 + @Prop loadImg: boolean = true;
23 pageModel: PageModel = new PageModel(); 23 pageModel: PageModel = new PageModel();
24 async aboutToAppear(): Promise<void> { 24 async aboutToAppear(): Promise<void> {
25 - this.loadImg = await onlyWifiLoadImg(); 25 + // this.loadImg = await onlyWifiLoadImg();
26 26
27 } 27 }
28 28
@@ -25,10 +25,10 @@ export struct CardAdvGanMiComponent { @@ -25,10 +25,10 @@ export struct CardAdvGanMiComponent {
25 @State advExtraData: AdvExtraData = {} as AdvExtraData 25 @State advExtraData: AdvExtraData = {} as AdvExtraData
26 @State advLength: number = 0; 26 @State advLength: number = 0;
27 pageModel: PageModel = new PageModel(); 27 pageModel: PageModel = new PageModel();
28 - @State loadImg: boolean = false; 28 + @Prop loadImg: boolean = true;
29 29
30 async aboutToAppear(): Promise<void> { 30 async aboutToAppear(): Promise<void> {
31 - this.loadImg = await onlyWifiLoadImg(); 31 + // this.loadImg = await onlyWifiLoadImg();
32 32
33 let extraData = this.compDTO.matInfo.extraData 33 let extraData = this.compDTO.matInfo.extraData
34 let labelDTO = JSON.parse(extraData) as AdvExtraData 34 let labelDTO = JSON.parse(extraData) as AdvExtraData
@@ -21,10 +21,10 @@ export struct CardAdvLongImageComponent { @@ -21,10 +21,10 @@ export struct CardAdvLongImageComponent {
21 @State compDTO: CompDTO = {} as CompDTO 21 @State compDTO: CompDTO = {} as CompDTO
22 @State haveTitle: boolean = true 22 @State haveTitle: boolean = true
23 pageModel: PageModel = new PageModel(); 23 pageModel: PageModel = new PageModel();
24 - @State loadImg: boolean = false; 24 + @Prop loadImg: boolean = true;
25 25
26 async aboutToAppear(): Promise<void> { 26 async aboutToAppear(): Promise<void> {
27 - this.loadImg = await onlyWifiLoadImg(); 27 + // this.loadImg = await onlyWifiLoadImg();
28 this.haveTitle = this.compDTO.matInfo.advSubType === CompStyle.Card_Adv_7; 28 this.haveTitle = this.compDTO.matInfo.advSubType === CompStyle.Card_Adv_7;
29 } 29 }
30 30
@@ -23,10 +23,10 @@ export struct CardAdvSmallImageComponent { @@ -23,10 +23,10 @@ export struct CardAdvSmallImageComponent {
23 @State compDTO: CompDTO = {} as CompDTO 23 @State compDTO: CompDTO = {} as CompDTO
24 @State isBigThreeLine: boolean = false // 标题的行数大于等于3行 是true 24 @State isBigThreeLine: boolean = false // 标题的行数大于等于3行 是true
25 pageModel: PageModel = new PageModel(); 25 pageModel: PageModel = new PageModel();
26 - @State loadImg: boolean = false; 26 + @Prop loadImg: boolean = true;
27 27
28 async aboutToAppear(): Promise<void> { 28 async aboutToAppear(): Promise<void> {
29 - this.loadImg = await onlyWifiLoadImg(); 29 + // this.loadImg = await onlyWifiLoadImg();
30 30
31 // 计算标题文本行数 31 // 计算标题文本行数
32 let screenWith = DisplayUtils.getDeviceWidth(); 32 let screenWith = DisplayUtils.getDeviceWidth();
@@ -19,11 +19,11 @@ const TAG: string = 'Card2Component'; @@ -19,11 +19,11 @@ const TAG: string = 'Card2Component';
19 @Component 19 @Component
20 export struct CardAdvThreeImageComponent { 20 export struct CardAdvThreeImageComponent {
21 @State compDTO: CompDTO = {} as CompDTO 21 @State compDTO: CompDTO = {} as CompDTO
22 - @State loadImg: boolean = false; 22 + @Prop loadImg: boolean = true;
23 pageModel: PageModel = new PageModel(); 23 pageModel: PageModel = new PageModel();
24 24
25 async aboutToAppear(): Promise<void> { 25 async aboutToAppear(): Promise<void> {
26 - this.loadImg = await onlyWifiLoadImg(); 26 + // this.loadImg = await onlyWifiLoadImg();
27 } 27 }
28 28
29 aboutToDisappear(): void { 29 aboutToDisappear(): void {
@@ -21,11 +21,11 @@ const TAG: string = 'Card2Component'; @@ -21,11 +21,11 @@ const TAG: string = 'Card2Component';
21 export struct CardAdvVideoComponent { 21 export struct CardAdvVideoComponent {
22 @State compDTO: CompDTO = {} as CompDTO 22 @State compDTO: CompDTO = {} as CompDTO
23 @State contentDTO: ContentDTO = new ContentDTO() 23 @State contentDTO: ContentDTO = new ContentDTO()
24 - @State loadImg: boolean = false; 24 + @Prop loadImg: boolean = true;
25 pageModel: PageModel = new PageModel(); 25 pageModel: PageModel = new PageModel();
26 26
27 async aboutToAppear(): Promise<void> { 27 async aboutToAppear(): Promise<void> {
28 - this.loadImg = await onlyWifiLoadImg(); 28 + // this.loadImg = await onlyWifiLoadImg();
29 } 29 }
30 30
31 aboutToDisappear(): void { 31 aboutToDisappear(): void {
@@ -22,10 +22,10 @@ export struct CardAdvVideoExComponent { @@ -22,10 +22,10 @@ export struct CardAdvVideoExComponent {
22 @State compDTO: CompDTO = {} as CompDTO 22 @State compDTO: CompDTO = {} as CompDTO
23 @State advExtraData: AdvExtraData = {} as AdvExtraData 23 @State advExtraData: AdvExtraData = {} as AdvExtraData
24 pageModel: PageModel = new PageModel(); 24 pageModel: PageModel = new PageModel();
25 - @State loadImg: boolean = false; 25 + @Prop loadImg: boolean = true;
26 26
27 async aboutToAppear(): Promise<void> { 27 async aboutToAppear(): Promise<void> {
28 - this.loadImg = await onlyWifiLoadImg(); 28 + // this.loadImg = await onlyWifiLoadImg();
29 29
30 let extraData = this.compDTO.matInfo.extraData 30 let extraData = this.compDTO.matInfo.extraData
31 let labelDTO = JSON.parse(extraData) as AdvExtraData 31 let labelDTO = JSON.parse(extraData) as AdvExtraData
@@ -23,7 +23,7 @@ export struct Card10Component { @@ -23,7 +23,7 @@ export struct Card10Component {
23 @State pageId: string = ''; 23 @State pageId: string = '';
24 @State pageName: string = ''; 24 @State pageName: string = '';
25 @State contentDTO: ContentDTO = new ContentDTO(); 25 @State contentDTO: ContentDTO = new ContentDTO();
26 - @State loadImg: boolean = false; 26 + @Prop loadImg: boolean = true;
27 @ObjectLink compDTO: CompDTO 27 @ObjectLink compDTO: CompDTO
28 @State titleMarked: boolean = false; 28 @State titleMarked: boolean = false;
29 @State textArr: textItem[] = [] 29 @State textArr: textItem[] = []
@@ -37,7 +37,7 @@ export struct Card10Component { @@ -37,7 +37,7 @@ export struct Card10Component {
37 console.log('Card10Component-contentDTO', JSON.stringify(this.contentDTO)) 37 console.log('Card10Component-contentDTO', JSON.stringify(this.contentDTO))
38 38
39 this.titleInit(); 39 this.titleInit();
40 - this.loadImg = await onlyWifiLoadImg(); 40 + // this.loadImg = await onlyWifiLoadImg();
41 this.initHideDetail(); 41 this.initHideDetail();
42 42
43 if (!this.hideDetail) { 43 if (!this.hideDetail) {
@@ -207,7 +207,7 @@ export struct Card10ComponentTimelineItem { @@ -207,7 +207,7 @@ export struct Card10ComponentTimelineItem {
207 slideItem: slideShows = new slideShows; 207 slideItem: slideShows = new slideShows;
208 @State contentDTO: ContentDTO = new ContentDTO(); 208 @State contentDTO: ContentDTO = new ContentDTO();
209 @ObjectLink compDTO: CompDTO 209 @ObjectLink compDTO: CompDTO
210 - @State loadImg: boolean = false; 210 + @Prop loadImg: boolean = true;
211 @State isRead: boolean = false; //已读状态 211 @State isRead: boolean = false; //已读状态
212 212
213 build() { 213 build() {
@@ -23,6 +23,7 @@ export struct Card12Component { @@ -23,6 +23,7 @@ export struct Card12Component {
23 @State clicked: boolean = false; 23 @State clicked: boolean = false;
24 @State titleMarked: boolean = false; 24 @State titleMarked: boolean = false;
25 @State textArr: textItem[] = [] 25 @State textArr: textItem[] = []
  26 + @Prop loadImg: boolean = true;
26 27
27 aboutToAppear(): void { 28 aboutToAppear(): void {
28 this.titleInit(); 29 this.titleInit();
@@ -48,7 +49,7 @@ export struct Card12Component { @@ -48,7 +49,7 @@ export struct Card12Component {
48 contentDTO: this.contentDTO, 49 contentDTO: this.contentDTO,
49 compDTO: this.compDTO, 50 compDTO: this.compDTO,
50 pageId: this.pageId, 51 pageId: this.pageId,
51 - pageName: this.pageName 52 + pageName: this.pageName, loadImg: this.loadImg
52 } 53 }
53 ) 54 )
54 } 55 }
@@ -21,7 +21,7 @@ export struct Card14Component { @@ -21,7 +21,7 @@ export struct Card14Component {
21 @State pageId: string = ''; 21 @State pageId: string = '';
22 @State pageName: string = ''; 22 @State pageName: string = '';
23 @State contentDTO: ContentDTO = new ContentDTO(); 23 @State contentDTO: ContentDTO = new ContentDTO();
24 - @State loadImg: boolean = false; 24 + @Prop loadImg: boolean = true;
25 @State clicked: boolean = false; 25 @State clicked: boolean = false;
26 @State titleMarked: boolean = false; 26 @State titleMarked: boolean = false;
27 @State textArr: textItem[] = [] 27 @State textArr: textItem[] = []
@@ -30,7 +30,7 @@ export struct Card14Component { @@ -30,7 +30,7 @@ export struct Card14Component {
30 this.titleInit(); 30 this.titleInit();
31 const curRouter = router.getState().name; 31 const curRouter = router.getState().name;
32 this.clicked = hasClicked(this.contentDTO.objectId, curRouter) 32 this.clicked = hasClicked(this.contentDTO.objectId, curRouter)
33 - this.loadImg = await onlyWifiLoadImg(); 33 + // this.loadImg = await onlyWifiLoadImg();
34 } 34 }
35 35
36 titleInit() { 36 titleInit() {
@@ -50,7 +50,7 @@ export struct Card14Component { @@ -50,7 +50,7 @@ export struct Card14Component {
50 contentDTO: this.contentDTO, 50 contentDTO: this.contentDTO,
51 compDTO: this.compDTO, 51 compDTO: this.compDTO,
52 pageId: this.pageId, 52 pageId: this.pageId,
53 - pageName: this.pageName 53 + pageName: this.pageName, loadImg: this.loadImg
54 } 54 }
55 ) 55 )
56 } 56 }
@@ -25,7 +25,7 @@ export struct Card15Component { @@ -25,7 +25,7 @@ export struct Card15Component {
25 @State pageId: string = ''; 25 @State pageId: string = '';
26 @State pageName: string = ''; 26 @State pageName: string = '';
27 @State contentDTO: ContentDTO = new ContentDTO(); 27 @State contentDTO: ContentDTO = new ContentDTO();
28 - @State loadImg: boolean = false; 28 + @Prop loadImg: boolean = true;
29 @State clicked: boolean = false; 29 @State clicked: boolean = false;
30 @State titleMarked: boolean = false; 30 @State titleMarked: boolean = false;
31 @State textArr: textItem[] = [] 31 @State textArr: textItem[] = []
@@ -34,7 +34,7 @@ export struct Card15Component { @@ -34,7 +34,7 @@ export struct Card15Component {
34 this.titleInit(); 34 this.titleInit();
35 const curRouter = router.getState().name; 35 const curRouter = router.getState().name;
36 this.clicked = hasClicked(this.contentDTO.objectId, curRouter) 36 this.clicked = hasClicked(this.contentDTO.objectId, curRouter)
37 - this.loadImg = await onlyWifiLoadImg(); 37 + // this.loadImg = await onlyWifiLoadImg();
38 } 38 }
39 39
40 titleInit() { 40 titleInit() {
@@ -53,7 +53,7 @@ export struct Card15Component { @@ -53,7 +53,7 @@ export struct Card15Component {
53 contentDTO: this.contentDTO, 53 contentDTO: this.contentDTO,
54 compDTO: this.compDTO, 54 compDTO: this.compDTO,
55 pageId: this.pageId, 55 pageId: this.pageId,
56 - pageName: this.pageName 56 + pageName: this.pageName, loadImg: this.loadImg
57 } 57 }
58 ) //新闻标题 58 ) //新闻标题
59 if (this.contentDTO.newsTitle) { 59 if (this.contentDTO.newsTitle) {
@@ -27,7 +27,7 @@ export struct Card16Component { @@ -27,7 +27,7 @@ export struct Card16Component {
27 @State pageId: string = ''; 27 @State pageId: string = '';
28 @State pageName: string = ''; 28 @State pageName: string = '';
29 @State contentDTO: ContentDTO = new ContentDTO(); 29 @State contentDTO: ContentDTO = new ContentDTO();
30 - @State loadImg: boolean = false; 30 + @Prop loadImg: boolean = true;
31 @State clicked: boolean = false; 31 @State clicked: boolean = false;
32 @State titleMarked: boolean = false; 32 @State titleMarked: boolean = false;
33 @State textArr: textItem[] = [] 33 @State textArr: textItem[] = []
@@ -36,7 +36,7 @@ export struct Card16Component { @@ -36,7 +36,7 @@ export struct Card16Component {
36 this.titleInit(); 36 this.titleInit();
37 const curRouter = router.getState().name; 37 const curRouter = router.getState().name;
38 this.clicked = hasClicked(this.contentDTO.objectId, curRouter) 38 this.clicked = hasClicked(this.contentDTO.objectId, curRouter)
39 - this.loadImg = await onlyWifiLoadImg(); 39 + // this.loadImg = await onlyWifiLoadImg();
40 } 40 }
41 41
42 titleInit() { 42 titleInit() {
@@ -56,7 +56,7 @@ export struct Card16Component { @@ -56,7 +56,7 @@ export struct Card16Component {
56 contentDTO: this.contentDTO, 56 contentDTO: this.contentDTO,
57 compDTO: this.compDTO, 57 compDTO: this.compDTO,
58 pageId: this.pageId, 58 pageId: this.pageId,
59 - pageName: this.pageName 59 + pageName: this.pageName, loadImg: this.loadImg
60 } 60 }
61 ) 61 )
62 } 62 }
@@ -159,10 +159,10 @@ interface radiusType { @@ -159,10 +159,10 @@ interface radiusType {
159 @Component 159 @Component
160 struct createImg { 160 struct createImg {
161 @Prop contentDTO: ContentDTO 161 @Prop contentDTO: ContentDTO
162 - @State loadImg: boolean = false; 162 + @Prop loadImg: boolean = true;
163 163
164 async aboutToAppear(): Promise<void> { 164 async aboutToAppear(): Promise<void> {
165 - this.loadImg = await onlyWifiLoadImg(); 165 + // this.loadImg = await onlyWifiLoadImg();
166 } 166 }
167 167
168 build() { 168 build() {
@@ -21,7 +21,7 @@ export struct Card17Component { @@ -21,7 +21,7 @@ export struct Card17Component {
21 @State pageId: string = ''; 21 @State pageId: string = '';
22 @State pageName: string = ''; 22 @State pageName: string = '';
23 @State contentDTO: ContentDTO = new ContentDTO(); 23 @State contentDTO: ContentDTO = new ContentDTO();
24 - @State loadImg: boolean = false; 24 + @Prop loadImg: boolean = true;
25 @State clicked: boolean = false; 25 @State clicked: boolean = false;
26 @ObjectLink compDTO: CompDTO 26 @ObjectLink compDTO: CompDTO
27 @State titleMarked: boolean = false; 27 @State titleMarked: boolean = false;
@@ -32,7 +32,7 @@ export struct Card17Component { @@ -32,7 +32,7 @@ export struct Card17Component {
32 this.titleInit(); 32 this.titleInit();
33 const curRouter = router.getState().name; 33 const curRouter = router.getState().name;
34 this.clicked = hasClicked(this.contentDTO.objectId, curRouter) 34 this.clicked = hasClicked(this.contentDTO.objectId, curRouter)
35 - this.loadImg = await onlyWifiLoadImg(); 35 + // this.loadImg = await onlyWifiLoadImg();
36 } 36 }
37 37
38 titleInit() { 38 titleInit() {
@@ -23,6 +23,7 @@ export struct Card19Component { @@ -23,6 +23,7 @@ export struct Card19Component {
23 @State clicked: boolean = false; 23 @State clicked: boolean = false;
24 @State titleMarked: boolean = false; 24 @State titleMarked: boolean = false;
25 @State textArr: textItem[] = [] 25 @State textArr: textItem[] = []
  26 + @Prop loadImg: boolean = true;
26 isPeopleShipHome: boolean = false; 27 isPeopleShipHome: boolean = false;
27 28
28 async aboutToAppear(): Promise<void> { 29 async aboutToAppear(): Promise<void> {
@@ -49,7 +50,7 @@ export struct Card19Component { @@ -49,7 +50,7 @@ export struct Card19Component {
49 compDTO: this.compDTO, 50 compDTO: this.compDTO,
50 pageId: this.pageId, 51 pageId: this.pageId,
51 pageName: this.pageName, 52 pageName: this.pageName,
52 - isPeopleShipHome:this.isPeopleShipHome 53 + isPeopleShipHome:this.isPeopleShipHome, loadImg: this.loadImg
53 } 54 }
54 ) // 标题 55 ) // 标题
55 if (this.contentDTO.newsTitle) { 56 if (this.contentDTO.newsTitle) {
@@ -82,7 +83,7 @@ export struct Card19Component { @@ -82,7 +83,7 @@ export struct Card19Component {
82 }) 83 })
83 } 84 }
84 // 图片-从无图到9图展示 85 // 图片-从无图到9图展示
85 - createImg({ fullColumnImgUrls: this.contentDTO.fullColumnImgUrls }) 86 + createImg({ fullColumnImgUrls: this.contentDTO.fullColumnImgUrls, loadImg: this.loadImg })
86 87
87 CarderInteraction({ contentDTO: this.contentDTO }) 88 CarderInteraction({ contentDTO: this.contentDTO })
88 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件 89 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
@@ -121,7 +122,7 @@ interface picProps { @@ -121,7 +122,7 @@ interface picProps {
121 @Component 122 @Component
122 struct createImg { 123 struct createImg {
123 @Prop fullColumnImgUrls: FullColumnImgUrlDTO[] 124 @Prop fullColumnImgUrls: FullColumnImgUrlDTO[]
124 - @State loadImg: boolean = false; 125 + @Prop loadImg: boolean = true;
125 @State onePicW: number = 0; // 只有一张图时候图片的宽度 126 @State onePicW: number = 0; // 只有一张图时候图片的宽度
126 @State onePicH: number = 0; // 只有一张图时候图片的高度 127 @State onePicH: number = 0; // 只有一张图时候图片的高度
127 128
@@ -131,7 +132,7 @@ struct createImg { @@ -131,7 +132,7 @@ struct createImg {
131 fullUrl: '' 132 fullUrl: ''
132 } as FullColumnImgUrlDTO) 133 } as FullColumnImgUrlDTO)
133 } 134 }
134 - this.loadImg = await onlyWifiLoadImg(); 135 + // this.loadImg = await onlyWifiLoadImg();
135 console.log('card19-this.fullColumnImgUrls',JSON.stringify(this.fullColumnImgUrls)) 136 console.log('card19-this.fullColumnImgUrls',JSON.stringify(this.fullColumnImgUrls))
136 } 137 }
137 138
@@ -26,6 +26,7 @@ export struct Card20Component { @@ -26,6 +26,7 @@ export struct Card20Component {
26 @State clicked: boolean = false; 26 @State clicked: boolean = false;
27 @State titleMarked: boolean = false; 27 @State titleMarked: boolean = false;
28 @State textArr: textItem[] = [] 28 @State textArr: textItem[] = []
  29 + @Prop loadImg: boolean = true;
29 isPeopleShipHome: boolean = false; 30 isPeopleShipHome: boolean = false;
30 31
31 aboutToAppear(): void { 32 aboutToAppear(): void {
@@ -51,7 +52,7 @@ export struct Card20Component { @@ -51,7 +52,7 @@ export struct Card20Component {
51 compDTO: this.compDTO, 52 compDTO: this.compDTO,
52 pageId: this.pageId, 53 pageId: this.pageId,
53 pageName: this.pageName, 54 pageName: this.pageName,
54 - isPeopleShipHome:this.isPeopleShipHome 55 + isPeopleShipHome:this.isPeopleShipHome, loadImg: this.loadImg
55 } 56 }
56 ) // 标题 57 ) // 标题
57 if (this.contentDTO.newsTitle) { 58 if (this.contentDTO.newsTitle) {
@@ -103,7 +104,7 @@ export struct Card20Component { @@ -103,7 +104,7 @@ export struct Card20Component {
103 }.alignContent(Alignment.TopStart) 104 }.alignContent(Alignment.TopStart)
104 } 105 }
105 if (this.contentDTO.fullColumnImgUrls[0]) { 106 if (this.contentDTO.fullColumnImgUrls[0]) {
106 - createImg({ contentDTO: this.contentDTO }) 107 + createImg({ contentDTO: this.contentDTO, loadImg: this.loadImg })
107 } 108 }
108 CarderInteraction({contentDTO: this.contentDTO}) 109 CarderInteraction({contentDTO: this.contentDTO})
109 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件 110 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
@@ -137,11 +138,11 @@ interface radiusType { @@ -137,11 +138,11 @@ interface radiusType {
137 @Component 138 @Component
138 struct createImg { 139 struct createImg {
139 @Prop contentDTO: ContentDTO 140 @Prop contentDTO: ContentDTO
140 - @State loadImg: boolean = false; 141 + @Prop loadImg: boolean = true;
141 142
142 async aboutToAppear(): Promise<void> { 143 async aboutToAppear(): Promise<void> {
143 console.log("createImg", JSON.stringify(this.contentDTO.fullColumnImgUrls)) 144 console.log("createImg", JSON.stringify(this.contentDTO.fullColumnImgUrls))
144 - this.loadImg = await onlyWifiLoadImg(); 145 + // this.loadImg = await onlyWifiLoadImg();
145 } 146 }
146 147
147 148
@@ -21,7 +21,7 @@ export struct Card21Component { @@ -21,7 +21,7 @@ export struct Card21Component {
21 @State pageId: string = ''; 21 @State pageId: string = '';
22 @State pageName: string = ''; 22 @State pageName: string = '';
23 @State contentDTO: ContentDTO = new ContentDTO(); 23 @State contentDTO: ContentDTO = new ContentDTO();
24 - @State loadImg: boolean = false; 24 + @Prop loadImg: boolean = true;
25 @State clicked: boolean = false; 25 @State clicked: boolean = false;
26 @State titleMarked: boolean = false; 26 @State titleMarked: boolean = false;
27 @State textArr: textItem[] = [] 27 @State textArr: textItem[] = []
@@ -30,7 +30,7 @@ export struct Card21Component { @@ -30,7 +30,7 @@ export struct Card21Component {
30 this.titleInit(); 30 this.titleInit();
31 const curRouter = router.getState().name; 31 const curRouter = router.getState().name;
32 this.clicked = hasClicked(this.contentDTO.objectId, curRouter) 32 this.clicked = hasClicked(this.contentDTO.objectId, curRouter)
33 - this.loadImg = await onlyWifiLoadImg(); 33 + // this.loadImg = await onlyWifiLoadImg();
34 } 34 }
35 35
36 titleInit() { 36 titleInit() {
@@ -49,7 +49,7 @@ export struct Card21Component { @@ -49,7 +49,7 @@ export struct Card21Component {
49 contentDTO: this.contentDTO, 49 contentDTO: this.contentDTO,
50 compDTO: this.compDTO, 50 compDTO: this.compDTO,
51 pageId: this.pageId, 51 pageId: this.pageId,
52 - pageName: this.pageName 52 + pageName: this.pageName, loadImg: this.loadImg
53 } 53 }
54 ) // 中间内容 54 ) // 中间内容
55 Grid() { 55 Grid() {
@@ -6,7 +6,6 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo'; @@ -6,7 +6,6 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
6 import { CardSourceInfo } from '../cardCommon/CardSourceInfo'; 6 import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
7 import { Notes } from './notes'; 7 import { Notes } from './notes';
8 import { getNotesContentWidth } from '../../utils/FuncUtils' 8 import { getNotesContentWidth } from '../../utils/FuncUtils'
9 -import { onlyWifiLoadImg } from '../../utils/lazyloadImg';  
10 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 9 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
11 import { InfomationCardClick } from '../../utils/infomationCardClick'; 10 import { InfomationCardClick } from '../../utils/infomationCardClick';
12 import { SearchShowRed, titleInitRes, textItem } from '../../utils/searchShowRed'; 11 import { SearchShowRed, titleInitRes, textItem } from '../../utils/searchShowRed';
@@ -27,7 +26,7 @@ export struct Card2Component { @@ -27,7 +26,7 @@ export struct Card2Component {
27 @State pageId: string = ''; 26 @State pageId: string = '';
28 @State pageName: string = ''; 27 @State pageName: string = '';
29 @State contentDTO: ContentDTO = new ContentDTO(); 28 @State contentDTO: ContentDTO = new ContentDTO();
30 - @State loadImg: boolean = false; 29 + @Prop loadImg: boolean = true;
31 @State clicked: boolean = false; 30 @State clicked: boolean = false;
32 @ObjectLink compDTO: CompDTO 31 @ObjectLink compDTO: CompDTO
33 @State titleMarked: boolean = false; 32 @State titleMarked: boolean = false;
@@ -37,7 +36,6 @@ export struct Card2Component { @@ -37,7 +36,6 @@ export struct Card2Component {
37 this.titleInit(); 36 this.titleInit();
38 const curRouter = router.getState().name; 37 const curRouter = router.getState().name;
39 this.clicked = hasClicked(this.contentDTO.objectId, curRouter) 38 this.clicked = hasClicked(this.contentDTO.objectId, curRouter)
40 - this.loadImg = await onlyWifiLoadImg();  
41 } 39 }
42 40
43 titleInit() { 41 titleInit() {
@@ -16,6 +16,7 @@ import router from '@ohos.router' @@ -16,6 +16,7 @@ import router from '@ohos.router'
16 */ 16 */
17 @Component 17 @Component
18 export struct Card3Component { 18 export struct Card3Component {
  19 + @Prop loadImg: boolean = true;
19 @State pageId: string = ''; 20 @State pageId: string = '';
20 @State pageName: string = ''; 21 @State pageName: string = '';
21 @State contentDTO: ContentDTO = new ContentDTO(); 22 @State contentDTO: ContentDTO = new ContentDTO();
@@ -25,7 +25,7 @@ export struct Card4Component { @@ -25,7 +25,7 @@ export struct Card4Component {
25 @State pageId: string = ''; 25 @State pageId: string = '';
26 @State pageName: string = ''; 26 @State pageName: string = '';
27 @State contentDTO: ContentDTO = new ContentDTO(); 27 @State contentDTO: ContentDTO = new ContentDTO();
28 - @State loadImg: boolean = false; 28 + @Prop loadImg: boolean = true;
29 @State clicked: boolean = false; 29 @State clicked: boolean = false;
30 @State titleMarked: boolean = false; 30 @State titleMarked: boolean = false;
31 @State textArr: textItem[] = [] 31 @State textArr: textItem[] = []
@@ -35,7 +35,7 @@ export struct Card4Component { @@ -35,7 +35,7 @@ export struct Card4Component {
35 const curRouter = router.getState().name; 35 const curRouter = router.getState().name;
36 this.clicked = hasClicked(this.contentDTO.objectId, curRouter) 36 this.clicked = hasClicked(this.contentDTO.objectId, curRouter)
37 this.titleInit(); 37 this.titleInit();
38 - this.loadImg = await onlyWifiLoadImg(); 38 + // this.loadImg = await onlyWifiLoadImg();
39 } 39 }
40 40
41 titleInit() { 41 titleInit() {
1 import { ContentDTO, CompDTO } from 'wdBean'; 1 import { ContentDTO, CompDTO } from 'wdBean';
2 import { ProcessUtils } from 'wdRouter'; 2 import { ProcessUtils } from 'wdRouter';
3 -import { onlyWifiLoadImg } from '../../utils/lazyloadImg';  
4 import { Notes } from './notes'; 3 import { Notes } from './notes';
5 import { getNotesContentWidth } from '../../utils/FuncUtils' 4 import { getNotesContentWidth } from '../../utils/FuncUtils'
6 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 5 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
@@ -22,7 +21,7 @@ export struct Card5Component { @@ -22,7 +21,7 @@ export struct Card5Component {
22 @State contentDTO: ContentDTO = new ContentDTO(); 21 @State contentDTO: ContentDTO = new ContentDTO();
23 @ObjectLink compDTO: CompDTO 22 @ObjectLink compDTO: CompDTO
24 @Prop titleShowPolicy: number | string 23 @Prop titleShowPolicy: number | string
25 - @State loadImg: boolean = false; 24 + @Prop loadImg: boolean = true;
26 @State clicked: boolean = false; 25 @State clicked: boolean = false;
27 @State titleMarked: boolean = false; 26 @State titleMarked: boolean = false;
28 @State textArr: textItem[] = [] 27 @State textArr: textItem[] = []
@@ -33,7 +32,6 @@ export struct Card5Component { @@ -33,7 +32,6 @@ export struct Card5Component {
33 // console.log(TAG, 'this.contentDTO.newsTitle', this.contentDTO.newsTitle) 32 // console.log(TAG, 'this.contentDTO.newsTitle', this.contentDTO.newsTitle)
34 const curRouter = router.getState().name; 33 const curRouter = router.getState().name;
35 this.clicked = hasClicked(this.contentDTO.objectId, curRouter) 34 this.clicked = hasClicked(this.contentDTO.objectId, curRouter)
36 - this.loadImg = await onlyWifiLoadImg();  
37 35
38 this.titleInit(); 36 this.titleInit();
39 } 37 }
@@ -5,7 +5,6 @@ import { CardSourceInfo } from '../cardCommon/CardSourceInfo'; @@ -5,7 +5,6 @@ import { CardSourceInfo } from '../cardCommon/CardSourceInfo';
5 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'; 5 import { CardMediaInfo } from '../cardCommon/CardMediaInfo';
6 import { Notes } from './notes'; 6 import { Notes } from './notes';
7 import { getNotesContentWidth } from '../../utils/FuncUtils'; 7 import { getNotesContentWidth } from '../../utils/FuncUtils';
8 -import { onlyWifiLoadImg } from '../../utils/lazyloadImg';  
9 import { Logger } from 'wdKit/Index'; 8 import { Logger } from 'wdKit/Index';
10 import { persistentStorage, hasClicked } from '../../utils/persistentStorage'; 9 import { persistentStorage, hasClicked } from '../../utils/persistentStorage';
11 import { InfomationCardClick } from '../../utils/infomationCardClick' 10 import { InfomationCardClick } from '../../utils/infomationCardClick'
@@ -22,7 +21,7 @@ export struct Card6Component { @@ -22,7 +21,7 @@ export struct Card6Component {
22 @State pageId: string = ''; 21 @State pageId: string = '';
23 @State textHeight: number = 0 ; //获取文本的高度 22 @State textHeight: number = 0 ; //获取文本的高度
24 @State pageName: string = ''; 23 @State pageName: string = '';
25 - @State loadImg: boolean = false; 24 + @Prop loadImg: boolean = true;
26 @State clicked: boolean = false; 25 @State clicked: boolean = false;
27 @State titleMarked: boolean = false; 26 @State titleMarked: boolean = false;
28 @State textArr: textItem[] = [] 27 @State textArr: textItem[] = []
@@ -32,7 +31,6 @@ export struct Card6Component { @@ -32,7 +31,6 @@ export struct Card6Component {
32 async aboutToAppear(): Promise<void> { 31 async aboutToAppear(): Promise<void> {
33 console.log('Card6Component', JSON.stringify(this.contentDTO)) 32 console.log('Card6Component', JSON.stringify(this.contentDTO))
34 this.titleInit(); 33 this.titleInit();
35 - this.loadImg = await onlyWifiLoadImg();  
36 const curRouter = router.getState().name; 34 const curRouter = router.getState().name;
37 this.clicked = hasClicked(this.contentDTO.objectId, curRouter) 35 this.clicked = hasClicked(this.contentDTO.objectId, curRouter)
38 } 36 }
@@ -17,11 +17,11 @@ const TAG: string = 'Card9Component'; @@ -17,11 +17,11 @@ const TAG: string = 'Card9Component';
17 17
18 @Component 18 @Component
19 export struct Card9Component { 19 export struct Card9Component {
  20 + @Prop loadImg: boolean = true;
20 @ObjectLink compDTO: CompDTO 21 @ObjectLink compDTO: CompDTO
21 @State pageId: string = ''; 22 @State pageId: string = '';
22 @State pageName: string = ''; 23 @State pageName: string = '';
23 @State contentDTO: ContentDTO = new ContentDTO(); 24 @State contentDTO: ContentDTO = new ContentDTO();
24 - // @State loadImg: boolean = true;  
25 @State clicked: boolean = false; 25 @State clicked: boolean = false;
26 @State titleMarked: boolean = false; 26 @State titleMarked: boolean = false;
27 @State textArr: textItem[] = [] 27 @State textArr: textItem[] = []
@@ -99,7 +99,7 @@ export struct Card9Component { @@ -99,7 +99,7 @@ export struct Card9Component {
99 } 99 }
100 // 大图 100 // 大图
101 Stack() { 101 Stack() {
102 - Image(this.contentDTO.coverUrl) 102 + Image(this.loadImg ? this.contentDTO.coverUrl : '')
103 .backgroundColor(0xf5f5f5) 103 .backgroundColor(0xf5f5f5)
104 .width('100%') 104 .width('100%')
105 .height(133) 105 .height(133)
@@ -19,7 +19,7 @@ export struct LiveBigImage01Component { @@ -19,7 +19,7 @@ export struct LiveBigImage01Component {
19 @State pageId: string = ''; 19 @State pageId: string = '';
20 @State pageName: string = ''; 20 @State pageName: string = '';
21 @State contentDTO: ContentDTO = new ContentDTO(); 21 @State contentDTO: ContentDTO = new ContentDTO();
22 - @State loadImg: boolean = false; 22 + @Prop loadImg: boolean = true;
23 @State clicked: boolean = false; 23 @State clicked: boolean = false;
24 index: number = 0 24 index: number = 0
25 @State isLoadingAttention: boolean = false 25 @State isLoadingAttention: boolean = false
@@ -29,7 +29,7 @@ export struct LiveBigImage01Component { @@ -29,7 +29,7 @@ export struct LiveBigImage01Component {
29 const curRouter = router.getState().name; 29 const curRouter = router.getState().name;
30 this.curRouter = curRouter; 30 this.curRouter = curRouter;
31 this.clicked = hasClicked(this.contentDTO.objectId, curRouter) 31 this.clicked = hasClicked(this.contentDTO.objectId, curRouter)
32 - this.loadImg = await onlyWifiLoadImg(); 32 + // this.loadImg = await onlyWifiLoadImg();
33 } 33 }
34 34
35 build() { 35 build() {
@@ -17,17 +17,17 @@ export struct LiveBigImage02Component { @@ -17,17 +17,17 @@ export struct LiveBigImage02Component {
17 @State pageId: string = ''; 17 @State pageId: string = '';
18 @State pageName: string = ''; 18 @State pageName: string = '';
19 @State contentDTO: ContentDTO = new ContentDTO(); 19 @State contentDTO: ContentDTO = new ContentDTO();
20 - @State loadImg: boolean = false; 20 + @Prop loadImg: boolean = true;
21 @State clicked: boolean = false; 21 @State clicked: boolean = false;
22 index: number = 0 22 index: number = 0
23 async aboutToAppear() { 23 async aboutToAppear() {
24 const curRouter = router.getState().name; 24 const curRouter = router.getState().name;
25 this.clicked = hasClicked(this.contentDTO.objectId,curRouter) 25 this.clicked = hasClicked(this.contentDTO.objectId,curRouter)
26 - this.loadImg = await onlyWifiLoadImg(); 26 + // this.loadImg = await onlyWifiLoadImg();
27 } 27 }
28 28
29 async aboutToReuse() { 29 async aboutToReuse() {
30 - this.loadImg = await onlyWifiLoadImg(); 30 + // this.loadImg = await onlyWifiLoadImg();
31 } 31 }
32 32
33 33
@@ -20,13 +20,13 @@ export struct SearchContentComponent { @@ -20,13 +20,13 @@ export struct SearchContentComponent {
20 @State pageId: string = ''; 20 @State pageId: string = '';
21 @State pageName: string = ''; 21 @State pageName: string = '';
22 @State contentDTO: ContentDTO = new ContentDTO(); 22 @State contentDTO: ContentDTO = new ContentDTO();
23 - @State loadImg: boolean = false; 23 + @Prop loadImg: boolean = true;
24 @State clicked: boolean = false; 24 @State clicked: boolean = false;
25 @State textArr: textItem[] = [] 25 @State textArr: textItem[] = []
26 26
27 27
28 async aboutToAppear(): Promise<void> { 28 async aboutToAppear(): Promise<void> {
29 - this.loadImg = await onlyWifiLoadImg(); 29 + // this.loadImg = await onlyWifiLoadImg();
30 this.titleInit(); 30 this.titleInit();
31 31
32 const curRouter = router.getState().name; 32 const curRouter = router.getState().name;
@@ -87,7 +87,7 @@ export struct CommentComponent { @@ -87,7 +87,7 @@ export struct CommentComponent {
87 dx: 0, 87 dx: 0,
88 dy: -20 88 dy: -20
89 }, 89 },
90 - backgroundColor: "#50000000", 90 + maskColor: "#50000000",
91 }) 91 })
92 92
93 this.getData(); 93 this.getData();
@@ -48,7 +48,7 @@ export struct CommentTabComponent { @@ -48,7 +48,7 @@ export struct CommentTabComponent {
48 dx: 0, 48 dx: 0,
49 dy: -20 49 dy: -20
50 }, 50 },
51 - backgroundColor: "#50000000", 51 + maskColor: "#50000000",
52 }) 52 })
53 53
54 this.onLoad(this.dialogController) 54 this.onLoad(this.dialogController)
@@ -75,7 +75,7 @@ export struct QualityCommentsComponent { @@ -75,7 +75,7 @@ export struct QualityCommentsComponent {
75 dx: 0, 75 dx: 0,
76 dy: -20 76 dy: -20
77 }, 77 },
78 - backgroundColor: "#50000000", 78 + maskColor: "#50000000",
79 }) 79 })
80 } 80 }
81 81
@@ -54,6 +54,7 @@ export struct ZhCarouselLayout01 { @@ -54,6 +54,7 @@ export struct ZhCarouselLayout01 {
54 @State firstWd: number = 0 54 @State firstWd: number = 0
55 @State SecondWd: number = 0 55 @State SecondWd: number = 0
56 @State swiperIndex: number = 0 56 @State swiperIndex: number = 0
  57 + @Prop loadImg: boolean = true;
57 58
58 private data: MyDataSource = new MyDataSource([]) 59 private data: MyDataSource = new MyDataSource([])
59 60
@@ -100,7 +101,7 @@ export struct ZhCarouselLayout01 { @@ -100,7 +101,7 @@ export struct ZhCarouselLayout01 {
100 CarouselLayout01CardView({ 101 CarouselLayout01CardView({
101 item: item, 102 item: item,
102 length: this.filterAtv().length, 103 length: this.filterAtv().length,
103 - showPicBorderRadius: this.filterAtv().length == 1 104 + showPicBorderRadius: this.filterAtv().length == 1, loadImg: this.loadImg
104 }) 105 })
105 .onClick((event: ClickEvent) => { 106 .onClick((event: ClickEvent) => {
106 InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName) 107 InfomationCardClick.track(this.compDTO, item, this.pageId, this.pageName)
@@ -180,7 +181,7 @@ export struct ZhCarouselLayout01 { @@ -180,7 +181,7 @@ export struct ZhCarouselLayout01 {
180 CarouselLayout01CardView({ 181 CarouselLayout01CardView({
181 item: this.filterAtv()[0], 182 item: this.filterAtv()[0],
182 length: 1, 183 length: 1,
183 - showPicBorderRadius: this.filterAtv().length == 1 184 + showPicBorderRadius: this.filterAtv().length == 1, loadImg: this.loadImg
184 }) 185 })
185 .onClick((event: ClickEvent) => { 186 .onClick((event: ClickEvent) => {
186 InfomationCardClick.track(this.compDTO, this.filterAtv()[0], this.pageId, this.pageName) 187 InfomationCardClick.track(this.compDTO, this.filterAtv()[0], this.pageId, this.pageName)
@@ -214,13 +215,13 @@ export struct ZhCarouselLayout01 { @@ -214,13 +215,13 @@ export struct ZhCarouselLayout01 {
214 215
215 @Component 216 @Component
216 struct CarouselLayout01CardView { 217 struct CarouselLayout01CardView {
217 - @State loadImg: boolean = false; 218 + @Prop loadImg: boolean = true;
218 private item: ContentDTO = new ContentDTO(); 219 private item: ContentDTO = new ContentDTO();
219 private length: number = 1; // 轮播图数量 220 private length: number = 1; // 轮播图数量
220 private showPicBorderRadius: boolean = false; 221 private showPicBorderRadius: boolean = false;
221 222
222 async aboutToAppear(): Promise<void> { 223 async aboutToAppear(): Promise<void> {
223 - this.loadImg = await onlyWifiLoadImg(); 224 + // this.loadImg = await onlyWifiLoadImg();
224 } 225 }
225 226
226 build() { 227 build() {
@@ -18,11 +18,11 @@ export struct ZhGridLayout02NewsContent { @@ -18,11 +18,11 @@ export struct ZhGridLayout02NewsContent {
18 @State pageName: string = ''; 18 @State pageName: string = '';
19 @ObjectLink compDTO: CompDTO 19 @ObjectLink compDTO: CompDTO
20 @State operDataList: ContentDTO[] = [] 20 @State operDataList: ContentDTO[] = []
21 - @State loadImg: boolean = false; 21 + @Prop loadImg: boolean = true;
22 22
23 async aboutToAppear(): Promise<void> { 23 async aboutToAppear(): Promise<void> {
24 24
25 - this.loadImg = await onlyWifiLoadImg(); 25 + // this.loadImg = await onlyWifiLoadImg();
26 } 26 }
27 27
28 build() { 28 build() {
@@ -19,13 +19,13 @@ export struct ZhGridLayout03 { @@ -19,13 +19,13 @@ export struct ZhGridLayout03 {
19 @State pageId: string = ''; 19 @State pageId: string = '';
20 @State pageName: string = ''; 20 @State pageName: string = '';
21 @State compDTO: CompDTO = {} as CompDTO 21 @State compDTO: CompDTO = {} as CompDTO
22 - @State loadImg: boolean = false; 22 + @Prop loadImg: boolean = true;
23 23
24 async aboutToAppear(): Promise<void> { 24 async aboutToAppear(): Promise<void> {
25 if (this.compDTO.operDataList) { 25 if (this.compDTO.operDataList) {
26 listSize = this.compDTO.operDataList.length > 5 ? 4 : this.compDTO.operDataList.length; 26 listSize = this.compDTO.operDataList.length > 5 ? 4 : this.compDTO.operDataList.length;
27 } 27 }
28 - this.loadImg = await onlyWifiLoadImg(); 28 + // this.loadImg = await onlyWifiLoadImg();
29 } 29 }
30 30
31 build() { 31 build() {
@@ -22,7 +22,7 @@ export struct ZhSingleColumn09 { @@ -22,7 +22,7 @@ export struct ZhSingleColumn09 {
22 @State activeIndexs: Array<number> = [] 22 @State activeIndexs: Array<number> = []
23 @State operDataList: ContentDTO[] = this.compDTO?.operDataList || [] 23 @State operDataList: ContentDTO[] = this.compDTO?.operDataList || []
24 @StorageLink('selfClosed') selfClosed: boolean = false 24 @StorageLink('selfClosed') selfClosed: boolean = false
25 - @State loadImg: boolean = false; 25 + @Prop loadImg: boolean = true;
26 @State compIndex: number = 0; 26 @State compIndex: number = 0;
27 @State currentOperDataListIndex: number = 0; //记录换一换点击次数 27 @State currentOperDataListIndex: number = 0; //记录换一换点击次数
28 @State visitedIndices: Set<number> = new Set<number>(); 28 @State visitedIndices: Set<number> = new Set<number>();
@@ -30,7 +30,7 @@ export struct ZhSingleColumn09 { @@ -30,7 +30,7 @@ export struct ZhSingleColumn09 {
30 @State currentDataList: ContentDTO[] = [] 30 @State currentDataList: ContentDTO[] = []
31 31
32 async aboutToAppear(): Promise<void> { 32 async aboutToAppear(): Promise<void> {
33 - this.loadImg = await onlyWifiLoadImg(); 33 + // this.loadImg = await onlyWifiLoadImg();
34 // this.operDataList = this.shuffleArray(this.compDTO?.operDataList) 34 // this.operDataList = this.shuffleArray(this.compDTO?.operDataList)
35 this.operDataList = this.padData(this.compDTO?.operDataList) 35 this.operDataList = this.padData(this.compDTO?.operDataList)
36 this.currentOperDataListIndex = this.compDTO?.operDataList.length 36 this.currentOperDataListIndex = this.compDTO?.operDataList.length
@@ -16,6 +16,7 @@ const TAG = 'Zh_Single_Row-02' @@ -16,6 +16,7 @@ const TAG = 'Zh_Single_Row-02'
16 16
17 @Component 17 @Component
18 export struct ZhSingleRow02 { 18 export struct ZhSingleRow02 {
  19 + @Prop loadImg: boolean = true;
19 @State pageId: string = ''; 20 @State pageId: string = '';
20 @State pageName: string = ''; 21 @State pageName: string = '';
21 @State compDTO: CompDTO = {} as CompDTO 22 @State compDTO: CompDTO = {} as CompDTO
@@ -94,7 +95,7 @@ export struct ZhSingleRow02 { @@ -94,7 +95,7 @@ export struct ZhSingleRow02 {
94 index, 95 index,
95 compDTO: this.compDTO, 96 compDTO: this.compDTO,
96 pageId: this.pageId, 97 pageId: this.pageId,
97 - pageName: this.pageName 98 + pageName: this.pageName, loadImg: this.loadImg
98 }) 99 })
99 .margin({ right: 8, left: index === 0 ? 16 : 0 }) 100 .margin({ right: 8, left: index === 0 ? 16 : 0 })
100 }) 101 })
@@ -226,10 +227,10 @@ struct CreatorItem { @@ -226,10 +227,10 @@ struct CreatorItem {
226 @Prop item: ContentDTO 227 @Prop item: ContentDTO
227 @Prop index: number 228 @Prop index: number
228 @State rmhIsAttention: number = 0 229 @State rmhIsAttention: number = 0
229 - @State loadImg: boolean = false; 230 + @Prop loadImg: boolean = true;
230 231
231 async aboutToAppear(): Promise<void> { 232 async aboutToAppear(): Promise<void> {
232 - this.loadImg = await onlyWifiLoadImg(); 233 + // this.loadImg = await onlyWifiLoadImg();
233 } 234 }
234 235
235 build() { 236 build() {
@@ -41,7 +41,7 @@ export struct ZhSingleRow03 { @@ -41,7 +41,7 @@ export struct ZhSingleRow03 {
41 @State compDTO: CompDTO = {} as CompDTO 41 @State compDTO: CompDTO = {} as CompDTO
42 // @State reserveStatus: reserveItem[] = [] 42 // @State reserveStatus: reserveItem[] = []
43 @State reservedIds: string[] = []; 43 @State reservedIds: string[] = [];
44 - @State loadImg: boolean = false; 44 + @Prop loadImg: boolean = true;
45 @State initMoreWidth: number = 22; 45 @State initMoreWidth: number = 22;
46 @State moreWidth:number = 22 46 @State moreWidth:number = 22
47 @State moreTips: string = '' 47 @State moreTips: string = ''
@@ -93,7 +93,7 @@ export struct ZhSingleRow03 { @@ -93,7 +93,7 @@ export struct ZhSingleRow03 {
93 if (HttpUtils.isLogin()) { 93 if (HttpUtils.isLogin()) {
94 this.getReserveState(); 94 this.getReserveState();
95 } 95 }
96 - this.loadImg = await onlyWifiLoadImg(); 96 + // this.loadImg = await onlyWifiLoadImg();
97 97
98 // 获取预约 98 // 获取预约
99 EmitterUtils.receiveEvent(EmitterEventId.LIVE_ROOM_SUBSCRIBE, (str?: string) => { 99 EmitterUtils.receiveEvent(EmitterEventId.LIVE_ROOM_SUBSCRIBE, (str?: string) => {
@@ -11,6 +11,7 @@ import { InfomationCardClick } from '../../utils/infomationCardClick'; @@ -11,6 +11,7 @@ import { InfomationCardClick } from '../../utils/infomationCardClick';
11 11
12 @Component 12 @Component
13 export struct ZhSingleRow04 { 13 export struct ZhSingleRow04 {
  14 + @Prop loadImg: boolean = true;
14 @State pageId: string = ''; 15 @State pageId: string = '';
15 @State pageName: string = ''; 16 @State pageName: string = '';
16 @State compDTO: CompDTO = {} as CompDTO 17 @State compDTO: CompDTO = {} as CompDTO
@@ -26,12 +26,12 @@ export struct ZhSingleRow06 { @@ -26,12 +26,12 @@ export struct ZhSingleRow06 {
26 @State newsStatusOfUser: batchLikeAndCollectResult = { 26 @State newsStatusOfUser: batchLikeAndCollectResult = {
27 likeStatus: '0' 27 likeStatus: '0'
28 } as batchLikeAndCollectResult // 点赞、收藏状态 28 } as batchLikeAndCollectResult // 点赞、收藏状态
29 - @State loadImg: boolean = false; 29 + @Prop loadImg: boolean = true;
30 30
31 async aboutToAppear(): Promise<void> { 31 async aboutToAppear(): Promise<void> {
32 console.log('Zh_Single_Row-06', JSON.stringify(this.compDTO.operDataList[0]?.commentInfo)) 32 console.log('Zh_Single_Row-06', JSON.stringify(this.compDTO.operDataList[0]?.commentInfo))
33 this.getInteractDataStatus() 33 this.getInteractDataStatus()
34 - this.loadImg = await onlyWifiLoadImg(); 34 + // this.loadImg = await onlyWifiLoadImg();
35 } 35 }
36 36
37 37
@@ -113,7 +113,7 @@ export default struct MinePageUserSimpleInfoUI { @@ -113,7 +113,7 @@ export default struct MinePageUserSimpleInfoUI {
113 .margin({ left: 0,top:8 }) 113 .margin({ left: 0,top:8 })
114 .backgroundImage($r("app.media.mine_grade_bg")) 114 .backgroundImage($r("app.media.mine_grade_bg"))
115 .backgroundImageSize(ImageSize.FILL) 115 .backgroundImageSize(ImageSize.FILL)
116 - .padding({left: 6,right: 6}) 116 + .padding({left: 9,right: 9})
117 .height(16) 117 .height(16)
118 } 118 }
119 } 119 }
@@ -8,12 +8,12 @@ import { MyCustomDialog } from '../../reusable/MyCustomDialog' @@ -8,12 +8,12 @@ import { MyCustomDialog } from '../../reusable/MyCustomDialog'
8 @Component 8 @Component
9 export struct AppointmentListChildComponent { 9 export struct AppointmentListChildComponent {
10 @ObjectLink item: MineAppointmentItem 10 @ObjectLink item: MineAppointmentItem
11 - @State loadImg: boolean = false; 11 + @Prop loadImg: boolean = true;
12 confirmCallback: (item: MineAppointmentItem) => void = () => { 12 confirmCallback: (item: MineAppointmentItem) => void = () => {
13 13
14 } 14 }
15 async aboutToAppear(): Promise<void> { 15 async aboutToAppear(): Promise<void> {
16 - this.loadImg = await onlyWifiLoadImg(); 16 + // this.loadImg = await onlyWifiLoadImg();
17 } 17 }
18 18
19 dialogController: CustomDialogController = new CustomDialogController({ 19 dialogController: CustomDialogController = new CustomDialogController({
@@ -45,7 +45,7 @@ export struct ChildCommentComponent { @@ -45,7 +45,7 @@ export struct ChildCommentComponent {
45 .fontColor($r('app.color.color_222222')) 45 .fontColor($r('app.color.color_222222'))
46 .margin({ bottom: 1 }) 46 .margin({ bottom: 1 })
47 .maxLines(1) 47 .maxLines(1)
48 - Text(DateTimeUtils.getCommentTime(DateTimeUtils.getDateTimestamp(this.data.createTime))) 48 + Text(`${this.data.createTime}`)
49 .fontColor($r('app.color.color_B0B0B0')) 49 .fontColor($r('app.color.color_B0B0B0'))
50 .fontSize(12) 50 .fontSize(12)
51 .lineHeight(16) 51 .lineHeight(16)
@@ -399,7 +399,7 @@ export struct PaperSingleColumn999CardView { @@ -399,7 +399,7 @@ export struct PaperSingleColumn999CardView {
399 @State isRead: boolean = false;//已读状态 399 @State isRead: boolean = false;//已读状态
400 @State interactData: InteractDataDTO = new InteractDataDTO 400 @State interactData: InteractDataDTO = new InteractDataDTO
401 @Consume @Watch('onChangeCommentList') commentList: InteractDataDTO[] 401 @Consume @Watch('onChangeCommentList') commentList: InteractDataDTO[]
402 - @State loadImg: boolean = false; 402 + @Prop loadImg: boolean = true;
403 403
404 getPublishTime(): string { 404 getPublishTime(): string {
405 const publishTimestamp = parseInt(this.item?.publishTime) 405 const publishTimestamp = parseInt(this.item?.publishTime)
@@ -626,7 +626,7 @@ export struct PaperSingleColumn999CardView { @@ -626,7 +626,7 @@ export struct PaperSingleColumn999CardView {
626 } 626 }
627 627
628 async aboutToAppear(): Promise<void> { 628 async aboutToAppear(): Promise<void> {
629 - this.loadImg = await onlyWifiLoadImg(); 629 + // this.loadImg = await onlyWifiLoadImg();
630 this.onChangeCommentList() 630 this.onChangeCommentList()
631 this.isRead = hasClicked(this.item.objectId, '') 631 this.isRead = hasClicked(this.item.objectId, '')
632 } 632 }
@@ -15,6 +15,7 @@ import { NoMoreBean } from './NoMoreBean'; @@ -15,6 +15,7 @@ import { NoMoreBean } from './NoMoreBean';
15 import { RefreshLayoutBean } from '../refresh/RefreshLayoutBean'; 15 import { RefreshLayoutBean } from '../refresh/RefreshLayoutBean';
16 import RefreshLayout from '../refresh/RefreshLayout'; 16 import RefreshLayout from '../refresh/RefreshLayout';
17 import { GrayManageModel } from '../../viewmodel/GrayManageModel'; 17 import { GrayManageModel } from '../../viewmodel/GrayManageModel';
  18 +import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
18 19
19 const TAG = 'PageComponent'; 20 const TAG = 'PageComponent';
20 21
@@ -301,7 +302,7 @@ export struct PageComponent { @@ -301,7 +302,7 @@ export struct PageComponent {
301 } 302 }
302 } 303 }
303 304
304 - onAutoRefresh() { 305 + async onAutoRefresh() {
305 if (this.navIndex != this.currentTopNavSelectedIndex) { 306 if (this.navIndex != this.currentTopNavSelectedIndex) {
306 return 307 return
307 } 308 }
@@ -315,13 +316,14 @@ export struct PageComponent { @@ -315,13 +316,14 @@ export struct PageComponent {
315 if (this.timer) { 316 if (this.timer) {
316 clearTimeout(this.timer) 317 clearTimeout(this.timer)
317 } 318 }
318 - this.timer = setTimeout(() => { 319 + this.timer = setTimeout(async () => {
319 Logger.info(TAG, `getData id: ${this.pageId} , ${this.channelId} , navIndex: ${this.currentTopNavSelectedIndex}`); 320 Logger.info(TAG, `getData id: ${this.pageId} , ${this.channelId} , navIndex: ${this.currentTopNavSelectedIndex}`);
320 this.pageModel.pageId = this.pageId; 321 this.pageModel.pageId = this.pageId;
321 this.pageModel.groupId = this.pageId; 322 this.pageModel.groupId = this.pageId;
322 this.pageModel.channelId = this.channelId; 323 this.pageModel.channelId = this.channelId;
323 this.pageModel.currentPage = 1; 324 this.pageModel.currentPage = 1;
324 this.pageModel.pageTotalCompSize = 0; 325 this.pageModel.pageTotalCompSize = 0;
  326 + this.pageModel.loadImg = await onlyWifiLoadImg()
325 PageHelper.getInitCacheData(this.pageModel, this.pageAdvModel).then(() => { 327 PageHelper.getInitCacheData(this.pageModel, this.pageAdvModel).then(() => {
326 this.pageTrackBean.pageId = this.pageId 328 this.pageTrackBean.pageId = this.pageId
327 this.pageTrackBean.pageName = this.pageModel.pageInfo.name 329 this.pageTrackBean.pageName = this.pageModel.pageInfo.name
@@ -137,19 +137,13 @@ export struct PeopleShipHomeArticleListComponent { @@ -137,19 +137,13 @@ export struct PeopleShipHomeArticleListComponent {
137 } 137 }
138 138
139 aboutToAppear() { 139 aboutToAppear() {
140 - console.log(TAG, 'cj2024 aboutToAppear')  
141 - AppStorage.setOrCreate<string>('peopleShipHomeCreatorId', this.creatorId) 140 + // console.log(TAG, 'cj2024 aboutToAppear')
142 if (this.currentIndex == this.currentTopSelectedIndex) { 141 if (this.currentIndex == this.currentTopSelectedIndex) {
143 this.currentPage = 1 142 this.currentPage = 1
144 this.getPeopleShipPageArticleList() 143 this.getPeopleShipPageArticleList()
145 } 144 }
146 } 145 }
147 146
148 - aboutToDisappear(): void {  
149 - console.log(TAG, 'cj2024 aboutToDisappear')  
150 - AppStorage.setOrCreate<string>('peopleShipHomeCreatorId', '') //清空人民号动态等过来的数据  
151 - }  
152 -  
153 onChange() { 147 onChange() {
154 if (this.currentIndex == this.currentTopSelectedIndex && this.arr.length == 0) { 148 if (this.currentIndex == this.currentTopSelectedIndex && this.arr.length == 0) {
155 this.currentPage = 1 149 this.currentPage = 1
@@ -159,7 +153,7 @@ export struct PeopleShipHomeArticleListComponent { @@ -159,7 +153,7 @@ export struct PeopleShipHomeArticleListComponent {
159 153
160 154
161 private async getPeopleShipPageArticleList(resolve?: (value: string | PromiseLike<string>) => void) { 155 private async getPeopleShipPageArticleList(resolve?: (value: string | PromiseLike<string>) => void) {
162 - Logger.info(`获取页面信息PeopleShipHomeArticleListComponent${this.typeModel.type}`) 156 + // Logger.info(`获取页面信息PeopleShipHomeArticleListComponent${this.typeModel.type}`)
163 if (this.isLoading) { 157 if (this.isLoading) {
164 if (resolve) { 158 if (resolve) {
165 resolve('') 159 resolve('')
@@ -169,8 +163,8 @@ export struct PeopleShipHomeArticleListComponent { @@ -169,8 +163,8 @@ export struct PeopleShipHomeArticleListComponent {
169 try { 163 try {
170 this.isLoading = true 164 this.isLoading = true
171 let listData: ArticleListData = await PeopleShipHomePageDataModel.getPeopleShipHomePageArticleListData(this.creatorId, this.currentPage, 20, this.typeModel.type) 165 let listData: ArticleListData = await PeopleShipHomePageDataModel.getPeopleShipHomePageArticleListData(this.creatorId, this.currentPage, 20, this.typeModel.type)
172 - Logger.debug(TAG, `获取页面信息, ${JSON.stringify(listData.list)}`);  
173 - Logger.debug(TAG, `已更新值最新, ${this.currentPage}`); 166 + // Logger.debug(TAG, `获取页面信息, ${JSON.stringify(listData.list)}`);
  167 + // Logger.debug(TAG, `已更新值最新, ${this.currentPage}`);
174 168
175 if (resolve ) { 169 if (resolve ) {
176 if (this.currentPage == 1) { 170 if (this.currentPage == 1) {
@@ -196,7 +190,7 @@ export struct PeopleShipHomeArticleListComponent { @@ -196,7 +190,7 @@ export struct PeopleShipHomeArticleListComponent {
196 if (listData.totalCount === 0) { 190 if (listData.totalCount === 0) {
197 this.viewType = 4 191 this.viewType = 4
198 } 192 }
199 - Logger.debug(TAG, '展示的总数'+`${this.arr.length}`) 193 + // Logger.debug(TAG, '展示的总数'+`${this.arr.length}`)
200 }catch (exception) { 194 }catch (exception) {
201 if (resolve) { 195 if (resolve) {
202 resolve('') 196 resolve('')
@@ -6,6 +6,13 @@ import CustomRefreshLoadLayout from '../page/CustomRefreshLoadLayout' @@ -6,6 +6,13 @@ import CustomRefreshLoadLayout from '../page/CustomRefreshLoadLayout'
6 import { EmptyComponent } from '../view/EmptyComponent'; 6 import { EmptyComponent } from '../view/EmptyComponent';
7 import { RefreshLayoutBean } from '../page/RefreshLayoutBean' 7 import { RefreshLayoutBean } from '../page/RefreshLayoutBean'
8 8
  9 +const TAG = 'PeopleShipHomeListComponent'
  10 +
  11 +interface peopleParams {
  12 + creatorId: string,
  13 + tabName: string
  14 +}
  15 +
9 @Component 16 @Component
10 export struct PeopleShipHomeListComponent { 17 export struct PeopleShipHomeListComponent {
11 private controller: TabsController = new TabsController() 18 private controller: TabsController = new TabsController()
@@ -139,6 +146,12 @@ export struct PeopleShipHomeListComponent { @@ -139,6 +146,12 @@ export struct PeopleShipHomeListComponent {
139 .onClick(() => { 146 .onClick(() => {
140 this.controller.changeIndex(index) 147 this.controller.changeIndex(index)
141 this.currentIndex = index 148 this.currentIndex = index
  149 + console.log(TAG, 'name', name)
  150 + const params: peopleParams = {
  151 + creatorId: this.creatorId,
  152 + tabName: name
  153 + }
  154 + AppStorage.setOrCreate<string>('peopleShipHomeCreatorId', JSON.stringify(params))
142 }) 155 })
143 } 156 }
144 157
@@ -147,7 +160,7 @@ export struct PeopleShipHomeListComponent { @@ -147,7 +160,7 @@ export struct PeopleShipHomeListComponent {
147 this.isLoading = true 160 this.isLoading = true
148 // 1:点播（视频）,2:直播,3:活动,4:广告,5:专题,6:链接,7:榜单,8:图文,9:组图,10:H5新闻,11:频道,12:组件 13:音频 14:动态图文 15:动态视频 161 // 1:点播（视频）,2:直播,3:活动,4:广告,5:专题,6:链接,7:榜单,8:图文,9:组图,10:H5新闻,11:频道,12:组件 13:音频 14:动态图文 15:动态视频
149 let articleModel = await PeopleShipHomePageDataModel.getPeopleShipHomePageArticleCountData(1, this.creatorId) 162 let articleModel = await PeopleShipHomePageDataModel.getPeopleShipHomePageArticleCountData(1, this.creatorId)
150 - Logger.debug('PeopleShipHomeListComponent', '获取页面信息', `${JSON.stringify(articleModel)}`) 163 + // Logger.debug('PeopleShipHomeListComponent', '获取页面信息', `${JSON.stringify(articleModel)}`)
151 this.updateTopBarData(articleModel) 164 this.updateTopBarData(articleModel)
152 this.isLoading = false 165 this.isLoading = false
153 } catch (exception) { 166 } catch (exception) {
@@ -155,6 +168,11 @@ export struct PeopleShipHomeListComponent { @@ -155,6 +168,11 @@ export struct PeopleShipHomeListComponent {
155 } 168 }
156 } 169 }
157 170
  171 + aboutToDisappear(): void {
  172 + // console.log(TAG, 'cj2024 aboutToDisappear')
  173 + AppStorage.setOrCreate<string>('peopleShipHomeCreatorId', '') //清空人民号动态等过来的数据
  174 + }
  175 +
158 // 设置顶部数据 176 // 设置顶部数据
159 updateTopBarData(articleModel: ArticleCountData) { 177 updateTopBarData(articleModel: ArticleCountData) {
160 if (articleModel) { 178 if (articleModel) {
@@ -3,7 +3,7 @@ import router from '@ohos.router' @@ -3,7 +3,7 @@ import router from '@ohos.router'
3 @Component 3 @Component
4 export struct CustomTitleUI { 4 export struct CustomTitleUI {
5 imgBack:boolean = true 5 imgBack:boolean = true
6 - titleName:ResourceStr = "默认标题" 6 + @Prop titleName: ResourceStr = ""
7 @Prop percent:number = 1 7 @Prop percent:number = 1
8 isShowBottomLine:boolean = false 8 isShowBottomLine:boolean = false
9 9
@@ -159,7 +159,7 @@ export struct EmptyComponent { @@ -159,7 +159,7 @@ export struct EmptyComponent {
159 .opacity(this.TEXT_OPACITY) 159 .opacity(this.TEXT_OPACITY)
160 .margin({ top: this.EMPTY_TIP_TEXT_MARGIN_TOP }) 160 .margin({ top: this.EMPTY_TIP_TEXT_MARGIN_TOP })
161 // .fontColor(this.emptyType === WDViewDefaultType.WDViewDefaultType_NoComment1 ? '#999999' : '#666666') 161 // .fontColor(this.emptyType === WDViewDefaultType.WDViewDefaultType_NoComment1 ? '#999999' : '#666666')
162 - .fontColor('#666666') 162 + .fontColor(this.isBlack ? '#FFFFFF' :'#666666')
163 .onClick((event: ClickEvent) => { 163 .onClick((event: ClickEvent) => {
164 Logger.info(TAG, `noProgrammeData onClick event?.source: ${event.source}`); 164 Logger.info(TAG, `noProgrammeData onClick event?.source: ${event.source}`);
165 }) 165 })
@@ -6,6 +6,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo' @@ -6,6 +6,7 @@ import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
6 6
7 @Component 7 @Component
8 export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { 8 export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
  9 + @Prop loadImg: boolean = true;
9 @State compDTO: CompDTO = {} as CompDTO 10 @State compDTO: CompDTO = {} as CompDTO
10 @State pageId: string = ''; 11 @State pageId: string = '';
11 @State pageName: string = ''; 12 @State pageName: string = '';
@@ -102,7 +103,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -102,7 +103,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
102 ForEach(this.compDTO.operDataList, (item: ContentDTO, index: number) => { 103 ForEach(this.compDTO.operDataList, (item: ContentDTO, index: number) => {
103 Column() { 104 Column() {
104 Stack() { 105 Stack() {
105 - Image(item.coverUrl) 106 + Image(this.loadImg ? item.coverUrl : '')
106 .aspectRatio(1.5) 107 .aspectRatio(1.5)
107 .width(this.compDTO.operDataList.length == 2 ? 210 : 150) 108 .width(this.compDTO.operDataList.length == 2 ? 210 : 150)
108 .objectFit(ImageFit.Contain) 109 .objectFit(ImageFit.Contain)
@@ -7,6 +7,7 @@ import { InfomationCardClick } from '../../utils/infomationCardClick'; @@ -7,6 +7,7 @@ import { InfomationCardClick } from '../../utils/infomationCardClick';
7 7
8 @Component 8 @Component
9 export struct HorizontalStrokeCardThreeTwoRadioForOneComponent { 9 export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
  10 + @Prop loadImg: boolean = true;
10 @State pageId: string = ''; 11 @State pageId: string = '';
11 @State pageName: string = ''; 12 @State pageName: string = '';
12 @State compDTO: CompDTO = {} as CompDTO 13 @State compDTO: CompDTO = {} as CompDTO
@@ -45,7 +46,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent { @@ -45,7 +46,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
45 .width('100%') 46 .width('100%')
46 47
47 48
48 - Image(this.compDTO.operDataList[0].coverUrl) 49 + Image(this.loadImg ? this.compDTO.operDataList[0].coverUrl : '')
49 .aspectRatio(1.5) 50 .aspectRatio(1.5)
50 .width('100%') 51 .width('100%')
51 .borderRadius(4) 52 .borderRadius(4)
@@ -17,7 +17,7 @@ export struct LiveHorizontalCardComponent { @@ -17,7 +17,7 @@ export struct LiveHorizontalCardComponent {
17 @State pageId: string = ''; 17 @State pageId: string = '';
18 @State pageName: string = ''; 18 @State pageName: string = '';
19 @State compDTO: CompDTO = {} as CompDTO 19 @State compDTO: CompDTO = {} as CompDTO
20 - @State loadImg: boolean = false; 20 + @Prop loadImg: boolean = true;
21 @State initMoreWidth: number = 22; 21 @State initMoreWidth: number = 22;
22 @State moreWidth:number = 22 22 @State moreWidth:number = 22
23 @State moreTips: string = '' 23 @State moreTips: string = ''
@@ -101,7 +101,7 @@ export struct LiveHorizontalCardComponent { @@ -101,7 +101,7 @@ export struct LiveHorizontalCardComponent {
101 } 101 }
102 102
103 async aboutToAppear(): Promise<void> { 103 async aboutToAppear(): Promise<void> {
104 - this.loadImg = await onlyWifiLoadImg(); 104 + // this.loadImg = await onlyWifiLoadImg();
105 } 105 }
106 106
107 showMore() { 107 showMore() {
@@ -377,7 +377,7 @@ export struct LiveOperRowListView { @@ -377,7 +377,7 @@ export struct LiveOperRowListView {
377 dx: 0, 377 dx: 0,
378 dy: -20 378 dy: -20
379 }, 379 },
380 - backgroundColor: "#50000000", 380 + maskColor: "#50000000",
381 }) 381 })
382 this.publishCommentModel.rootCommentId = '-1'; 382 this.publishCommentModel.rootCommentId = '-1';
383 this.publishCommentModel.parentId = '-1'; 383 this.publishCommentModel.parentId = '-1';
@@ -147,7 +147,7 @@ export struct MultiPictureListPage { @@ -147,7 +147,7 @@ export struct MultiPictureListPage {
147 // ImageDownloadComponent({ url: this.currentUrl }) 147 // ImageDownloadComponent({ url: this.currentUrl })
148 SaveNetWorkPictures({ url: this.currentUrl }) 148 SaveNetWorkPictures({ url: this.currentUrl })
149 } 149 }
150 - .margin({ 150 + .padding({
151 top: 14, 151 top: 14,
152 left: 20, 152 left: 20,
153 bottom: 14, 153 bottom: 14,
@@ -155,6 +155,11 @@ export struct MultiPictureListPage { @@ -155,6 +155,11 @@ export struct MultiPictureListPage {
155 }) 155 })
156 // .backgroundColor(Color.Blue) 156 // .backgroundColor(Color.Blue)
157 .id('e_swiper_titles') 157 .id('e_swiper_titles')
  158 + .linearGradient({
  159 + direction: GradientDirection.Bottom, // 渐变方向
  160 + colors: [['rgba(18, 18, 18, 0)', 0],
  161 + ['rgba(18, 18, 18, 0.8)', 1.0]] // 数组末尾元素占比小于1时满足重复着色效果
  162 + })
158 .alignRules({ 163 .alignRules({
159 bottom: { anchor: "__container__", align: VerticalAlign.Bottom }, 164 bottom: { anchor: "__container__", align: VerticalAlign.Bottom },
160 middle: { anchor: "__container__", align: HorizontalAlign.Center } 165 middle: { anchor: "__container__", align: HorizontalAlign.Center }
@@ -16,6 +16,7 @@ import { common } from '@kit.AbilityKit'; @@ -16,6 +16,7 @@ import { common } from '@kit.AbilityKit';
16 import { CacheData } from 'wdNetwork/Index'; 16 import { CacheData } from 'wdNetwork/Index';
17 import { closeLoadMore } from '../utils/PullUpLoadMore'; 17 import { closeLoadMore } from '../utils/PullUpLoadMore';
18 import { webview } from '@kit.ArkWeb'; 18 import { webview } from '@kit.ArkWeb';
  19 +import { onlyWifiLoadImg } from '../utils/lazyloadImg';
19 20
20 const TAG = 'PageHelper'; 21 const TAG = 'PageHelper';
21 22
@@ -108,9 +109,10 @@ export class PageHelper { @@ -108,9 +109,10 @@ export class PageHelper {
108 } 109 }
109 } 110 }
110 111
111 - getPageInfo(pageModel: PageModel, pageAdvModel: PageAdModel) { 112 + async getPageInfo(pageModel: PageModel, pageAdvModel: PageAdModel) {
112 let cacheIsSame = false; 113 let cacheIsSame = false;
113 pageModel.currentPage = 1; 114 pageModel.currentPage = 1;
  115 + pageModel.loadImg = await onlyWifiLoadImg();
114 if (pageModel.pageType == 1) { 116 if (pageModel.pageType == 1) {
115 PageViewModel.postThemeList(pageModel.currentPage, pageModel.pageSize, pageModel.extra).then((liveReviewDTO) => { 117 PageViewModel.postThemeList(pageModel.currentPage, pageModel.pageSize, pageModel.extra).then((liveReviewDTO) => {
116 if (liveReviewDTO == null || liveReviewDTO.list == null || liveReviewDTO.list.length == 0) { 118 if (liveReviewDTO == null || liveReviewDTO.list == null || liveReviewDTO.list.length == 0) {
@@ -84,6 +84,8 @@ export default class PageModel { @@ -84,6 +84,8 @@ export default class PageModel {
84 // 第一页，最后一个comp下标，用于区分分页加载（下拉刷新，清除分页数据） 84 // 第一页，最后一个comp下标，用于区分分页加载（下拉刷新，清除分页数据）
85 firstPageEndIndex = -1 85 firstPageEndIndex = -1
86 86
  87 + loadImg: boolean = true;
  88 +
87 /** 89 /**
88 * 简单复制业务数据 90 * 简单复制业务数据
89 */ 91 */
@@ -87,9 +87,12 @@ export struct DetailPlayLivePage { @@ -87,9 +87,12 @@ export struct DetailPlayLivePage {
87 this.getLiveDetails() 87 this.getLiveDetails()
88 this.getLiveRoomData() 88 this.getLiveRoomData()
89 89
  90 + if (this.liveDetailPageLogic.dealOrShowToast()) {
90 if(!await onlyWifiLoadVideo()){ 91 if(!await onlyWifiLoadVideo()){
91 this.showToastTip(this.toastText) 92 this.showToastTip(this.toastText)
92 } 93 }
  94 + }
  95 +
93 this.configChatRoom() 96 this.configChatRoom()
94 } 97 }
95 98
@@ -92,4 +92,21 @@ export class LiveDetailPageLogic { @@ -92,4 +92,21 @@ export class LiveDetailPageLogic {
92 } 92 }
93 return '' 93 return ''
94 } 94 }
  95 +
  96 + dealOrShowToast(): boolean {
  97 + if (this.liveState == 'wait') {
  98 + if (this.contentDetailData.liveInfo
  99 + && this.contentDetailData.liveInfo.previewUrl.length > 0
  100 + && this.contentDetailData.liveInfo.previewType == 1) { ///预告视频
  101 + return true
  102 + }
  103 + }
  104 + if (this.liveState == 'running') {
  105 + if (this.contentDetailData.liveInfo.liveWay == 0) { ///直播视频
  106 + return true
  107 + }
  108 + }
  109 + return false
  110 + }
  111 +
95 } 112 }
@@ -11,6 +11,7 @@ export struct TabInfoComponent { @@ -11,6 +11,7 @@ export struct TabInfoComponent {
11 } 11 }
12 12
13 build() { 13 build() {
  14 + Scroll(){
14 Column() { 15 Column() {
15 this.showLiveTitle() 16 this.showLiveTitle()
16 this.showLiveDetails() 17 this.showLiveDetails()
@@ -20,8 +21,10 @@ export struct TabInfoComponent { @@ -20,8 +21,10 @@ export struct TabInfoComponent {
20 left: 16, 21 left: 16,
21 right: 16 22 right: 16
22 }) 23 })
23 - .height('100%')  
24 .alignItems(HorizontalAlign.Start) 24 .alignItems(HorizontalAlign.Start)
  25 + }.layoutWeight(1)
  26 + .width("100%")
  27 + .scrollBar(BarState.Off)
25 } 28 }
26 29
27 aboutToDisappear(): void { 30 aboutToDisappear(): void {
@@ -10,6 +10,7 @@ export struct ChatItemComponent { @@ -10,6 +10,7 @@ export struct ChatItemComponent {
10 } 10 }
11 11
12 build() { 12 build() {
  13 + Row(){
13 Row() { 14 Row() {
14 Text() { 15 Text() {
15 if (this.item.role == LiveMessageRole.host) { 16 if (this.item.role == LiveMessageRole.host) {
@@ -59,5 +60,7 @@ export struct ChatItemComponent { @@ -59,5 +60,7 @@ export struct ChatItemComponent {
59 right: 8 60 right: 8
60 }) 61 })
61 .margin({ left: 16, bottom: 4 }) 62 .margin({ left: 16, bottom: 4 })
  63 + }.width("100%")
  64 + .backgroundColor(Color.Transparent)
62 } 65 }
63 } 66 }
@@ -100,16 +100,22 @@ export struct PlayerCommentComponent { @@ -100,16 +100,22 @@ export struct PlayerCommentComponent {
100 ForEach(this.liveChatList, (item: LiveRoomItemBean) => { 100 ForEach(this.liveChatList, (item: LiveRoomItemBean) => {
101 ListItem() { 101 ListItem() {
102 ChatItemComponent({ item: item }) 102 ChatItemComponent({ item: item })
103 - } 103 + }.blendMode(BlendMode.SRC_IN, BlendApplyType.OFFSCREEN)
104 }) 104 })
105 } 105 }
106 - .width('80%') 106 + .width('100%')
107 .scrollBar(BarState.Off) 107 .scrollBar(BarState.Off)
  108 + .edgeEffect(EdgeEffect.None)
108 109
109 } 110 }
110 .constraintSize({ 111 .constraintSize({
111 maxHeight: 280 112 maxHeight: 280
  113 + }).width("80%")
  114 + .linearGradient({ angle: 0,
  115 + colors: [[0xff000000, 0.85], [0x01000000, 1.0]]
112 }) 116 })
  117 + .blendMode(BlendMode.SRC_OVER, BlendApplyType.OFFSCREEN)
  118 +
113 119
114 // 收藏、分享、点赞是否需要根据字段显隐 120 // 收藏、分享、点赞是否需要根据字段显隐
115 LiveOperRowListView({ 121 LiveOperRowListView({
1 -import { Action, ContentDetailDTO, ContentDTO, InteractDataDTO, PeopleShipNextListDTO } from 'wdBean/Index'; 1 +import { Action,
  2 + ContentDetailDTO, ContentDTO, InteractDataDTO, PeopleShipNextListDTO } from 'wdBean/Index';
2 import { NetworkUtil, WindowModel } from 'wdKit'; 3 import { NetworkUtil, WindowModel } from 'wdKit';
3 import { ContentDetailRequest } from 'wdDetailPlayApi/Index' 4 import { ContentDetailRequest } from 'wdDetailPlayApi/Index'
4 import { ResponseDTO } from 'wdNetwork/Index'; 5 import { ResponseDTO } from 'wdNetwork/Index';
@@ -16,10 +17,16 @@ import { BusinessError, systemDateTime } from '@kit.BasicServicesKit'; @@ -16,10 +17,16 @@ import { BusinessError, systemDateTime } from '@kit.BasicServicesKit';
16 const storage = LocalStorage.getShared(); 17 const storage = LocalStorage.getShared();
17 const TAG = 'DetailVideoListPage' 18 const TAG = 'DetailVideoListPage'
18 19
  20 +interface peopleParams {
  21 + creatorId: string,
  22 + tabName: string
  23 +}
  24 +
19 @Entry(storage) 25 @Entry(storage)
20 @Component 26 @Component
21 export struct DetailVideoListPage { 27 export struct DetailVideoListPage {
22 @State peopleShipHomeCreatorId: string = ''; 28 @State peopleShipHomeCreatorId: string = '';
  29 + @State tabName: string = ''; // 人民好主页全部、文章、视频、动态等name
23 private contentId: string = '' 30 private contentId: string = ''
24 private relId: string = '' 31 private relId: string = ''
25 private relType: string = '' 32 private relType: string = ''
@@ -101,6 +108,10 @@ export struct DetailVideoListPage { @@ -101,6 +108,10 @@ export struct DetailVideoListPage {
101 this.peopleShipHomeCreatorId = AppStorage.get<string>('peopleShipHomeCreatorId') || ''; 108 this.peopleShipHomeCreatorId = AppStorage.get<string>('peopleShipHomeCreatorId') || '';
102 // console.info(TAG, `cj2024 peopleShipHomeCreatorId = ${this.peopleShipHomeCreatorId}`) 109 // console.info(TAG, `cj2024 peopleShipHomeCreatorId = ${this.peopleShipHomeCreatorId}`)
103 if (this.peopleShipHomeCreatorId) { 110 if (this.peopleShipHomeCreatorId) {
  111 + const params: peopleParams = JSON.parse(this.peopleShipHomeCreatorId);
  112 + this.tabName = params.tabName;
  113 + this.peopleShipHomeCreatorId = params.creatorId;
  114 + // console.info(TAG, `cj2024 tabName = ${this.tabName}`)
104 // 从人民号号主传过来的 115 // 从人民号号主传过来的
105 this.getPeopleShipHomeDetail(this.peopleShipHomeCreatorId); 116 this.getPeopleShipHomeDetail(this.peopleShipHomeCreatorId);
106 } else { 117 } else {
@@ -129,7 +140,6 @@ export struct DetailVideoListPage { @@ -129,7 +140,6 @@ export struct DetailVideoListPage {
129 // console.info(TAG, `cj2024 getPeopleShipHomeDetail relId = ${this.relId}`) 140 // console.info(TAG, `cj2024 getPeopleShipHomeDetail relId = ${this.relId}`)
130 // console.info(TAG, `cj2024 getPeopleShipHomeDetail relType = ${this.relType}`) 141 // console.info(TAG, `cj2024 getPeopleShipHomeDetail relType = ${this.relType}`)
131 await this.getRmhContentDetail(this.contentId, this.relId, this.relType) 142 await this.getRmhContentDetail(this.contentId, this.relId, this.relType)
132 - this.getRmhPublishNexts(peopleShipHomeCreatorId, this.contentId, 1, 1, 10, systemDateTime.getTime(false));  
133 } 143 }
134 // console.log(TAG, 'aboutToAppear', JSON.stringify(action.params)) 144 // console.log(TAG, 'aboutToAppear', JSON.stringify(action.params))
135 } else { 145 } else {
@@ -276,7 +286,7 @@ export struct DetailVideoListPage { @@ -276,7 +286,7 @@ export struct DetailVideoListPage {
276 relId: relId, 286 relId: relId,
277 relType: relType 287 relType: relType
278 }).then(async (resDTO: ResponseDTO<ContentDetailDTO[]>) => { 288 }).then(async (resDTO: ResponseDTO<ContentDetailDTO[]>) => {
279 - // console.log(TAG, 'getContentDetail:', JSON.stringify(resDTO.data)) 289 + // console.log(TAG, 'getRmhContentDetail:', JSON.stringify(resDTO.data))
280 // this.isOffLine = resDTO.data == null ? true : false 290 // this.isOffLine = resDTO.data == null ? true : false
281 if (resDTO.data) { 291 if (resDTO.data) {
282 const params: contentListParams = { 292 const params: contentListParams = {
@@ -293,6 +303,12 @@ export struct DetailVideoListPage { @@ -293,6 +303,12 @@ export struct DetailVideoListPage {
293 // console.log('获取互动点赞等数据===', JSON.stringify(res)) 303 // console.log('获取互动点赞等数据===', JSON.stringify(res))
294 }) 304 })
295 this.data.push(resDTO.data[0]) 305 this.data.push(resDTO.data[0])
  306 +
  307 + if(this.tabName == '全部' || this.tabName == '视频') { // 全部和视频查询号主关联视频
  308 + await this.getRmhPublishNexts(this.peopleShipHomeCreatorId, this.contentId, 1, 1, 10, systemDateTime.getTime(false));
  309 + } else { // 目前动态是查询随机视频
  310 + await this.queryVideoList()
  311 + }
296 } 312 }
297 }) 313 })
298 } 314 }
@@ -307,6 +323,7 @@ export struct DetailVideoListPage { @@ -307,6 +323,7 @@ export struct DetailVideoListPage {
307 refreshTime 1694073009294 323 refreshTime 1694073009294
308 * */ 324 * */
309 async getRmhPublishNexts(creatorId: string, contentId: string, contentType: number,nextFlag: number,pageSize: number,refreshTime:number) { 325 async getRmhPublishNexts(creatorId: string, contentId: string, contentType: number,nextFlag: number,pageSize: number,refreshTime:number) {
  326 + // console.log(TAG, 'cj2024 getRmhPublishNexts:')
310 await ContentDetailRequest.getRmhPublishNexts({ 327 await ContentDetailRequest.getRmhPublishNexts({
311 creatorId: creatorId, 328 creatorId: creatorId,
312 contentId: contentId, 329 contentId: contentId,
@@ -395,7 +412,7 @@ export struct DetailVideoListPage { @@ -395,7 +412,7 @@ export struct DetailVideoListPage {
395 }) 412 })
396 } else if (this.isOffLine) { 413 } else if (this.isOffLine) {
397 EmptyComponent({ 414 EmptyComponent({
398 - emptyType: 15, emptyButton: true, retry: () => { 415 + emptyType: 15, emptyButton: true, isBlack: true, retry: () => {
399 this.getDetail() 416 this.getDetail()
400 } 417 }
401 }) 418 })
@@ -6,6 +6,7 @@ import { DateTimeUtils, EmitterEventId, EmitterUtils, Logger, WindowModel } from @@ -6,6 +6,7 @@ import { DateTimeUtils, EmitterEventId, EmitterUtils, Logger, WindowModel } from
6 import { DisplayDirection } from 'wdConstant/Index' 6 import { DisplayDirection } from 'wdConstant/Index'
7 import { window } from '@kit.ArkUI' 7 import { window } from '@kit.ArkUI'
8 8
  9 +const TAG = 'PlayerFullScreenView'
9 @Component 10 @Component
10 export struct PlayerFullScreenView { 11 export struct PlayerFullScreenView {
11 private playerController?: WDPlayerController; 12 private playerController?: WDPlayerController;
@@ -33,7 +34,11 @@ export struct PlayerFullScreenView { @@ -33,7 +34,11 @@ export struct PlayerFullScreenView {
33 } 34 }
34 35
35 share() { 36 share() {
  37 + this.playerController?.switchPlayOrPause()
36 WDShare.shareContent(this.contentDetailData) 38 WDShare.shareContent(this.contentDetailData)
  39 + // WDShare.shareContent(this.contentDetailData).then(() => {
  40 + // this.playerController?.switchPlayOrPause()
  41 + // })
37 } 42 }
38 43
39 updateProgress() { 44 updateProgress() {
@@ -98,7 +103,7 @@ export struct PlayerFullScreenView { @@ -98,7 +103,7 @@ export struct PlayerFullScreenView {
98 Text(this.getTitle()) 103 Text(this.getTitle())
99 .fontSize(18) 104 .fontSize(18)
100 .lineHeight(24) 105 .lineHeight(24)
101 - .fontWeight(600) 106 + // .fontWeight(600)
102 .fontColor(Color.White) 107 .fontColor(Color.White)
103 .maxLines(1) 108 .maxLines(1)
104 .textOverflow({ overflow: TextOverflow.Ellipsis }) 109 .textOverflow({ overflow: TextOverflow.Ellipsis })
@@ -150,11 +155,13 @@ export struct PlayerFullScreenView { @@ -150,11 +155,13 @@ export struct PlayerFullScreenView {
150 Image($r(`app.media.ic_play_2`)).height(24).width(24) 155 Image($r(`app.media.ic_play_2`)).height(24).width(24)
151 .visibility(this.status === PlayerConstants.STATUS_START ? Visibility.None : Visibility.Visible) 156 .visibility(this.status === PlayerConstants.STATUS_START ? Visibility.None : Visibility.Visible)
152 .onClick(() => { 157 .onClick(() => {
  158 + // console.log(TAG, `ic_play_2 onClick`, this.status )
153 this.playerController?.switchPlayOrPause() 159 this.playerController?.switchPlayOrPause()
154 }) 160 })
155 Image($r(`app.media.ic_pause_2`)).height(24).width(24) 161 Image($r(`app.media.ic_pause_2`)).height(24).width(24)
156 .visibility(this.status === PlayerConstants.STATUS_PAUSE ? Visibility.None : Visibility.Visible) 162 .visibility(this.status === PlayerConstants.STATUS_PAUSE ? Visibility.None : Visibility.Visible)
157 .onClick(() => { 163 .onClick(() => {
  164 + // console.log(TAG, `ic_pause_2 onClick`, this.status )
158 this.playerController?.switchPlayOrPause() 165 this.playerController?.switchPlayOrPause()
159 }) 166 })
160 167
@@ -12,7 +12,19 @@ const DAILY_NEWSPAPER_DEEP_LINK = "rmrbapp://rmrb.app/openwith?type=topic&subTyp @@ -12,7 +12,19 @@ const DAILY_NEWSPAPER_DEEP_LINK = "rmrbapp://rmrb.app/openwith?type=topic&subTyp
12 struct DailyNewspaperWidgetCard { 12 struct DailyNewspaperWidgetCard {
13 @LocalStorageProp('paperType') paperType: FormNewspaperPaperType = FormNewspaperPaperType.unknown; 13 @LocalStorageProp('paperType') paperType: FormNewspaperPaperType = FormNewspaperPaperType.unknown;
14 @LocalStorageProp('paperInfo') paperInfo: FormNewspaperPaperInfo = {} as FormNewspaperPaperInfo; 14 @LocalStorageProp('paperInfo') paperInfo: FormNewspaperPaperInfo = {} as FormNewspaperPaperInfo;
15 - @LocalStorageProp('paperContents') paperContents: FormNewspaperPaperContent[] = []; 15 + @LocalStorageProp('paperContents') @Watch("paperContentsUpdates") paperContents: FormNewspaperPaperContent[] = [];
  16 + @State needShowNumber: boolean = false
  17 +
  18 + aboutToAppear(): void {
  19 +
  20 + }
  21 +
  22 + paperContentsUpdates() {
  23 + const hasAnyRightImages = this.paperContents.filter((content) => {
  24 + return content.coverUrl && content.coverUrl.length > 0
  25 + }).length > 0
  26 + this.needShowNumber = !this.paperInfo.showLeftImage && !hasAnyRightImages
  27 + }
16 28
17 build() { 29 build() {
18 30
@@ -73,7 +85,12 @@ struct DailyNewspaperWidgetCard { @@ -73,7 +85,12 @@ struct DailyNewspaperWidgetCard {
73 List() { 85 List() {
74 ForEach(this.paperContents, (item: FormNewspaperPaperContent, index: number) => { 86 ForEach(this.paperContents, (item: FormNewspaperPaperContent, index: number) => {
75 ListItem() { 87 ListItem() {
76 - ContentCellView({content: item, index: index, hasImage: (item.coverUrl && item.coverUrl.length > 0 ? true : false)}) 88 + ContentCellView({
  89 + content: item,
  90 + index: index,
  91 + needShowNumber: this.needShowNumber,
  92 + hasImage: (item.coverUrl && item.coverUrl.length > 0 ? true : false)
  93 + })
77 } 94 }
78 }, (item: FormNewspaperPaperContent, index) => index + JSON.stringify(item)) 95 }, (item: FormNewspaperPaperContent, index) => index + JSON.stringify(item))
79 } 96 }
@@ -90,11 +107,17 @@ struct DailyNewspaperWidgetCard { @@ -90,11 +107,17 @@ struct DailyNewspaperWidgetCard {
90 107
91 @Component 108 @Component
92 struct ContentCellView { 109 struct ContentCellView {
  110 + @Prop needShowNumber: boolean = false
93 @Prop content: FormNewspaperPaperContent 111 @Prop content: FormNewspaperPaperContent
94 private index : number = 0 112 private index : number = 0
95 private hasImage: boolean = false 113 private hasImage: boolean = false
96 build() { 114 build() {
97 Row() { 115 Row() {
  116 + if (this.needShowNumber) {
  117 + Text((this.index + 1) + "")
  118 + .fontColor("#ED2800")
  119 + .margin({left: 4, right: 4})
  120 + }
98 Text(this.content.title) 121 Text(this.content.title)
99 .maxLines((this.content.coverUrl && this.content.coverUrl.length > 0 ? 2 : 1)) 122 .maxLines((this.content.coverUrl && this.content.coverUrl.length > 0 ? 2 : 1))
100 .textOverflow({ overflow: TextOverflow.Ellipsis }) 123 .textOverflow({ overflow: TextOverflow.Ellipsis })
@@ -48,6 +48,7 @@ export struct VideoChannelPage { @@ -48,6 +48,7 @@ export struct VideoChannelPage {
48 @State isShowAudioCom: boolean = false 48 @State isShowAudioCom: boolean = false
49 // 国殇灰度管理 49 // 国殇灰度管理
50 GrayManage: SubscribedAbstractProperty<GrayManageModel> = AppStorage.link<GrayManageModel>('GrayManage') 50 GrayManage: SubscribedAbstractProperty<GrayManageModel> = AppStorage.link<GrayManageModel>('GrayManage')
  51 + @StorageLink('GestureLoadStrategy') GestureLoadStrategy: number = 0
51 52
52 async aboutToAppear() { 53 async aboutToAppear() {
53 // 背景图高度 54 // 背景图高度
@@ -161,15 +162,30 @@ export struct VideoChannelPage { @@ -161,15 +162,30 @@ export struct VideoChannelPage {
161 .width(CommonUtils.calTopTabWidth(36, item.iconUrlSize)) 162 .width(CommonUtils.calTopTabWidth(36, item.iconUrlSize))
162 .enabled(false) 163 .enabled(false)
163 } else { 164 } else {
  165 + Stack({ alignContent: Alignment.TopEnd }){
164 Text(item.name) 166 Text(item.name)
165 .fontSize($r('app.float.selected_text_size')) 167 .fontSize($r('app.float.selected_text_size'))
166 .fontWeight(this.currentTopNavSelectedIndex === index ? FontWeight.Bold : FontWeight.Normal) 168 .fontWeight(this.currentTopNavSelectedIndex === index ? FontWeight.Bold : FontWeight.Normal)
167 .fontColor(this.getTopNavFontColor(item, index)) 169 .fontColor(this.getTopNavFontColor(item, index))
  170 + .maxLines(this.MAX_LINE)
  171 + if (item.name == '直播') {
  172 + Button()
  173 + .type(ButtonType.Circle)
  174 + .width(6)
  175 + .height(6)
  176 + .backgroundColor('#ED2800')
  177 + .position({
  178 + x: 36,
  179 + y: -4
  180 + })
  181 + .visibility(this.GestureLoadStrategy == 0 ? Visibility.Visible : Visibility.Hidden)
  182 + }
  183 + }
168 .padding({ 184 .padding({
169 top: $r('app.float.top_tab_item_padding_top'), 185 top: $r('app.float.top_tab_item_padding_top'),
170 bottom: $r('app.float.top_tab_item_padding_bottom') 186 bottom: $r('app.float.top_tab_item_padding_bottom')
171 }) 187 })
172 - .maxLines(this.MAX_LINE) 188 +
173 189
174 Image($r('app.media.icon_channel_active'))// .colorFilter(ColorUtils.getDrawingColorFilter(this.getBothColor(""))) 190 Image($r('app.media.icon_channel_active'))// .colorFilter(ColorUtils.getDrawingColorFilter(this.getBothColor("")))
175 .width(20) 191 .width(20)
@@ -186,7 +202,7 @@ export struct VideoChannelPage { @@ -186,7 +202,7 @@ export struct VideoChannelPage {
186 // 视频tab埋点 202 // 视频tab埋点
187 const tab = this.topNavList[index] 203 const tab = this.topNavList[index]
188 this.handleAudio(tab) 204 this.handleAudio(tab)
189 - Logger.info(TAG, `视频tab埋点: ${JSON.stringify(tab)}`); 205 + // Logger.info(TAG, `视频tab埋点: ${JSON.stringify(tab)}`);
190 const params: ParamType = { 206 const params: ParamType = {
191 "pageName": tab.name, 207 "pageName": tab.name,
192 "tabName": tab.name, 208 "tabName": tab.name,