developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
wangliang_wd
1436e6a9 2 parents 77161a5c 296bc73d

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

* 'main' of http://192.168.1.42/developOne/harmonyPool:
  fix |> 20762 一键登录，切换登录方式文案应调整为-“其它手机号登录”
  fix |> 20568 【依赖华为】我的评论列表中，上方展示的昵称，换行比安卓早，并且等级的位置展示不正确
  fix |> 搜索-热门搜索 布局单位 lpx 改成 vp
  fix |> 20602 【生产环境】【第三次内部验收】直播频道横滑卡，左滑时，松手跳转手势-查看更多发生抖动；
  fix |> 20793 搜索结果页，聚合的搜索结果，出现在第一条上面不要分割，出现在页面中间上下都要有粗分割线，鸿蒙现状：出现在页面中间，上分割线未加粗
  ref |> 更新默认垫片图片
  fix |> 20302 uat>导航换肤，新闻频道列表页，内容区背景未展示换肤图片(顶部圆角显示)
  ref |> 更新App版本号7402
Inline Side-by-side
Showing 53 changed files with 423 additions and 241 deletions
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 "app": { 2 "app": {
3 "bundleName": "com.peopledailychina.hosactivity", 3 "bundleName": "com.peopledailychina.hosactivity",
4 "vendor": "$string:app_vendor", 4 "vendor": "$string:app_vendor",
5 - "versionCode": 7401,  
6 - "versionName": "7.4.0.1", 5 + "versionCode": 7402,
  6 + "versionName": "7.4.0.2",
7 "icon": "$media:app_icon", 7 "icon": "$media:app_icon",
8 "label": "$string:app_name" 8 "label": "$string:app_name"
9 } 9 }
@@ -113,6 +113,8 @@ export class ContentDTO implements BaseDTO { @@ -113,6 +113,8 @@ export class ContentDTO implements BaseDTO {
113 sameContentListJson:string = "" 113 sameContentListJson:string = ""
114 sameContentListSize:number = 0 114 sameContentListSize:number = 0
115 sameContentListId:string = "" 115 sameContentListId:string = ""
  116 + isAggregateData:boolean = false
  117 +
116 /* 118 /*
117 本地辅助字段 119 本地辅助字段
118 */ 120 */
@@ -64,7 +64,10 @@ export struct CardParser { @@ -64,7 +64,10 @@ export struct CardParser {
64 // Text(JSON.stringify(this.contentDTO.appStyle)) 64 // Text(JSON.stringify(this.contentDTO.appStyle))
65 // Text(this.contentDTO.newsTitle) 65 // Text(this.contentDTO.newsTitle)
66 this.contentBuilder(this.contentDTO); 66 this.contentBuilder(this.contentDTO);
67 - } 67 + }.borderRadius({
  68 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  69 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  70 + })
68 } 71 }
69 72
70 @Builder 73 @Builder
@@ -86,7 +89,8 @@ export struct CardParser { @@ -86,7 +89,8 @@ export struct CardParser {
86 contentDTO, 89 contentDTO,
87 compDTO: this.compDTO, 90 compDTO: this.compDTO,
88 pageId: this.pageId, 91 pageId: this.pageId,
89 - pageName: this.pageName 92 + pageName: this.pageName,
  93 + compIndex:this.compIndex
90 }) 94 })
91 this.getBehindDivider() 95 this.getBehindDivider()
92 } else { 96 } else {
@@ -96,7 +100,8 @@ export struct CardParser { @@ -96,7 +100,8 @@ export struct CardParser {
96 contentDTO, 100 contentDTO,
97 pageId: this.pageId, 101 pageId: this.pageId,
98 pageName: this.pageName, 102 pageName: this.pageName,
99 - loadImg: this.loadImg 103 + loadImg: this.loadImg,
  104 + compIndex:this.compIndex
100 }) 105 })
101 this.getBehindDivider() 106 this.getBehindDivider()
102 } else if (contentDTO.appStyle === CompStyle.Card_03) { 107 } else if (contentDTO.appStyle === CompStyle.Card_03) {
@@ -104,7 +109,8 @@ export struct CardParser { @@ -104,7 +109,8 @@ export struct CardParser {
104 compDTO: this.compDTO, 109 compDTO: this.compDTO,
105 contentDTO, 110 contentDTO,
106 pageId: this.pageId, 111 pageId: this.pageId,
107 - pageName: this.pageName, loadImg: this.loadImg 112 + pageName: this.pageName, loadImg: this.loadImg,
  113 + compIndex:this.compIndex
108 }) 114 })
109 this.getBehindDivider() 115 this.getBehindDivider()
110 } else if (contentDTO.appStyle === CompStyle.Card_04) { 116 } else if (contentDTO.appStyle === CompStyle.Card_04) {
@@ -112,7 +118,8 @@ export struct CardParser { @@ -112,7 +118,8 @@ export struct CardParser {
112 compDTO: this.compDTO, 118 compDTO: this.compDTO,
113 contentDTO, 119 contentDTO,
114 pageId: this.pageId, 120 pageId: this.pageId,
115 - pageName: this.pageName, loadImg: this.loadImg 121 + pageName: this.pageName, loadImg: this.loadImg,
  122 + compIndex:this.compIndex
116 }) 123 })
117 this.getBehindDivider() 124 this.getBehindDivider()
118 } else if (contentDTO.appStyle === CompStyle.Card_05) { 125 } else if (contentDTO.appStyle === CompStyle.Card_05) {
@@ -121,7 +128,8 @@ export struct CardParser { @@ -121,7 +128,8 @@ export struct CardParser {
121 contentDTO, 128 contentDTO,
122 titleShowPolicy: this.compDTO.titleShowPolicy, 129 titleShowPolicy: this.compDTO.titleShowPolicy,
123 pageId: this.pageId, 130 pageId: this.pageId,
124 - pageName: this.pageName, loadImg: this.loadImg 131 + pageName: this.pageName, loadImg: this.loadImg,
  132 + compIndex:this.compIndex
125 }) 133 })
126 this.getBehindDivider() 134 this.getBehindDivider()
127 } else if (contentDTO.appStyle === CompStyle.Card_06 || contentDTO.appStyle === CompStyle.Card_13) { 135 } else if (contentDTO.appStyle === CompStyle.Card_06 || contentDTO.appStyle === CompStyle.Card_13) {
@@ -129,7 +137,8 @@ export struct CardParser { @@ -129,7 +137,8 @@ export struct CardParser {
129 compDTO: this.compDTO, 137 compDTO: this.compDTO,
130 contentDTO: this.contentDTO, 138 contentDTO: this.contentDTO,
131 pageId: this.pageId, 139 pageId: this.pageId,
132 - pageName: this.pageName, loadImg: this.loadImg 140 + pageName: this.pageName, loadImg: this.loadImg,
  141 + compIndex:this.compIndex
133 }) 142 })
134 this.getBehindDivider() 143 this.getBehindDivider()
135 } else if (contentDTO.appStyle === CompStyle.Card_10 || contentDTO.appStyle === CompStyle.Card_09) { 144 } else if (contentDTO.appStyle === CompStyle.Card_10 || contentDTO.appStyle === CompStyle.Card_09) {
@@ -137,7 +146,8 @@ export struct CardParser { @@ -137,7 +146,8 @@ export struct CardParser {
137 compDTO: this.compDTO, 146 compDTO: this.compDTO,
138 contentDTO, 147 contentDTO,
139 pageId: this.pageId, 148 pageId: this.pageId,
140 - pageName: this.pageName, loadImg: this.loadImg 149 + pageName: this.pageName, loadImg: this.loadImg,
  150 + compIndex:this.compIndex
141 }) 151 })
142 this.getBehindDivider() 152 this.getBehindDivider()
143 } else if (contentDTO.appStyle === CompStyle.Card_11) { 153 } else if (contentDTO.appStyle === CompStyle.Card_11) {
@@ -145,7 +155,8 @@ export struct CardParser { @@ -145,7 +155,8 @@ export struct CardParser {
145 compDTO: this.compDTO, 155 compDTO: this.compDTO,
146 contentDTO, 156 contentDTO,
147 pageId: this.pageId, 157 pageId: this.pageId,
148 - pageName: this.pageName 158 + pageName: this.pageName,
  159 + compIndex:this.compIndex
149 }) 160 })
150 this.getBehindDivider() 161 this.getBehindDivider()
151 } else if (contentDTO.appStyle === CompStyle.Card_12) { 162 } else if (contentDTO.appStyle === CompStyle.Card_12) {
@@ -153,7 +164,8 @@ export struct CardParser { @@ -153,7 +164,8 @@ export struct CardParser {
153 compDTO: this.compDTO, 164 compDTO: this.compDTO,
154 contentDTO, 165 contentDTO,
155 pageId: this.pageId, 166 pageId: this.pageId,
156 - pageName: this.pageName, loadImg: this.loadImg 167 + pageName: this.pageName, loadImg: this.loadImg,
  168 + compIndex:this.compIndex
157 169
158 }) 170 })
159 this.getBehindDivider() 171 this.getBehindDivider()
@@ -162,7 +174,8 @@ export struct CardParser { @@ -162,7 +174,8 @@ export struct CardParser {
162 contentDTO, 174 contentDTO,
163 compDTO: this.compDTO, 175 compDTO: this.compDTO,
164 pageId: this.pageId, 176 pageId: this.pageId,
165 - pageName: this.pageName, loadImg: this.loadImg 177 + pageName: this.pageName, loadImg: this.loadImg,
  178 + compIndex:this.compIndex
166 }) 179 })
167 this.getBehindDivider() 180 this.getBehindDivider()
168 } else if (contentDTO.appStyle === CompStyle.Card_15) { 181 } else if (contentDTO.appStyle === CompStyle.Card_15) {
@@ -170,7 +183,8 @@ export struct CardParser { @@ -170,7 +183,8 @@ export struct CardParser {
170 contentDTO, 183 contentDTO,
171 compDTO: this.compDTO, 184 compDTO: this.compDTO,
172 pageId: this.pageId, 185 pageId: this.pageId,
173 - pageName: this.pageName, loadImg: this.loadImg 186 + pageName: this.pageName, loadImg: this.loadImg,
  187 + compIndex:this.compIndex
174 }) 188 })
175 this.getBehindDivider() 189 this.getBehindDivider()
176 } else if (contentDTO.appStyle === CompStyle.Card_16) { 190 } else if (contentDTO.appStyle === CompStyle.Card_16) {
@@ -178,7 +192,8 @@ export struct CardParser { @@ -178,7 +192,8 @@ export struct CardParser {
178 contentDTO, 192 contentDTO,
179 compDTO: this.compDTO, 193 compDTO: this.compDTO,
180 pageId: this.pageId, 194 pageId: this.pageId,
181 - pageName: this.pageName, loadImg: this.loadImg 195 + pageName: this.pageName, loadImg: this.loadImg,
  196 + compIndex:this.compIndex
182 }) 197 })
183 this.getBehindDivider() 198 this.getBehindDivider()
184 } else if (contentDTO.appStyle === CompStyle.Card_17) { 199 } else if (contentDTO.appStyle === CompStyle.Card_17) {
@@ -186,7 +201,8 @@ export struct CardParser { @@ -186,7 +201,8 @@ export struct CardParser {
186 compDTO: this.compDTO, 201 compDTO: this.compDTO,
187 contentDTO, 202 contentDTO,
188 pageId: this.pageId, 203 pageId: this.pageId,
189 - pageName: this.pageName, loadImg: this.loadImg 204 + pageName: this.pageName, loadImg: this.loadImg,
  205 + compIndex:this.compIndex
190 }) 206 })
191 this.getBehindDivider() 207 this.getBehindDivider()
192 } else if (contentDTO.appStyle === CompStyle.Card_19) { 208 } else if (contentDTO.appStyle === CompStyle.Card_19) {
@@ -195,7 +211,8 @@ export struct CardParser { @@ -195,7 +211,8 @@ export struct CardParser {
195 compDTO: this.compDTO, 211 compDTO: this.compDTO,
196 pageId: this.pageId, 212 pageId: this.pageId,
197 pageName: this.pageName, 213 pageName: this.pageName,
198 - isPeopleShipHome:this.isPeopleShipHome, loadImg: this.loadImg 214 + isPeopleShipHome:this.isPeopleShipHome, loadImg: this.loadImg,
  215 + compIndex:this.compIndex
199 }) 216 })
200 this.getBehindDivider() 217 this.getBehindDivider()
201 } else if (contentDTO.appStyle === CompStyle.Card_20) { 218 } else if (contentDTO.appStyle === CompStyle.Card_20) {
@@ -204,7 +221,8 @@ export struct CardParser { @@ -204,7 +221,8 @@ export struct CardParser {
204 compDTO: this.compDTO, 221 compDTO: this.compDTO,
205 pageId: this.pageId, 222 pageId: this.pageId,
206 pageName: this.pageName, 223 pageName: this.pageName,
207 - isPeopleShipHome:this.isPeopleShipHome, loadImg: this.loadImg 224 + isPeopleShipHome:this.isPeopleShipHome, loadImg: this.loadImg,
  225 + compIndex:this.compIndex
208 }) 226 })
209 this.getBehindDivider() 227 this.getBehindDivider()
210 } else if (contentDTO.appStyle === CompStyle.Card_21) { 228 } else if (contentDTO.appStyle === CompStyle.Card_21) {
@@ -212,7 +230,8 @@ export struct CardParser { @@ -212,7 +230,8 @@ export struct CardParser {
212 contentDTO, 230 contentDTO,
213 compDTO: this.compDTO, 231 compDTO: this.compDTO,
214 pageId: this.pageId, 232 pageId: this.pageId,
215 - pageName: this.pageName, loadImg: this.loadImg 233 + pageName: this.pageName, loadImg: this.loadImg,
  234 + compIndex:this.compIndex
216 }) 235 })
217 this.getBehindDivider() 236 this.getBehindDivider()
218 } else if (contentDTO.appStyle === CompStyle.Card_Comp_Live_Big_Image_01) { 237 } else if (contentDTO.appStyle === CompStyle.Card_Comp_Live_Big_Image_01) {
@@ -221,7 +240,8 @@ export struct CardParser { @@ -221,7 +240,8 @@ export struct CardParser {
221 compDTO: this.compDTO, 240 compDTO: this.compDTO,
222 pageId: this.pageId, 241 pageId: this.pageId,
223 pageName: this.pageName, 242 pageName: this.pageName,
224 - index: this.compIndex, loadImg: this.loadImg 243 + index: this.compIndex, loadImg: this.loadImg,
  244 + compIndex:this.compIndex
225 }) 245 })
226 this.getBehindDivider() 246 this.getBehindDivider()
227 } else if (contentDTO.appStyle === CompStyle.Card_Comp_Live_Big_Image_02) { 247 } else if (contentDTO.appStyle === CompStyle.Card_Comp_Live_Big_Image_02) {
@@ -230,7 +250,8 @@ export struct CardParser { @@ -230,7 +250,8 @@ export struct CardParser {
230 compDTO: this.compDTO, 250 compDTO: this.compDTO,
231 pageId: this.pageId, 251 pageId: this.pageId,
232 pageName: this.pageName, 252 pageName: this.pageName,
233 - index:this.compIndex, loadImg: this.loadImg 253 + index:this.compIndex, loadImg: this.loadImg,
  254 + compIndex:this.compIndex
234 }) 255 })
235 this.getBehindDivider() 256 this.getBehindDivider()
236 } else { 257 } else {
@@ -74,13 +74,22 @@ export struct CompParser { @@ -74,13 +74,22 @@ export struct CompParser {
74 Column() { 74 Column() {
75 // Text('CompParser') 75 // Text('CompParser')
76 // Text(JSON.stringify(this.compDTO.compStyle)) 76 // Text(JSON.stringify(this.compDTO.compStyle))
77 - this.componentBuilder();  
78 - }  
79 - .margin({ 77 + Column(){
  78 + this.componentBuilder();
  79 + }.borderRadius({
  80 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  81 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  82 + })
  83 +
  84 + }.borderRadius({
  85 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius') : 0,
  86 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius') : 0
  87 + })
  88 + /*.margin({
80 left: this.compDTO.compStyle === CompStyle.Zh_Single_Row_04 ? 0 : 6, 89 left: this.compDTO.compStyle === CompStyle.Zh_Single_Row_04 ? 0 : 6,
81 right: (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05 || this.compDTO.compStyle === CompStyle.Zh_Single_Row_02 || 90 right: (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05 || this.compDTO.compStyle === CompStyle.Zh_Single_Row_02 ||
82 this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) ? 0 : 6 91 this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) ? 0 : 6
83 - }) 92 + })*/
84 } 93 }
85 94
86 // @Builder 95 // @Builder
@@ -115,17 +124,17 @@ export struct CompParser { @@ -115,17 +124,17 @@ export struct CompParser {
115 if (this.compDTO.operDataList[0]?.objectType !== '3' && 124 if (this.compDTO.operDataList[0]?.objectType !== '3' &&
116 this.compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口 125 this.compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口
117 if (this.compDTO.compStyle === CompStyle.Label_03) { 126 if (this.compDTO.compStyle === CompStyle.Label_03) {
118 - LabelComponent({ compDTO: this.compDTO }) 127 + LabelComponent({ compDTO: this.compDTO ,compIndex: this.compIndex})
119 this.getBehindDivider() 128 this.getBehindDivider()
120 } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) { 129 } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
121 if (this.compDTO.operDataList.length > this.audioItems.length) { 130 if (this.compDTO.operDataList.length > this.audioItems.length) {
122 - ZhCarouselLayout01({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg }) 131 + ZhCarouselLayout01({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,compIndex: this.compIndex})
123 } 132 }
124 this.getBehindDivider() 133 this.getBehindDivider()
125 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && 134 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 &&
126 this.compDTO.imageScale === 2) { // && compDTO.name ==="横划卡" 135 this.compDTO.imageScale === 2) { // && compDTO.name ==="横划卡"
127 // Text('LiveHorizontalCardComponent') 136 // Text('LiveHorizontalCardComponent')
128 - LiveHorizontalCardComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg }) 137 + LiveHorizontalCardComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,compIndex: this.compIndex})
129 this.getBehindDivider() 138 this.getBehindDivider()
130 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && this.compDTO.imageScale === 3) { 139 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && this.compDTO.imageScale === 3) {
131 if (this.compDTO.operDataList.length > 1) { 140 if (this.compDTO.operDataList.length > 1) {
@@ -133,26 +142,26 @@ export struct CompParser { @@ -133,26 +142,26 @@ export struct CompParser {
133 HorizontalStrokeCardThreeTwoRadioForMoreComponent({ 142 HorizontalStrokeCardThreeTwoRadioForMoreComponent({
134 compDTO: this.compDTO, 143 compDTO: this.compDTO,
135 pageId: this.pageId, 144 pageId: this.pageId,
136 - pageName: this.pageName, loadImg: this.pageModel.loadImg 145 + pageName: this.pageName, loadImg: this.pageModel.loadImg,compIndex: this.compIndex
137 }) 146 })
138 } else { 147 } else {
139 // Text('HorizontalStrokeCardThreeTwoRadioForOneComponent') 148 // Text('HorizontalStrokeCardThreeTwoRadioForOneComponent')
140 HorizontalStrokeCardThreeTwoRadioForOneComponent({ 149 HorizontalStrokeCardThreeTwoRadioForOneComponent({
141 compDTO: this.compDTO, 150 compDTO: this.compDTO,
142 pageId: this.pageId, 151 pageId: this.pageId,
143 - pageName: this.pageName, loadImg: this.pageModel.loadImg 152 + pageName: this.pageName, loadImg: this.pageModel.loadImg,compIndex: this.compIndex
144 }) 153 })
145 } 154 }
146 this.getBehindDivider() 155 this.getBehindDivider()
147 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) { 156 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) {
148 - ZhSingleRow02({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg }) 157 + ZhSingleRow02({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,compIndex: this.compIndex})
149 this.getBehindDivider() 158 this.getBehindDivider()
150 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) { 159 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
151 - ZhSingleRow03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg }) 160 + ZhSingleRow03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,compIndex: this.compIndex})
152 this.getBehindDivider() 161 this.getBehindDivider()
153 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题 162 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题
154 //ZhGridLayout02({ compDTO: this.compDTO }) 163 //ZhGridLayout02({ compDTO: this.compDTO })
155 - CompNormalTitle({ compDTO: this.compDTO }) 164 + CompNormalTitle({ compDTO: this.compDTO ,compIndex: this.compIndex})
156 // this.getBehindDivider() 165 // this.getBehindDivider()
157 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 166 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Zh_Grid_Layout_02) { //双列流小视频,一行两图卡
158 167
@@ -160,20 +169,20 @@ export struct CompParser { @@ -160,20 +169,20 @@ export struct CompParser {
160 compDTO: this.compDTO, 169 compDTO: this.compDTO,
161 operDataList: this.compDTO.operDataList, 170 operDataList: this.compDTO.operDataList,
162 pageId: this.pageId, 171 pageId: this.pageId,
163 - pageName: this.pageName, loadImg: this.pageModel.loadImg 172 + pageName: this.pageName, loadImg: this.pageModel.loadImg,compIndex: this.compIndex
164 }) 173 })
165 // this.getBehindDivider() 174 // this.getBehindDivider()
166 175
167 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) { 176 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
168 - ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg }) 177 + ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,compIndex: this.compIndex})
169 this.getBehindDivider() 178 this.getBehindDivider()
170 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) { 179 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
171 - ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,bottomNavi:this.bottomNavi}) 180 + ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,bottomNavi:this.bottomNavi,compIndex: this.compIndex})
172 this.getBehindDivider() 181 this.getBehindDivider()
173 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) { 182 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
174 // ZhSingleRow05({ compDTO }) 183 // ZhSingleRow05({ compDTO })
175 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) { 184 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) {
176 - ZhSingleRow06({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg }) 185 + ZhSingleRow06({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,compIndex: this.compIndex})
177 this.getBehindDivider() 186 this.getBehindDivider()
178 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) { 187 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
179 //头图卡 和comStyle 2相同， 188 //头图卡 和comStyle 2相同，
@@ -183,7 +192,7 @@ export struct CompParser { @@ -183,7 +192,7 @@ export struct CompParser {
183 titleShowPolicy: this.compDTO.titleShowPolicy, 192 titleShowPolicy: this.compDTO.titleShowPolicy,
184 pageId: this.pageId, 193 pageId: this.pageId,
185 pageName: this.pageName, 194 pageName: this.pageName,
186 - loadImg: this.pageModel.loadImg 195 + loadImg: this.pageModel.loadImg,compIndex: this.compIndex
187 }) 196 })
188 this.getBehindDivider() 197 this.getBehindDivider()
189 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) { 198 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) {
@@ -193,7 +202,7 @@ export struct CompParser { @@ -193,7 +202,7 @@ export struct CompParser {
193 contentDTO: this.compDTO.operDataList[0], 202 contentDTO: this.compDTO.operDataList[0],
194 pageId: this.pageId, 203 pageId: this.pageId,
195 pageName: this.pageName, 204 pageName: this.pageName,
196 - loadImg: this.pageModel.loadImg 205 + loadImg: this.pageModel.loadImg,compIndex: this.compIndex
197 }) 206 })
198 this.getBehindDivider() 207 this.getBehindDivider()
199 } else if (this.compDTO.compStyle === CompStyle.Card_09) { 208 } else if (this.compDTO.compStyle === CompStyle.Card_09) {
@@ -202,7 +211,7 @@ export struct CompParser { @@ -202,7 +211,7 @@ export struct CompParser {
202 compDTO: this.compDTO, 211 compDTO: this.compDTO,
203 contentDTO: this.compDTO.operDataList[0], 212 contentDTO: this.compDTO.operDataList[0],
204 pageId: this.pageId, 213 pageId: this.pageId,
205 - pageName: this.pageName, loadImg: this.pageModel.loadImg 214 + pageName: this.pageName, loadImg: this.pageModel.loadImg,compIndex: this.compIndex
206 }) 215 })
207 this.getBehindDivider() 216 this.getBehindDivider()
208 } else if (this.compDTO.compStyle === CompStyle.Card_13) { 217 } else if (this.compDTO.compStyle === CompStyle.Card_13) {
@@ -210,7 +219,7 @@ export struct CompParser { @@ -210,7 +219,7 @@ export struct CompParser {
210 compDTO: this.compDTO, 219 compDTO: this.compDTO,
211 contentDTO: this.compDTO.operDataList[0], 220 contentDTO: this.compDTO.operDataList[0],
212 pageId: this.pageId, 221 pageId: this.pageId,
213 - pageName: this.pageName, loadImg: this.pageModel.loadImg 222 + pageName: this.pageName, loadImg: this.pageModel.loadImg,compIndex: this.compIndex
214 }) 223 })
215 this.getBehindDivider() 224 this.getBehindDivider()
216 } else if (this.compDTO.compStyle === CompStyle.Card_03) { 225 } else if (this.compDTO.compStyle === CompStyle.Card_03) {
@@ -218,11 +227,11 @@ export struct CompParser { @@ -218,11 +227,11 @@ export struct CompParser {
218 compDTO: this.compDTO, 227 compDTO: this.compDTO,
219 contentDTO: this.compDTO.operDataList[0], 228 contentDTO: this.compDTO.operDataList[0],
220 pageId: this.pageId, 229 pageId: this.pageId,
221 - pageName: this.pageName, loadImg: this.pageModel.loadImg 230 + pageName: this.pageName, loadImg: this.pageModel.loadImg,compIndex: this.compIndex
222 }) 231 })
223 this.getBehindDivider() 232 this.getBehindDivider()
224 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) { 233 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
225 - ZhSingleColumn04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) 234 + ZhSingleColumn04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName ,compIndex: this.compIndex})
226 this.getBehindDivider() 235 this.getBehindDivider()
227 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) { 236 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) {
228 // ZhSingleColumn05({ compDTO: compDTO }) 237 // ZhSingleColumn05({ compDTO: compDTO })
@@ -230,7 +239,7 @@ export struct CompParser { @@ -230,7 +239,7 @@ export struct CompParser {
230 ZhSingleColumn09({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, pageModel: this.pageModel, compIndex: this.compIndex, loadImg: this.pageModel.loadImg }) 239 ZhSingleColumn09({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, pageModel: this.pageModel, compIndex: this.compIndex, loadImg: this.pageModel.loadImg })
231 this.getBehindDivider() 240 this.getBehindDivider()
232 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告 241 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告
233 - AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO }) 242 + AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO ,compIndex: this.compIndex})
234 this.getBehindDivider() 243 this.getBehindDivider()
235 //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 0, right: 0 }) 244 //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 0, right: 0 })
236 } else if (!Number.isNaN(Number(this.compDTO.compStyle)) || this.compDTO.compType === 'appStyle') { 245 } else if (!Number.isNaN(Number(this.compDTO.compStyle)) || this.compDTO.compType === 'appStyle') {
@@ -21,7 +21,7 @@ import PageModel from '../../viewmodel/PageModel'; @@ -21,7 +21,7 @@ import PageModel from '../../viewmodel/PageModel';
21 export struct AdvCardParser { 21 export struct AdvCardParser {
22 @State compDTO: CompDTO = {} as CompDTO; 22 @State compDTO: CompDTO = {} as CompDTO;
23 pageModel: PageModel = new PageModel(); 23 pageModel: PageModel = new PageModel();
24 - 24 + @State compIndex: number = 0;
25 25
26 26
27 build() { 27 build() {
@@ -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, loadImg: this.pageModel.loadImg }) 34 + CardAdvThreeImageComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg ,compIndex:this.compIndex})
35 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_6) { //小图广告 35 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_6) { //小图广告
36 - CardAdvSmallImageComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg }) 36 + CardAdvSmallImageComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg ,compIndex:this.compIndex})
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, loadImg: this.pageModel.loadImg }) 39 + CardAdvLongImageComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg ,compIndex:this.compIndex})
40 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_8) { //大图广告 40 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_8) { //大图广告
41 - CardAdvBigImageComponent({ pageModel, compDTO , loadImg: this.pageModel.loadImg}) 41 + CardAdvBigImageComponent({ pageModel, compDTO , loadImg: this.pageModel.loadImg,compIndex:this.compIndex})
42 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_9) { //视频广告 42 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_9) { //视频广告
43 - CardAdvVideoComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg }) 43 + CardAdvVideoComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg ,compIndex:this.compIndex})
44 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_10) { //展会广告 44 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_10) { //展会广告
45 - CardAdvVideoExComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg}) 45 + CardAdvVideoExComponent({ pageModel, compDTO, loadImg: this.pageModel.loadImg,compIndex:this.compIndex})
46 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_11) { //冠名广告 46 } else if (compDTO.matInfo.advSubType === CompStyle.Card_Adv_11) { //冠名广告
47 - CardAdvGanMiComponent({ pageModel, compDTO , loadImg: this.pageModel.loadImg}) 47 + CardAdvGanMiComponent({ pageModel, compDTO , loadImg: this.pageModel.loadImg,compIndex:this.compIndex})
48 } 48 }
49 } 49 }
50 } 50 }
@@ -18,6 +18,7 @@ const TAG: string = 'Card2Component'; @@ -18,6 +18,7 @@ const TAG: string = 'Card2Component';
18 @Component 18 @Component
19 export struct CardAdvBigImageComponent { 19 export struct CardAdvBigImageComponent {
20 @State compDTO: CompDTO = {} as CompDTO 20 @State compDTO: CompDTO = {} as CompDTO
  21 + @State compIndex: number = 0;
21 22
22 @Prop loadImg: boolean = true; 23 @Prop loadImg: boolean = true;
23 pageModel: PageModel = new PageModel(); 24 pageModel: PageModel = new PageModel();
@@ -53,6 +54,10 @@ export struct CardAdvBigImageComponent { @@ -53,6 +54,10 @@ export struct CardAdvBigImageComponent {
53 top: 8, 54 top: 8,
54 }) 55 })
55 } 56 }
  57 + .borderRadius({
  58 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  59 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  60 + })
56 .width(CommonConstants.FULL_WIDTH) 61 .width(CommonConstants.FULL_WIDTH)
57 .padding({ 62 .padding({
58 left: 10, 63 left: 10,
@@ -26,6 +26,8 @@ export struct CardAdvGanMiComponent { @@ -26,6 +26,8 @@ export struct CardAdvGanMiComponent {
26 @State advLength: number = 0; 26 @State advLength: number = 0;
27 pageModel: PageModel = new PageModel(); 27 pageModel: PageModel = new PageModel();
28 @Prop loadImg: boolean = true; 28 @Prop loadImg: boolean = true;
  29 + @State compIndex: number = 0;
  30 +
29 31
30 async aboutToAppear(): Promise<void> { 32 async aboutToAppear(): Promise<void> {
31 // this.loadImg = await onlyWifiLoadImg(); 33 // this.loadImg = await onlyWifiLoadImg();
@@ -134,6 +136,10 @@ export struct CardAdvGanMiComponent { @@ -134,6 +136,10 @@ export struct CardAdvGanMiComponent {
134 this.commonButton() 136 this.commonButton()
135 137
136 } 138 }
  139 + .borderRadius({
  140 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  141 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  142 + })
137 .width(CommonConstants.FULL_WIDTH) 143 .width(CommonConstants.FULL_WIDTH)
138 .padding({ 144 .padding({
139 top: $r('app.float.card_comp_pagePadding_tb'), 145 top: $r('app.float.card_comp_pagePadding_tb'),
@@ -22,6 +22,7 @@ export struct CardAdvLongImageComponent { @@ -22,6 +22,7 @@ export struct CardAdvLongImageComponent {
22 @State haveTitle: boolean = true 22 @State haveTitle: boolean = true
23 pageModel: PageModel = new PageModel(); 23 pageModel: PageModel = new PageModel();
24 @Prop loadImg: boolean = true; 24 @Prop loadImg: boolean = true;
  25 + @State compIndex: number = 0;
25 26
26 async aboutToAppear(): Promise<void> { 27 async aboutToAppear(): Promise<void> {
27 // this.loadImg = await onlyWifiLoadImg(); 28 // this.loadImg = await onlyWifiLoadImg();
@@ -55,6 +56,10 @@ export struct CardAdvLongImageComponent { @@ -55,6 +56,10 @@ export struct CardAdvLongImageComponent {
55 top: 8, 56 top: 8,
56 }) 57 })
57 } 58 }
  59 + .borderRadius({
  60 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  61 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  62 + })
58 .width(CommonConstants.FULL_WIDTH) 63 .width(CommonConstants.FULL_WIDTH)
59 .padding({ 64 .padding({
60 left: 10, 65 left: 10,
@@ -24,6 +24,7 @@ export struct CardAdvSmallImageComponent { @@ -24,6 +24,7 @@ export struct CardAdvSmallImageComponent {
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 @Prop loadImg: boolean = true; 26 @Prop loadImg: boolean = true;
  27 + @State compIndex: number = 0;
27 28
28 async aboutToAppear(): Promise<void> { 29 async aboutToAppear(): Promise<void> {
29 // this.loadImg = await onlyWifiLoadImg(); 30 // this.loadImg = await onlyWifiLoadImg();
@@ -85,6 +86,10 @@ export struct CardAdvSmallImageComponent { @@ -85,6 +86,10 @@ export struct CardAdvSmallImageComponent {
85 }) 86 })
86 87
87 } 88 }
  89 + .borderRadius({
  90 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  91 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  92 + })
88 .width("100%") 93 .width("100%")
89 .height(this.isBigThreeLine ? 127 : 106) 94 .height(this.isBigThreeLine ? 127 : 106)
90 .padding({ 95 .padding({
@@ -21,6 +21,7 @@ export struct CardAdvThreeImageComponent { @@ -21,6 +21,7 @@ export struct CardAdvThreeImageComponent {
21 @State compDTO: CompDTO = {} as CompDTO 21 @State compDTO: CompDTO = {} as CompDTO
22 @Prop loadImg: boolean = true; 22 @Prop loadImg: boolean = true;
23 pageModel: PageModel = new PageModel(); 23 pageModel: PageModel = new PageModel();
  24 + @State compIndex: number = 0;
24 25
25 async aboutToAppear(): Promise<void> { 26 async aboutToAppear(): Promise<void> {
26 // this.loadImg = await onlyWifiLoadImg(); 27 // this.loadImg = await onlyWifiLoadImg();
@@ -78,6 +79,10 @@ export struct CardAdvThreeImageComponent { @@ -78,6 +79,10 @@ export struct CardAdvThreeImageComponent {
78 }) 79 })
79 80
80 } 81 }
  82 + .borderRadius({
  83 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  84 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  85 + })
81 .width(CommonConstants.FULL_WIDTH) 86 .width(CommonConstants.FULL_WIDTH)
82 .padding({ 87 .padding({
83 left: 10, 88 left: 10,
@@ -23,6 +23,7 @@ export struct CardAdvVideoComponent { @@ -23,6 +23,7 @@ export struct CardAdvVideoComponent {
23 @State contentDTO: ContentDTO = new ContentDTO() 23 @State contentDTO: ContentDTO = new ContentDTO()
24 @Prop loadImg: boolean = true; 24 @Prop loadImg: boolean = true;
25 pageModel: PageModel = new PageModel(); 25 pageModel: PageModel = new PageModel();
  26 + @State compIndex: number = 0;
26 27
27 async aboutToAppear(): Promise<void> { 28 async aboutToAppear(): Promise<void> {
28 // this.loadImg = await onlyWifiLoadImg(); 29 // this.loadImg = await onlyWifiLoadImg();
@@ -61,6 +62,10 @@ export struct CardAdvVideoComponent { @@ -61,6 +62,10 @@ export struct CardAdvVideoComponent {
61 top: 8, 62 top: 8,
62 }) 63 })
63 } 64 }
  65 + .borderRadius({
  66 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  67 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  68 + })
64 .width(CommonConstants.FULL_WIDTH) 69 .width(CommonConstants.FULL_WIDTH)
65 .padding({ 70 .padding({
66 left: 10, 71 left: 10,
@@ -23,6 +23,7 @@ export struct CardAdvVideoExComponent { @@ -23,6 +23,7 @@ export struct CardAdvVideoExComponent {
23 @State advExtraData: AdvExtraData = {} as AdvExtraData 23 @State advExtraData: AdvExtraData = {} as AdvExtraData
24 pageModel: PageModel = new PageModel(); 24 pageModel: PageModel = new PageModel();
25 @Prop loadImg: boolean = true; 25 @Prop loadImg: boolean = true;
  26 + @State compIndex: number = 0;
26 27
27 async aboutToAppear(): Promise<void> { 28 async aboutToAppear(): Promise<void> {
28 // this.loadImg = await onlyWifiLoadImg(); 29 // this.loadImg = await onlyWifiLoadImg();
@@ -84,6 +85,10 @@ export struct CardAdvVideoExComponent { @@ -84,6 +85,10 @@ export struct CardAdvVideoExComponent {
84 this.commonButton() 85 this.commonButton()
85 86
86 } 87 }
  88 + .borderRadius({
  89 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  90 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  91 + })
87 .width(CommonConstants.FULL_WIDTH) 92 .width(CommonConstants.FULL_WIDTH)
88 .padding({ 93 .padding({
89 left: 10, 94 left: 10,
@@ -31,6 +31,7 @@ export struct Card10Component { @@ -31,6 +31,7 @@ export struct Card10Component {
31 basePageHelp: BasePageHelp = new BasePageHelp 31 basePageHelp: BasePageHelp = new BasePageHelp
32 // 稿件参与批查，需要对列表信息单独重绘 32 // 稿件参与批查，需要对列表信息单独重绘
33 @State isBatchData: boolean = false 33 @State isBatchData: boolean = false
  34 + @State compIndex: number = 0;
34 35
35 async aboutToAppear(): Promise<void> { 36 async aboutToAppear(): Promise<void> {
36 console.log('Card10Component-compDTO', JSON.stringify(this.compDTO)) 37 console.log('Card10Component-compDTO', JSON.stringify(this.compDTO))
@@ -173,6 +174,10 @@ export struct Card10Component { @@ -173,6 +174,10 @@ export struct Card10Component {
173 }) 174 })
174 } 175 }
175 } 176 }
  177 + .borderRadius({
  178 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  179 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  180 + })
176 .width(CommonConstants.FULL_WIDTH) 181 .width(CommonConstants.FULL_WIDTH)
177 .padding({ 182 .padding({
178 left: 10, 183 left: 10,
@@ -25,6 +25,7 @@ export struct Card11Component { @@ -25,6 +25,7 @@ export struct Card11Component {
25 @ObjectLink compDTO: CompDTO 25 @ObjectLink compDTO: CompDTO
26 @State titleMarked: boolean = false; 26 @State titleMarked: boolean = false;
27 @State textArr: textItem[] = [] 27 @State textArr: textItem[] = []
  28 + @State compIndex: number = 0;
28 29
29 async aboutToAppear(): Promise<void> { 30 async aboutToAppear(): Promise<void> {
30 this.titleInit(); 31 this.titleInit();
@@ -95,6 +96,10 @@ export struct Card11Component { @@ -95,6 +96,10 @@ export struct Card11Component {
95 top: $r('app.float.card_comp_pagePadding_tb'), 96 top: $r('app.float.card_comp_pagePadding_tb'),
96 bottom: $r('app.float.card_comp_pagePadding_tb') 97 bottom: $r('app.float.card_comp_pagePadding_tb')
97 }) 98 })
  99 + .borderRadius({
  100 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  101 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  102 + })
98 .backgroundColor($r("app.color.white")) 103 .backgroundColor($r("app.color.white"))
99 .onClick((event: ClickEvent) => { 104 .onClick((event: ClickEvent) => {
100 ///我的收藏 编辑状态点击 105 ///我的收藏 编辑状态点击
@@ -24,6 +24,7 @@ export struct Card12Component { @@ -24,6 +24,7 @@ export struct Card12Component {
24 @State titleMarked: boolean = false; 24 @State titleMarked: boolean = false;
25 @State textArr: textItem[] = [] 25 @State textArr: textItem[] = []
26 @Prop loadImg: boolean = true; 26 @Prop loadImg: boolean = true;
  27 + @State compIndex: number = 0;
27 28
28 aboutToAppear(): void { 29 aboutToAppear(): void {
29 this.titleInit(); 30 this.titleInit();
@@ -78,6 +79,10 @@ export struct Card12Component { @@ -78,6 +79,10 @@ export struct Card12Component {
78 } 79 }
79 CarderInteraction({contentDTO: this.contentDTO}) 80 CarderInteraction({contentDTO: this.contentDTO})
80 } 81 }
  82 + .borderRadius({
  83 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  84 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  85 + })
81 .padding({ 86 .padding({
82 left: 10, 87 left: 10,
83 right: 10, 88 right: 10,
@@ -25,6 +25,7 @@ export struct Card14Component { @@ -25,6 +25,7 @@ export struct Card14Component {
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[] = []
  28 + @State compIndex: number = 0;
28 29
29 async aboutToAppear(): Promise<void> { 30 async aboutToAppear(): Promise<void> {
30 this.titleInit(); 31 this.titleInit();
@@ -99,6 +100,10 @@ export struct Card14Component { @@ -99,6 +100,10 @@ export struct Card14Component {
99 100
100 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件 101 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
101 } 102 }
  103 + .borderRadius({
  104 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  105 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  106 + })
102 .padding({ 107 .padding({
103 left: 10, 108 left: 10,
104 right: 10, 109 right: 10,
@@ -29,6 +29,7 @@ export struct Card15Component { @@ -29,6 +29,7 @@ export struct Card15Component {
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[] = []
  32 + @State compIndex: number = 0;
32 33
33 async aboutToAppear(): Promise<void> { 34 async aboutToAppear(): Promise<void> {
34 this.titleInit(); 35 this.titleInit();
@@ -97,6 +98,10 @@ export struct Card15Component { @@ -97,6 +98,10 @@ export struct Card15Component {
97 CarderInteraction({contentDTO: this.contentDTO}) 98 CarderInteraction({contentDTO: this.contentDTO})
98 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件 99 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
99 } 100 }
  101 + .borderRadius({
  102 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  103 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  104 + })
100 .padding({ 105 .padding({
101 left: 10, 106 left: 10,
102 right: 10, 107 right: 10,
@@ -31,6 +31,7 @@ export struct Card16Component { @@ -31,6 +31,7 @@ export struct Card16Component {
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[] = []
  34 + @State compIndex: number = 0;
34 35
35 async aboutToAppear(): Promise<void> { 36 async aboutToAppear(): Promise<void> {
36 this.titleInit(); 37 this.titleInit();
@@ -130,6 +131,10 @@ export struct Card16Component { @@ -130,6 +131,10 @@ export struct Card16Component {
130 CarderInteraction({contentDTO: this.contentDTO}) 131 CarderInteraction({contentDTO: this.contentDTO})
131 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件 132 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
132 } 133 }
  134 + .borderRadius({
  135 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  136 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  137 + })
133 .padding({ 138 .padding({
134 left: 10, 139 left: 10,
135 right: 10, 140 right: 10,
@@ -26,6 +26,7 @@ export struct Card17Component { @@ -26,6 +26,7 @@ export struct Card17Component {
26 @ObjectLink compDTO: CompDTO 26 @ObjectLink compDTO: CompDTO
27 @State titleMarked: boolean = false; 27 @State titleMarked: boolean = false;
28 @State textArr: textItem[] = [] 28 @State textArr: textItem[] = []
  29 + @State compIndex: number = 0;
29 30
30 async aboutToAppear(): Promise<void> { 31 async aboutToAppear(): Promise<void> {
31 console.log('Card17Component', JSON.stringify(this.contentDTO)) 32 console.log('Card17Component', JSON.stringify(this.contentDTO))
@@ -151,6 +152,10 @@ export struct Card17Component { @@ -151,6 +152,10 @@ export struct Card17Component {
151 // 评论等信息 152 // 评论等信息
152 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO, viewShowData: false }) 153 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO, viewShowData: false })
153 } 154 }
  155 + .borderRadius({
  156 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  157 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  158 + })
154 .padding({ 159 .padding({
155 left: 10, 160 left: 10,
156 right: 10, 161 right: 10,
@@ -25,6 +25,7 @@ export struct Card19Component { @@ -25,6 +25,7 @@ export struct Card19Component {
25 @State textArr: textItem[] = [] 25 @State textArr: textItem[] = []
26 @Prop loadImg: boolean = true; 26 @Prop loadImg: boolean = true;
27 isPeopleShipHome: boolean = false; 27 isPeopleShipHome: boolean = false;
  28 + @State compIndex: number = 0;
28 29
29 async aboutToAppear(): Promise<void> { 30 async aboutToAppear(): Promise<void> {
30 this.titleInit(); 31 this.titleInit();
@@ -89,6 +90,10 @@ export struct Card19Component { @@ -89,6 +90,10 @@ export struct Card19Component {
89 CarderInteraction({ contentDTO: this.contentDTO }) 90 CarderInteraction({ contentDTO: this.contentDTO })
90 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件 91 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
91 } 92 }
  93 + .borderRadius({
  94 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  95 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  96 + })
92 .padding({ 97 .padding({
93 left: 10, 98 left: 10,
94 right: 10, 99 right: 10,
@@ -28,6 +28,7 @@ export struct Card20Component { @@ -28,6 +28,7 @@ export struct Card20Component {
28 @State textArr: textItem[] = [] 28 @State textArr: textItem[] = []
29 @Prop loadImg: boolean = true; 29 @Prop loadImg: boolean = true;
30 isPeopleShipHome: boolean = false; 30 isPeopleShipHome: boolean = false;
  31 + @State compIndex: number = 0;
31 32
32 aboutToAppear(): void { 33 aboutToAppear(): void {
33 this.titleInit(); 34 this.titleInit();
@@ -109,6 +110,10 @@ export struct Card20Component { @@ -109,6 +110,10 @@ export struct Card20Component {
109 CarderInteraction({contentDTO: this.contentDTO}) 110 CarderInteraction({contentDTO: this.contentDTO})
110 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件 111 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
111 } 112 }
  113 + .borderRadius({
  114 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  115 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  116 + })
112 .padding({ 117 .padding({
113 left: 10, 118 left: 10,
114 right: 10, 119 right: 10,
@@ -25,6 +25,7 @@ export struct Card21Component { @@ -25,6 +25,7 @@ export struct Card21Component {
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[] = []
  28 + @State compIndex: number = 0;
28 29
29 async aboutToAppear(): Promise<void> { 30 async aboutToAppear(): Promise<void> {
30 this.titleInit(); 31 this.titleInit();
@@ -110,6 +111,10 @@ export struct Card21Component { @@ -110,6 +111,10 @@ export struct Card21Component {
110 persistentStorage(this.contentDTO.objectId); 111 persistentStorage(this.contentDTO.objectId);
111 ProcessUtils.processPage(this.contentDTO) 112 ProcessUtils.processPage(this.contentDTO)
112 }) 113 })
  114 + .borderRadius({
  115 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  116 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  117 + })
113 .padding({ 118 .padding({
114 left: 10, 119 left: 10,
115 right: 10, 120 right: 10,
@@ -31,6 +31,7 @@ export struct Card2Component { @@ -31,6 +31,7 @@ export struct Card2Component {
31 @ObjectLink compDTO: CompDTO 31 @ObjectLink compDTO: CompDTO
32 @State titleMarked: boolean = false; 32 @State titleMarked: boolean = false;
33 @State textArr: textItem[] = [] 33 @State textArr: textItem[] = []
  34 + @State compIndex: number = 0;
34 35
35 async aboutToAppear(): Promise<void> { 36 async aboutToAppear(): Promise<void> {
36 this.titleInit(); 37 this.titleInit();
@@ -126,6 +127,10 @@ export struct Card2Component { @@ -126,6 +127,10 @@ export struct Card2Component {
126 // 评论等信息 127 // 评论等信息
127 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO }) 128 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
128 } 129 }
  130 + .borderRadius({
  131 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  132 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  133 + })
129 .padding({ 134 .padding({
130 left: 10, 135 left: 10,
131 right: 10, 136 right: 10,
@@ -24,6 +24,7 @@ export struct Card3Component { @@ -24,6 +24,7 @@ export struct Card3Component {
24 @ObjectLink compDTO: CompDTO 24 @ObjectLink compDTO: CompDTO
25 @State titleMarked: boolean = false; 25 @State titleMarked: boolean = false;
26 @State textArr: textItem[] = [] 26 @State textArr: textItem[] = []
  27 + @State compIndex: number = 0;
27 28
28 async aboutToAppear(): Promise<void> { 29 async aboutToAppear(): Promise<void> {
29 this.titleInit(); 30 this.titleInit();
@@ -84,6 +85,10 @@ export struct Card3Component { @@ -84,6 +85,10 @@ export struct Card3Component {
84 // 评论等信息 85 // 评论等信息
85 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO }) 86 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
86 } 87 }
  88 + .borderRadius({
  89 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  90 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  91 + })
87 .padding({ 92 .padding({
88 left: 10, 93 left: 10,
89 right: 10, 94 right: 10,
@@ -30,6 +30,7 @@ export struct Card4Component { @@ -30,6 +30,7 @@ export struct Card4Component {
30 @State titleMarked: boolean = false; 30 @State titleMarked: boolean = false;
31 @State textArr: textItem[] = [] 31 @State textArr: textItem[] = []
32 @ObjectLink compDTO: CompDTO 32 @ObjectLink compDTO: CompDTO
  33 + @State compIndex: number = 0;
33 34
34 async aboutToAppear(): Promise<void> { 35 async aboutToAppear(): Promise<void> {
35 const curRouter = router.getState().name; 36 const curRouter = router.getState().name;
@@ -147,6 +148,10 @@ export struct Card4Component { @@ -147,6 +148,10 @@ export struct Card4Component {
147 //bottom 评论等信息 148 //bottom 评论等信息
148 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO }) 149 CardSourceInfo({ compDTO: this.compDTO, contentDTO: this.contentDTO })
149 } 150 }
  151 + .borderRadius({
  152 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  153 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  154 + })
150 .padding({ 155 .padding({
151 left: 10, 156 left: 10,
152 right: 10, 157 right: 10,
@@ -25,6 +25,7 @@ export struct Card5Component { @@ -25,6 +25,7 @@ export struct Card5Component {
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[] = []
  28 + @State compIndex: number = 0;
28 29
29 async aboutToAppear(): Promise<void> { 30 async aboutToAppear(): Promise<void> {
30 // console.log(TAG, JSON.stringify(this.compDTO),this.contentDTO.titleShow) 31 // console.log(TAG, JSON.stringify(this.compDTO),this.contentDTO.titleShow)
@@ -139,6 +140,10 @@ export struct Card5Component { @@ -139,6 +140,10 @@ export struct Card5Component {
139 140
140 } 141 }
141 } 142 }
  143 + .borderRadius({
  144 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  145 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  146 + })
142 .alignContent(Alignment.Bottom) 147 .alignContent(Alignment.Bottom)
143 .padding({ 148 .padding({
144 left: 10, 149 left: 10,
@@ -27,6 +27,7 @@ export struct Card6Component { @@ -27,6 +27,7 @@ export struct Card6Component {
27 @State textArr: textItem[] = [] 27 @State textArr: textItem[] = []
28 @ObjectLink compDTO: CompDTO 28 @ObjectLink compDTO: CompDTO
29 @State contentDTO: ContentDTO = new ContentDTO(); 29 @State contentDTO: ContentDTO = new ContentDTO();
  30 + @State compIndex: number = 0;
30 31
31 async aboutToAppear(): Promise<void> { 32 async aboutToAppear(): Promise<void> {
32 console.log('Card6Component', JSON.stringify(this.contentDTO)) 33 console.log('Card6Component', JSON.stringify(this.contentDTO))
@@ -128,6 +129,10 @@ export struct Card6Component { @@ -128,6 +129,10 @@ export struct Card6Component {
128 } 129 }
129 130
130 } 131 }
  132 + .borderRadius({
  133 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  134 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  135 + })
131 .onClick((event: ClickEvent) => { 136 .onClick((event: ClickEvent) => {
132 ///我的收藏 编辑状态点击 137 ///我的收藏 编辑状态点击
133 if (this.compDTO.isCollectionEditting) { 138 if (this.compDTO.isCollectionEditting) {
@@ -28,6 +28,7 @@ export struct Card9Component { @@ -28,6 +28,7 @@ export struct Card9Component {
28 pageShowTime:number = 0; 28 pageShowTime:number = 0;
29 pageHideTime:number = 0; 29 pageHideTime:number = 0;
30 @State hideDetail: boolean = false; 30 @State hideDetail: boolean = false;
  31 + @State compIndex: number = 0;
31 32
32 onPageShow() { 33 onPageShow() {
33 this.pageShowTime = DateTimeUtils.getTimeStamp() 34 this.pageShowTime = DateTimeUtils.getTimeStamp()
@@ -154,6 +155,10 @@ export struct Card9Component { @@ -154,6 +155,10 @@ export struct Card9Component {
154 .justifyContent(FlexAlign.Center) 155 .justifyContent(FlexAlign.Center)
155 } 156 }
156 } 157 }
  158 + .borderRadius({
  159 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  160 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  161 + })
157 .width(CommonConstants.FULL_WIDTH) 162 .width(CommonConstants.FULL_WIDTH)
158 .padding({ 163 .padding({
159 top: 14, 164 top: 14,
@@ -24,6 +24,7 @@ export struct LiveBigImage01Component { @@ -24,6 +24,7 @@ export struct LiveBigImage01Component {
24 index: number = 0 24 index: number = 0
25 @State isLoadingAttention: boolean = false 25 @State isLoadingAttention: boolean = false
26 @State curRouter: string = '' 26 @State curRouter: string = ''
  27 + @State compIndex: number = 0;
27 28
28 async aboutToAppear() { 29 async aboutToAppear() {
29 const curRouter = router.getState().name; 30 const curRouter = router.getState().name;
@@ -153,7 +154,10 @@ export struct LiveBigImage01Component { @@ -153,7 +154,10 @@ export struct LiveBigImage01Component {
153 .justifyContent(FlexAlign.SpaceBetween) 154 .justifyContent(FlexAlign.SpaceBetween)
154 155
155 } 156 }
156 - .borderRadius(4) 157 + .borderRadius({
  158 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  159 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  160 + })
157 .backgroundColor(Color.White) 161 .backgroundColor(Color.White)
158 .width('calc(100% - 24vp)') 162 .width('calc(100% - 24vp)')
159 .margin({ 163 .margin({
@@ -20,6 +20,8 @@ export struct LiveBigImage02Component { @@ -20,6 +20,8 @@ export struct LiveBigImage02Component {
20 @Prop loadImg: boolean = true; 20 @Prop loadImg: boolean = true;
21 @State clicked: boolean = false; 21 @State clicked: boolean = false;
22 index: number = 0 22 index: number = 0
  23 + @State compIndex: number = 0;
  24 +
23 async aboutToAppear() { 25 async aboutToAppear() {
24 const curRouter = router.getState().name; 26 const curRouter = router.getState().name;
25 this.clicked = hasClicked(this.contentDTO.objectId,curRouter) 27 this.clicked = hasClicked(this.contentDTO.objectId,curRouter)
@@ -85,6 +87,10 @@ export struct LiveBigImage02Component { @@ -85,6 +87,10 @@ export struct LiveBigImage02Component {
85 .margin({ top: 8, bottom: 8 }) 87 .margin({ top: 8, bottom: 8 })
86 88
87 } 89 }
  90 + .borderRadius({
  91 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  92 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  93 + })
88 .width('100%') 94 .width('100%')
89 .padding({ 95 .padding({
90 left: $r('app.float.card_comp_pagePadding_lf'), 96 left: $r('app.float.card_comp_pagePadding_lf'),
@@ -16,6 +16,7 @@ const TAG: string = 'More_Comp'; @@ -16,6 +16,7 @@ const TAG: string = 'More_Comp';
16 export struct MoreComponent { 16 export struct MoreComponent {
17 @State contentDTO: ContentDTO = new ContentDTO(); 17 @State contentDTO: ContentDTO = new ContentDTO();
18 @State showDetail: boolean = false; 18 @State showDetail: boolean = false;
  19 + @Prop nextIsAggregateData: boolean = false;
19 20
20 aboutToAppear(): void { 21 aboutToAppear(): void {
21 this.dealSearchSameList() 22 this.dealSearchSameList()
@@ -24,6 +25,7 @@ export struct MoreComponent { @@ -24,6 +25,7 @@ export struct MoreComponent {
24 build() { 25 build() {
25 if (this.showDetail) { 26 if (this.showDetail) {
26 Column(){ 27 Column(){
  28 +
27 ForEach(this.contentDTO.sameContentList, (item: ContentDTO, index: number) => { 29 ForEach(this.contentDTO.sameContentList, (item: ContentDTO, index: number) => {
28 if (item.appStyle !== "9") { 30 if (item.appStyle !== "9") {
29 CardParser({compDTO:new CompDTO, contentDTO: item ,isNeedDivider:index === this.contentDTO.sameContentList.length -1 ? false:true}) 31 CardParser({compDTO:new CompDTO, contentDTO: item ,isNeedDivider:index === this.contentDTO.sameContentList.length -1 ? false:true})
@@ -43,14 +45,17 @@ export struct MoreComponent { @@ -43,14 +45,17 @@ export struct MoreComponent {
43 } 45 }
44 }) 46 })
45 47
46 - Divider()  
47 - .width('100%' )  
48 - .color($r('app.color.color_F5F5F5'))  
49 - .strokeWidth(5) 48 + if(!this.nextIsAggregateData){
  49 + Divider()
  50 + .width('100%' )
  51 + .color($r('app.color.color_F5F5F5'))
  52 + .strokeWidth(5)
  53 + }
50 } 54 }
51 55
52 } else { 56 } else {
53 Column(){ 57 Column(){
  58 +
54 Column() { 59 Column() {
55 60
56 Row() { 61 Row() {
@@ -72,11 +77,12 @@ export struct MoreComponent { @@ -72,11 +77,12 @@ export struct MoreComponent {
72 } 77 }
73 .padding({left: 10 + 6 , right: 10 + 6}) 78 .padding({left: 10 + 6 , right: 10 + 6})
74 } 79 }
75 -  
76 - Divider()  
77 - .width('100%' )  
78 - .color($r('app.color.color_F5F5F5'))  
79 - .strokeWidth(5) 80 + if(!this.nextIsAggregateData){
  81 + Divider()
  82 + .width('100%' )
  83 + .color($r('app.color.color_F5F5F5'))
  84 + .strokeWidth(5)
  85 + }
80 } 86 }
81 87
82 88
@@ -23,6 +23,7 @@ export struct SearchContentComponent { @@ -23,6 +23,7 @@ export struct SearchContentComponent {
23 @Prop loadImg: boolean = true; 23 @Prop loadImg: boolean = true;
24 @State clicked: boolean = false; 24 @State clicked: boolean = false;
25 @State textArr: textItem[] = [] 25 @State textArr: textItem[] = []
  26 + @State compIndex: number = 0;
26 27
27 28
28 async aboutToAppear(): Promise<void> { 29 async aboutToAppear(): Promise<void> {
@@ -79,6 +80,10 @@ export struct SearchContentComponent { @@ -79,6 +80,10 @@ export struct SearchContentComponent {
79 //bottom 评论等信息 80 //bottom 评论等信息
80 CardSourceInfo({compDTO:new CompDTO, contentDTO: this.contentDTO }) 81 CardSourceInfo({compDTO:new CompDTO, contentDTO: this.contentDTO })
81 } 82 }
  83 + .borderRadius({
  84 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  85 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  86 + })
82 .padding({ 87 .padding({
83 left: 10, 88 left: 10,
84 right: 10, 89 right: 10,
@@ -13,7 +13,7 @@ import { onlyWifiLoadImg } from '../../utils/lazyloadImg'; @@ -13,7 +13,7 @@ import { onlyWifiLoadImg } from '../../utils/lazyloadImg';
13 @Component 13 @Component
14 export struct CompNormalTitle { 14 export struct CompNormalTitle {
15 @State compDTO: CompDTO = new CompDTO 15 @State compDTO: CompDTO = new CompDTO
16 - 16 + @State compIndex: number = 0;
17 aboutToAppear() { 17 aboutToAppear() {
18 } 18 }
19 19
@@ -41,6 +41,10 @@ export struct CompNormalTitle { @@ -41,6 +41,10 @@ export struct CompNormalTitle {
41 }) 41 })
42 .backgroundColor(0xffffff) 42 .backgroundColor(0xffffff)
43 .width(CommonConstants.FULL_WIDTH) 43 .width(CommonConstants.FULL_WIDTH)
  44 + .borderRadius({
  45 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  46 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  47 + })
44 48
45 } 49 }
46 } 50 }
@@ -57,6 +57,7 @@ export struct ZhCarouselLayout01 { @@ -57,6 +57,7 @@ export struct ZhCarouselLayout01 {
57 @Prop loadImg: boolean = true; 57 @Prop loadImg: boolean = true;
58 58
59 private data: MyDataSource = new MyDataSource([]) 59 private data: MyDataSource = new MyDataSource([])
  60 + @State compIndex: number = 0;
60 61
61 watchCurrentBreakpoint() { 62 watchCurrentBreakpoint() {
62 Logger.info(TAG, `watchCurrentBreakpoint, this.currentBreakpoint: ${this.currentBreakpoint}`); 63 Logger.info(TAG, `watchCurrentBreakpoint, this.currentBreakpoint: ${this.currentBreakpoint}`);
@@ -177,6 +178,10 @@ export struct ZhCarouselLayout01 { @@ -177,6 +178,10 @@ export struct ZhCarouselLayout01 {
177 }) 178 })
178 .backgroundColor(0xffffff) 179 .backgroundColor(0xffffff)
179 .width(CommonConstants.FULL_WIDTH) 180 .width(CommonConstants.FULL_WIDTH)
  181 + .borderRadius({
  182 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  183 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  184 + })
180 } else { 185 } else {
181 CarouselLayout01CardView({ 186 CarouselLayout01CardView({
182 item: this.filterAtv()[0], 187 item: this.filterAtv()[0],
@@ -19,6 +19,7 @@ export struct ZhGridLayout02NewsContent { @@ -19,6 +19,7 @@ export struct ZhGridLayout02NewsContent {
19 @ObjectLink compDTO: CompDTO 19 @ObjectLink compDTO: CompDTO
20 @State operDataList: ContentDTO[] = [] 20 @State operDataList: ContentDTO[] = []
21 @Prop loadImg: boolean = true; 21 @Prop loadImg: boolean = true;
  22 + @State compIndex: number = 0;
22 23
23 async aboutToAppear(): Promise<void> { 24 async aboutToAppear(): Promise<void> {
24 25
@@ -46,7 +47,10 @@ export struct ZhGridLayout02NewsContent { @@ -46,7 +47,10 @@ export struct ZhGridLayout02NewsContent {
46 }) 47 })
47 .backgroundColor(0xffffff) 48 .backgroundColor(0xffffff)
48 .width(CommonConstants.FULL_WIDTH) 49 .width(CommonConstants.FULL_WIDTH)
49 - 50 + .borderRadius({
  51 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  52 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  53 + })
50 } 54 }
51 55
52 @Builder 56 @Builder
@@ -20,6 +20,7 @@ export struct ZhGridLayout03 { @@ -20,6 +20,7 @@ export struct ZhGridLayout03 {
20 @State pageName: string = ''; 20 @State pageName: string = '';
21 @State compDTO: CompDTO = {} as CompDTO 21 @State compDTO: CompDTO = {} as CompDTO
22 @Prop loadImg: boolean = true; 22 @Prop loadImg: boolean = true;
  23 + @State compIndex: number = 0;
23 24
24 async aboutToAppear(): Promise<void> { 25 async aboutToAppear(): Promise<void> {
25 if (this.compDTO.operDataList) { 26 if (this.compDTO.operDataList) {
@@ -46,6 +47,10 @@ export struct ZhGridLayout03 { @@ -46,6 +47,10 @@ export struct ZhGridLayout03 {
46 }) 47 })
47 .backgroundColor(0xffffff) 48 .backgroundColor(0xffffff)
48 .width('100%') 49 .width('100%')
  50 + .borderRadius({
  51 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  52 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  53 + })
49 } 54 }
50 55
51 /** 56 /**
@@ -18,6 +18,7 @@ export struct ZhSingleColumn04 { @@ -18,6 +18,7 @@ export struct ZhSingleColumn04 {
18 // {newsTitle: "民检普法课堂：正当防卫是什么正当防卫是什么正当防卫是什么正当防卫是什么？", tagWord: 1} as ContentDTO, 18 // {newsTitle: "民检普法课堂：正当防卫是什么正当防卫是什么正当防卫是什么正当防卫是什么？", tagWord: 1} as ContentDTO,
19 // {newsTitle: "审批站”进菜市场 学才艺有云课堂", tagWord: 2} as ContentDTO, 19 // {newsTitle: "审批站”进菜市场 学才艺有云课堂", tagWord: 2} as ContentDTO,
20 ] 20 ]
  21 + @State compIndex: number = 0;
21 22
22 aboutToAppear() { 23 aboutToAppear() {
23 this.operDataList = this.compDTO.operDataList; 24 this.operDataList = this.compDTO.operDataList;
@@ -44,6 +45,10 @@ export struct ZhSingleColumn04 { @@ -44,6 +45,10 @@ export struct ZhSingleColumn04 {
44 }) 45 })
45 } 46 }
46 } 47 }
  48 + .borderRadius({
  49 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  50 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  51 + })
47 .padding({ 52 .padding({
48 left: 10, 53 left: 10,
49 right: 10, 54 right: 10,
@@ -279,6 +279,10 @@ export struct ZhSingleColumn09 { @@ -279,6 +279,10 @@ export struct ZhSingleColumn09 {
279 .borderRadius(3) 279 .borderRadius(3)
280 .justifyContent(FlexAlign.SpaceBetween) 280 .justifyContent(FlexAlign.SpaceBetween)
281 } 281 }
  282 + .borderRadius({
  283 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  284 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  285 + })
282 .padding({ 286 .padding({
283 left: 10, 287 left: 10,
284 right: 10, 288 right: 10,
@@ -24,6 +24,7 @@ export struct ZhSingleRow02 { @@ -24,6 +24,7 @@ export struct ZhSingleRow02 {
24 @State moreWidth:number = 22 24 @State moreWidth:number = 22
25 @State moreTips: string = '' 25 @State moreTips: string = ''
26 scroller: Scroller = new Scroller() 26 scroller: Scroller = new Scroller()
  27 + @State compIndex: number = 0;
27 28
28 resetMoreTips() { 29 resetMoreTips() {
29 if (this.moreWidth < this.initMoreWidth * 2) { 30 if (this.moreWidth < this.initMoreWidth * 2) {
@@ -163,6 +164,10 @@ export struct ZhSingleRow02 { @@ -163,6 +164,10 @@ export struct ZhSingleRow02 {
163 .backgroundColor(0xffffff) 164 .backgroundColor(0xffffff)
164 .width('102%') 165 .width('102%')
165 .margin({ bottom: 8, left: -6 }) 166 .margin({ bottom: 8, left: -6 })
  167 + .borderRadius({
  168 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  169 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  170 + })
166 } 171 }
167 172
168 @Builder 173 @Builder
@@ -47,6 +47,7 @@ export struct ZhSingleRow03 { @@ -47,6 +47,7 @@ export struct ZhSingleRow03 {
47 @State moreTips: string = '' 47 @State moreTips: string = ''
48 scroller: Scroller = new Scroller() 48 scroller: Scroller = new Scroller()
49 @Consume @Watch('pageShowForUpdateData') pageShow :number 49 @Consume @Watch('pageShowForUpdateData') pageShow :number
  50 + @State compIndex: number = 0;
50 51
51 resetMoreTips() { 52 resetMoreTips() {
52 console.log('resetMoreTips', this.moreWidth, this.initMoreWidth) 53 console.log('resetMoreTips', this.moreWidth, this.initMoreWidth)
@@ -269,6 +270,10 @@ export struct ZhSingleRow03 { @@ -269,6 +270,10 @@ export struct ZhSingleRow03 {
269 }) 270 })
270 .backgroundColor(0xffffff) 271 .backgroundColor(0xffffff)
271 .width('100%') 272 .width('100%')
  273 + .borderRadius({
  274 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  275 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  276 + })
272 } 277 }
273 278
274 @Builder 279 @Builder
@@ -16,6 +16,7 @@ export struct ZhSingleRow04 { @@ -16,6 +16,7 @@ export struct ZhSingleRow04 {
16 @State pageName: string = ''; 16 @State pageName: string = '';
17 @State compDTO: CompDTO = {} as CompDTO 17 @State compDTO: CompDTO = {} as CompDTO
18 bottomNavi:BottomNavi = BottomNavi.PEOPLE 18 bottomNavi:BottomNavi = BottomNavi.PEOPLE
  19 + @State compIndex: number = 0;
19 20
20 build() { 21 build() {
21 Column() { 22 Column() {
@@ -105,6 +106,10 @@ export struct ZhSingleRow04 { @@ -105,6 +106,10 @@ export struct ZhSingleRow04 {
105 }) 106 })
106 .backgroundColor(0xffffff) 107 .backgroundColor(0xffffff)
107 .width('100%') 108 .width('100%')
  109 + .borderRadius({
  110 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  111 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  112 + })
108 } 113 }
109 } 114 }
110 115
@@ -27,6 +27,7 @@ export struct ZhSingleRow06 { @@ -27,6 +27,7 @@ export struct ZhSingleRow06 {
27 likeStatus: '0' 27 likeStatus: '0'
28 } as batchLikeAndCollectResult // 点赞、收藏状态 28 } as batchLikeAndCollectResult // 点赞、收藏状态
29 @Prop loadImg: boolean = true; 29 @Prop loadImg: boolean = true;
  30 + @State compIndex: number = 0;
30 31
31 async aboutToAppear(): Promise<void> { 32 async aboutToAppear(): Promise<void> {
32 console.log('Zh_Single_Row-06', JSON.stringify(this.compDTO.operDataList[0]?.commentInfo)) 33 console.log('Zh_Single_Row-06', JSON.stringify(this.compDTO.operDataList[0]?.commentInfo))
@@ -184,6 +185,10 @@ export struct ZhSingleRow06 { @@ -184,6 +185,10 @@ export struct ZhSingleRow06 {
184 .onClick(() => { 185 .onClick(() => {
185 InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[0], this.pageId, this.pageName) 186 InfomationCardClick.track(this.compDTO, this.compDTO.operDataList[0], this.pageId, this.pageName)
186 }) 187 })
  188 + .borderRadius({
  189 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  190 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  191 + })
187 } 192 }
188 193
189 @Builder 194 @Builder
1 -import { BottomNavi, CommonConstants, ViewType } from 'wdConstant'; 1 +import { BottomNavi, CommonConstants, CompStyle, ViewType } from 'wdConstant';
2 import { EmitterEventId, EmitterUtils, Logger, NetworkUtil } from 'wdKit'; 2 import { EmitterEventId, EmitterUtils, Logger, NetworkUtil } from 'wdKit';
3 import { EmptyComponent, WDViewDefaultType } from '../view/EmptyComponent'; 3 import { EmptyComponent, WDViewDefaultType } from '../view/EmptyComponent';
4 import PageModel from '../../viewmodel/PageModel'; 4 import PageModel from '../../viewmodel/PageModel';
@@ -132,8 +132,16 @@ export struct PageComponent { @@ -132,8 +132,16 @@ export struct PageComponent {
132 } 132 }
133 ) 133 )
134 } 134 }
135 - } 135 + }.margin({
  136 + left: compDTO.compStyle === CompStyle.Zh_Single_Row_04 ? 0 : 6,
  137 + right: (compDTO.compStyle === CompStyle.Zh_Single_Row_05 || compDTO.compStyle === CompStyle.Zh_Single_Row_02 ||
  138 + compDTO.compStyle === CompStyle.Zh_Single_Row_04) ? 0 : 6
  139 + })
136 .grayscale(this.isMourning && compIndex < 8 ? 1 : 0) 140 .grayscale(this.isMourning && compIndex < 8 ? 1 : 0)
  141 + .borderRadius({
  142 + topLeft:compIndex === 0 ? $r('app.float.image_border_radius'):0,
  143 + topRight:compIndex === 0 ? $r('app.float.image_border_radius'):0
  144 + })
137 }, 145 },
138 (compDTO: CompDTO, compIndex: number) => JSON.stringify(compDTO)) 146 (compDTO: CompDTO, compIndex: number) => JSON.stringify(compDTO))
139 147
@@ -171,7 +171,6 @@ export struct SearchComponent { @@ -171,7 +171,6 @@ export struct SearchComponent {
171 171
172 SearchHotsComponent({ 172 SearchHotsComponent({
173 onGetSearchRes: (item): void => this.getSearchHotResData(item), 173 onGetSearchRes: (item): void => this.getSearchHotResData(item),
174 - percent: this.percent  
175 }) 174 })
176 } 175 }
177 } 176 }
@@ -179,7 +178,7 @@ export struct SearchComponent { @@ -179,7 +178,7 @@ export struct SearchComponent {
179 .scrollBar(BarState.Off) 178 .scrollBar(BarState.Off)
180 .width('100%') 179 .width('100%')
181 .height('100%') 180 .height('100%')
182 - .padding({ left: `${this.calcHeight(31)}lpx`, right: `${this.calcHeight(31)}lpx` }) 181 + .padding({ left: 16, right: 16 })
183 } else { 182 } else {
184 if (this.hasChooseSearch) { 183 if (this.hasChooseSearch) {
185 //搜索结果 184 //搜索结果
@@ -10,7 +10,6 @@ const TAG = "SearchHotsComponent" @@ -10,7 +10,6 @@ const TAG = "SearchHotsComponent"
10 export struct SearchHotsComponent{ 10 export struct SearchHotsComponent{
11 @State searchHotsData:SearchHotContentItem[] = [] 11 @State searchHotsData:SearchHotContentItem[] = []
12 onGetSearchRes?: (item:string) => void; 12 onGetSearchRes?: (item:string) => void;
13 - @Prop percent:number = 1  
14 13
15 aboutToAppear(){ 14 aboutToAppear(){
16 //获取搜索热词 15 //获取搜索热词
@@ -35,22 +34,21 @@ export struct SearchHotsComponent{ @@ -35,22 +34,21 @@ export struct SearchHotsComponent{
35 if(this.searchHotsData.length>0){ 34 if(this.searchHotsData.length>0){
36 Row() { 35 Row() {
37 Image($r('app.media.search_hot_icon')) 36 Image($r('app.media.search_hot_icon'))
38 - .width(`${this.calcHeight(46)}lpx`)  
39 - .height(`${this.calcHeight(46)}lpx`) 37 + .width(24)
  38 + .height(24)
40 .objectFit(ImageFit.Auto) 39 .objectFit(ImageFit.Auto)
41 - .margin({right:`${this.calcHeight(8)}lpx`}) 40 + .margin({right:4})
42 .interpolation(ImageInterpolation.Medium) 41 .interpolation(ImageInterpolation.Medium)
43 42
44 Text("热门搜索") 43 Text("热门搜索")
45 .textAlign(TextAlign.Center) 44 .textAlign(TextAlign.Center)
46 .fontWeight(FontWeight.Bold) 45 .fontWeight(FontWeight.Bold)
47 - .fontSize(`${this.calcHeight(33)}lpx`)  
48 - .lineHeight(`${this.calcHeight(46)}lpx`) 46 + .fontSize(17)
49 .fontColor($r('app.color.color_222222')) 47 .fontColor($r('app.color.color_222222'))
50 - .height(`${this.calcHeight(46)}lpx`) 48 + .height(24)
51 } 49 }
52 .width('100%') 50 .width('100%')
53 - .margin({bottom:`${this.calcHeight(15)}lpx`}) 51 + .margin({bottom:8})
54 } 52 }
55 53
56 List(){ 54 List(){
@@ -61,49 +59,47 @@ export struct SearchHotsComponent{ @@ -61,49 +59,47 @@ export struct SearchHotsComponent{
61 Row(){ 59 Row(){
62 if(item.sequence <=3){ 60 if(item.sequence <=3){
63 Image(item.sequence===1?$r('app.media.search_hot_num1'):item.sequence===2?$r('app.media.search_hot_num2'):$r('app.media.search_hot_num3')) 61 Image(item.sequence===1?$r('app.media.search_hot_num1'):item.sequence===2?$r('app.media.search_hot_num2'):$r('app.media.search_hot_num3'))
64 - .width(`${this.calcHeight(27)}lpx`)  
65 - .height(`${this.calcHeight(35)}lpx`) 62 + .width(14)
  63 + .height(18)
66 .objectFit(ImageFit.Auto) 64 .objectFit(ImageFit.Auto)
67 - .margin({right:`${this.calcHeight(12)}lpx`}) 65 + .margin({right:6})
68 .interpolation(ImageInterpolation.High) 66 .interpolation(ImageInterpolation.High)
69 }else { 67 }else {
70 Text(`${item.sequence}`) 68 Text(`${item.sequence}`)
71 - .height(`${this.calcHeight(31)}lpx`) 69 + .height(16)
72 .fontColor($r('app.color.color_666666')) 70 .fontColor($r('app.color.color_666666'))
73 - .fontSize(`${this.calcHeight(27)}lpx`) 71 + .fontSize(14)
74 .fontWeight(FontWeight.Regular) 72 .fontWeight(FontWeight.Regular)
75 - .lineHeight(`${this.calcHeight(31)}lpx`)  
76 - .margin({right:`${this.calcHeight(12)}lpx`}) 73 + .margin({right:6})
77 } 74 }
78 Text(`${item.hotEntry}`) 75 Text(`${item.hotEntry}`)
79 .textOverflow({ overflow: TextOverflow.Ellipsis }) 76 .textOverflow({ overflow: TextOverflow.Ellipsis })
80 .fontColor($r('app.color.color_222222')) 77 .fontColor($r('app.color.color_222222'))
81 - .fontSize(`${this.calcHeight(31)}lpx`) 78 + .fontSize(16)
82 .maxLines(1) 79 .maxLines(1)
83 .fontWeight(FontWeight.Regular) 80 .fontWeight(FontWeight.Regular)
84 - .lineHeight(`${this.calcHeight(42)}lpx`)  
85 }.layoutWeight(1) 81 }.layoutWeight(1)
86 82
87 if(item.mark===1 || item.mark===2){ 83 if(item.mark===1 || item.mark===2){
88 Image(item.mark===1?$r('app.media.search_hots_mark1'):$r('app.media.search_hots_mark2')) 84 Image(item.mark===1?$r('app.media.search_hots_mark1'):$r('app.media.search_hots_mark2'))
89 - .width(`${this.calcHeight(42)}lpx`)  
90 - .height(`${this.calcHeight(31)}lpx`) 85 + .width(22)
  86 + .height(16)
91 .objectFit(ImageFit.Auto) 87 .objectFit(ImageFit.Auto)
92 .interpolation(ImageInterpolation.High) 88 .interpolation(ImageInterpolation.High)
93 } 89 }
94 }.alignItems(VerticalAlign.Center) 90 }.alignItems(VerticalAlign.Center)
95 - .height(`${this.calcHeight(84)}lpx`) 91 + .height(44)
96 .width('100%') 92 .width('100%')
97 .justifyContent(FlexAlign.SpaceBetween) 93 .justifyContent(FlexAlign.SpaceBetween)
98 94
99 if(index != this.searchHotsData.length-1 ){ 95 if(index != this.searchHotsData.length-1 ){
100 Divider() 96 Divider()
101 .width('100%') 97 .width('100%')
102 - .height(`${this.calcHeight(1)}lpx`) 98 + .height(1)
103 .color($r('app.color.color_F5F5F5')) 99 .color($r('app.color.color_F5F5F5'))
104 - .strokeWidth(`${this.calcHeight(1)}lpx`) 100 + .strokeWidth(1)
105 } 101 }
106 - }.height(`${this.calcHeight(85)}lpx`) 102 + }.height(45)
107 .width('100%') 103 .width('100%')
108 .alignItems(HorizontalAlign.Start) 104 .alignItems(HorizontalAlign.Start)
109 } 105 }
@@ -118,10 +114,7 @@ export struct SearchHotsComponent{ @@ -118,10 +114,7 @@ export struct SearchHotsComponent{
118 }).layoutWeight(1) 114 }).layoutWeight(1)
119 }.width('100%') 115 }.width('100%')
120 .height('100%') 116 .height('100%')
121 - .margin({top:`${this.calcHeight(46)}lpx`}) 117 + .margin({top:24})
122 } 118 }
123 119
124 - calcHeight(value:number): number{  
125 - return value * this.percent  
126 - }  
127 } 120 }
@@ -317,21 +317,40 @@ export struct SearchResultContentComponent { @@ -317,21 +317,40 @@ export struct SearchResultContentComponent {
317 ActivityItemComponent({ contentDTO: item }) 317 ActivityItemComponent({ contentDTO: item })
318 .padding({left: 6, right: 6}) 318 .padding({left: 6, right: 6})
319 } else if (item.sameContentListSize > 0) { 319 } else if (item.sameContentListSize > 0) {
320 - MoreComponent({ contentDTO: item }) 320 + MoreComponent({ contentDTO: item ,
  321 + nextIsAggregateData:(index+1 < this.data.totalCount() && this.data.get(index+1).isAggregateData)})
321 } else if (item.appStyle == "9") { 322 } else if (item.appStyle == "9") {
322 - Column() {  
323 - Card9Component({  
324 - compDTO: new CompDTO,  
325 - contentDTO: item,  
326 - pageId: "",  
327 - pageName: ""  
328 - })  
329 - Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 323 + Column(){
  324 + if(item.isAggregateData && index != 0){
  325 + Divider()
  326 + .width('100%' )
  327 + .color($r('app.color.color_F5F5F5'))
  328 + .strokeWidth(5)
  329 + }
  330 +
  331 + Column() {
  332 + Card9Component({
  333 + compDTO: new CompDTO,
  334 + contentDTO: item,
  335 + pageId: "",
  336 + pageName: ""
  337 + })
  338 + Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
  339 + }
  340 + .padding({left: 6, right: 6})
330 } 341 }
331 - .padding({left: 6, right: 6})  
332 } else { 342 } else {
333 - CardParser({ compDTO: new CompDTO, contentDTO: item })  
334 - .padding({left: 6, right: 6}) 343 + Column(){
  344 + if(item.isAggregateData && index != 0){
  345 + Divider()
  346 + .width('100%' )
  347 + .color($r('app.color.color_F5F5F5'))
  348 + .strokeWidth(5)
  349 + }
  350 + CardParser({ compDTO: new CompDTO, contentDTO: item ,isNeedDivider: (index+1 < this.data.totalCount() && this.data.get(index+1).isAggregateData) ? false : true})
  351 + .padding({left: 6, right: 6})
  352 + }
  353 +
335 } 354 }
336 } 355 }
337 } 356 }
@@ -564,6 +583,7 @@ export struct SearchResultContentComponent { @@ -564,6 +583,7 @@ export struct SearchResultContentComponent {
564 contentDTO.shareFlag = value.data.shareFlag 583 contentDTO.shareFlag = value.data.shareFlag
565 contentDTO.contentText = value.data.contentText 584 contentDTO.contentText = value.data.contentText
566 contentDTO.author = value.data.author 585 contentDTO.author = value.data.author
  586 + contentDTO.isAggregateData = (value.data.sameContentList != null && value.data.sameContentList.length > 0)
567 return contentDTO; 587 return contentDTO;
568 } 588 }
569 589
@@ -14,6 +14,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -14,6 +14,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
14 @State moreWidth:number = 22 14 @State moreWidth:number = 22
15 @State moreTips: string = '' 15 @State moreTips: string = ''
16 scroller: Scroller = new Scroller() 16 scroller: Scroller = new Scroller()
  17 + @State compIndex: number = 0;
17 18
18 resetMoreTips() { 19 resetMoreTips() {
19 console.log('resetMoreTips', this.moreWidth, this.initMoreWidth) 20 console.log('resetMoreTips', this.moreWidth, this.initMoreWidth)
@@ -208,6 +209,10 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -208,6 +209,10 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
208 left: this.compDTO.operDataList.length >= 2 ? -6 : 0, 209 left: this.compDTO.operDataList.length >= 2 ? -6 : 0,
209 bottom: 8 210 bottom: 8
210 }) 211 })
  212 + .borderRadius({
  213 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  214 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  215 + })
211 } 216 }
212 217
213 private jumpToLiveMorePage() { 218 private jumpToLiveMorePage() {
@@ -12,6 +12,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent { @@ -12,6 +12,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
12 @State pageName: string = ''; 12 @State pageName: string = '';
13 @State compDTO: CompDTO = {} as CompDTO 13 @State compDTO: CompDTO = {} as CompDTO
14 @State clicked: boolean = false; 14 @State clicked: boolean = false;
  15 + @State compIndex: number = 0;
15 16
16 build() { 17 build() {
17 Column() { 18 Column() {
@@ -77,6 +78,10 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent { @@ -77,6 +78,10 @@ export struct HorizontalStrokeCardThreeTwoRadioForOneComponent {
77 this.clicked = true; 78 this.clicked = true;
78 ProcessUtils.processPage(this.compDTO?.operDataList[0]) 79 ProcessUtils.processPage(this.compDTO?.operDataList[0])
79 }) 80 })
  81 + .borderRadius({
  82 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  83 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  84 + })
80 } 85 }
81 86
82 showMore() { 87 showMore() {
@@ -12,6 +12,7 @@ const TAG = 'LabelComponent'; @@ -12,6 +12,7 @@ const TAG = 'LabelComponent';
12 @Component 12 @Component
13 export struct LabelComponent { 13 export struct LabelComponent {
14 @State compDTO: CompDTO = {} as CompDTO 14 @State compDTO: CompDTO = {} as CompDTO
  15 + @State compIndex: number = 0;
15 16
16 build() { 17 build() {
17 Row() { 18 Row() {
@@ -28,6 +29,10 @@ export struct LabelComponent { @@ -28,6 +29,10 @@ export struct LabelComponent {
28 .maxLines(1)// .backgroundColor(Color.Yellow) 29 .maxLines(1)// .backgroundColor(Color.Yellow)
29 .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。 30 .textOverflow({ overflow: TextOverflow.Ellipsis }) // 超出的部分显示省略号。
30 } 31 }
  32 + .borderRadius({
  33 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  34 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  35 + })
31 .width(CommonConstants.FULL_PARENT) 36 .width(CommonConstants.FULL_PARENT)
32 .justifyContent(FlexAlign.Start) 37 .justifyContent(FlexAlign.Start)
33 } 38 }
@@ -22,93 +22,21 @@ export struct LiveHorizontalCardComponent { @@ -22,93 +22,21 @@ export struct LiveHorizontalCardComponent {
22 @State moreWidth:number = 22 22 @State moreWidth:number = 22
23 @State moreTips: string = '' 23 @State moreTips: string = ''
24 scroller: Scroller = new Scroller() 24 scroller: Scroller = new Scroller()
  25 + @State compIndex: number = 0;
  26 + @State ellipseW: number = 0
  27 + @State isEnd: boolean = false
  28 + @State listLeft: number = 0
25 29
26 - resetMoreTips() {  
27 - console.log('resetMoreTips', this.moreWidth, this.initMoreWidth)  
28 - if (this.moreWidth < this.initMoreWidth * 2) {  
29 - this.moreTips = '查看更多';  
30 - }  
31 - }  
32 -  
33 - edgeAnimation() {  
34 - if (this.moreWidth < this.initMoreWidth * 3) {  
35 - if (!this.moreTips) {  
36 - this.moreTips = '查看更多';  
37 - }  
38 - this.moreWidth = this.moreWidth + 2  
39 - }  
40 - if (this.moreWidth > this.initMoreWidth * 2) {  
41 - this.moreTips = '松手查看';  
42 - } else {  
43 -  
44 - }  
45 - }  
46 -  
47 - reverseEdgeAnimation() {  
48 - if (this.moreWidth > this.initMoreWidth) {  
49 - this.moreWidth = this.moreWidth - 2  
50 - }  
51 - this.resetMoreTips()  
52 - }  
53 -  
54 - resetEdgeAnimation() {  
55 - if (this.moreWidth > this.initMoreWidth) {  
56 - this.moreWidth = 22  
57 - }  
58 - this.resetMoreTips()  
59 - }  
60 -  
61 - toMore() {  
62 - if (this.moreWidth > this.initMoreWidth * 2) {  
63 - this.liveToMore();  
64 - }  
65 - }  
66 30
67 liveToMore() { 31 liveToMore() {
68 ProcessUtils.compJumpPage(this.compDTO) 32 ProcessUtils.compJumpPage(this.compDTO)
69 return; 33 return;
70 - if (!!this.compDTO.dataSourceType) {  
71 - if (this.compDTO.linkUrl) {  
72 - let taskAction: Action = {  
73 - type: 'JUMP_INNER_NEW_PAGE',  
74 - params: {  
75 - url: this.compDTO.linkUrl,  
76 - pageID: 'SPACIAL_TOPIC_PAGE',  
77 - contentID: this.compDTO.objectId,  
78 - extra: {  
79 - relId: this.compDTO.relId,  
80 - relType: this.compDTO.relType,  
81 - pageId: this.compDTO.pageId  
82 - }  
83 - } as Params,  
84 - };  
85 - WDRouterRule.jumpWithAction(taskAction)  
86 - } else {  
87 - this.jumpToLiveMorePage()  
88 - }  
89 - } else {  
90 - if (this.compDTO?.objectType === '11') {  
91 - } else {  
92 - const contentDTO: ContentDTO = {  
93 - objectId: this.compDTO.objectId,  
94 - objectType: this.compDTO.objectType,  
95 - linkUrl: this.compDTO.linkUrl,  
96 - pageId: this.compDTO.pageId  
97 - } as ContentDTO  
98 - ProcessUtils.processPage(contentDTO)  
99 - }  
100 - }  
101 -}  
102 -  
103 - async aboutToAppear(): Promise<void> {  
104 - // this.loadImg = await onlyWifiLoadImg();  
105 } 34 }
106 35
107 showMore() { 36 showMore() {
108 return (!!this.compDTO.dataSourceType && this.compDTO.dataSourceType !== 'OBJECT_POS') || !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '') 37 return (!!this.compDTO.dataSourceType && this.compDTO.dataSourceType !== 'OBJECT_POS') || !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')
109 } 38 }
110 39
111 -  
112 build() { 40 build() {
113 Column() { 41 Column() {
114 Row() { 42 Row() {
@@ -192,31 +120,30 @@ export struct LiveHorizontalCardComponent { @@ -192,31 +120,30 @@ export struct LiveHorizontalCardComponent {
192 } 120 }
193 }) 121 })
194 }) 122 })
195 - } 123 + }.offset({ left: this.listLeft })
  124 +
196 if (this.compDTO.operDataList.length >= 2 && this.showMore()) { 125 if (this.compDTO.operDataList.length >= 2 && this.showMore()) {
197 Row() { 126 Row() {
198 Ellipse() 127 Ellipse()
199 - .width(2* (this.moreWidth - this.initMoreWidth - 1)) 128 + .width(2 * this.ellipseW)
200 .height('100%') 129 .height('100%')
201 - .fill(0xe9e9e9)  
202 - .position({ left: -(this.moreWidth - this.initMoreWidth - 3) * 0.8 , top: 0 }) 130 + .fill('rgb(240,235,238)')
  131 + .position({ left: -this.ellipseW, top: 0 })
203 132
204 Column() { 133 Column() {
205 - if (this.moreWidth > this.initMoreWidth + 2) {  
206 - Text(this.moreTips)  
207 - .fontSize(9)  
208 - .fontColor(0x858585)  
209 - .width(8)  
210 - } 134 + Text(this.ellipseW === 0 ? '' : this.ellipseW < 20 ? '查看更多' : '松手查看')
  135 + .width('19lpx')
  136 + .fontSize('19lpx')
  137 + .fontWeight('400lpx')
  138 + .lineHeight('27lpx')
  139 + .fontColor("#9E9E9E")
211 } 140 }
212 - .justifyContent(FlexAlign.Center)  
213 - .align(Alignment.Center)  
214 .height('100%') 141 .height('100%')
215 - .width(this.initMoreWidth)  
216 - .backgroundColor(0xe9e9e9)  
217 - .borderRadius({ topLeft: 5, bottomLeft: 5 }) 142 + .width(this.moreWidth)
  143 + .backgroundColor("#EDEDED")
  144 + .justifyContent(FlexAlign.Center)
218 } 145 }
219 - .margin({left: 1.5 * (this.moreWidth - this.initMoreWidth)}) 146 + .height('100%')
220 } 147 }
221 } 148 }
222 } 149 }
@@ -225,24 +152,43 @@ export struct LiveHorizontalCardComponent { @@ -225,24 +152,43 @@ export struct LiveHorizontalCardComponent {
225 .scrollBar(BarState.Off) 152 .scrollBar(BarState.Off)
226 .edgeEffect(EdgeEffect.None) 153 .edgeEffect(EdgeEffect.None)
227 .onReachEnd(() => { 154 .onReachEnd(() => {
228 - this.edgeAnimation()  
229 - })  
230 - .onScrollStop(() => {  
231 - // this.resetEdgeAnimation(); 155 + this.isEnd = true
232 }) 156 })
233 - .onScroll((xOffset: number, yOffset: number) => {  
234 - if (xOffset < 0) {  
235 - this.reverseEdgeAnimation(); 157 + .onScrollFrameBegin((offset: number, state: ScrollState) => {
  158 + if (!this.scroller.isAtEnd()) {
  159 + this.isEnd = false
236 } 160 }
237 - })  
238 - .onTouch((event?: TouchEvent) => {  
239 - if(event) {  
240 - if (event.type === TouchType.Up) {  
241 - this.toMore();  
242 - this.resetEdgeAnimation();  
243 - } 161 + if (this.ellipseW > 0) {
  162 + return { offsetRemain: 0 }
244 } 163 }
  164 + return { offsetRemain: offset }
245 }) 165 })
  166 + .parallelGesture(
  167 + PanGesture({ direction: PanDirection.Horizontal, distance: 1 })
  168 + .onActionStart((event: GestureEvent) => {
  169 + })
  170 + .onActionUpdate((event: GestureEvent) => {
  171 + if(this.compDTO.operDataList.length >= 2 && this.showMore()){
  172 + if (event && this.isEnd) {
  173 + // console.log('event.offsetX',event.offsetX)
  174 + this.listLeft = event.offsetX < -60 ? -60 : event.offsetX > 0 ? 0 : event.offsetX
  175 + this.ellipseW = (-this.listLeft) / 1.5
  176 + }
  177 + }
  178 +
  179 + })
  180 + .onActionEnd((event: GestureEvent) => {
  181 + if(this.compDTO.operDataList.length >= 2 && this.showMore()){
  182 + this.listLeft = 0
  183 + // this.moreWidth = 20
  184 +
  185 + if (event.offsetX < 0 && this.ellipseW >= 20) {
  186 + this.liveToMore();
  187 + }
  188 + this.ellipseW = 0
  189 + }
  190 + })
  191 + )
246 .width(CommonConstants.FULL_WIDTH) 192 .width(CommonConstants.FULL_WIDTH)
247 .height(this.compDTO.operDataList.length == 2 ? 167 : 134) 193 .height(this.compDTO.operDataList.length == 2 ? 167 : 134)
248 } else if (this.compDTO.operDataList.length) { 194 } else if (this.compDTO.operDataList.length) {
@@ -267,6 +213,10 @@ export struct LiveHorizontalCardComponent { @@ -267,6 +213,10 @@ export struct LiveHorizontalCardComponent {
267 .margin({ 213 .margin({
268 left: this.compDTO.operDataList.length >= 2 ? -6 : 0 214 left: this.compDTO.operDataList.length >= 2 ? -6 : 0
269 }) 215 })
  216 + .borderRadius({
  217 + topLeft:this.compIndex === 0 ? $r('app.float.image_border_radius'):0,
  218 + topRight:this.compIndex === 0 ? $r('app.float.image_border_radius'):0
  219 + })
270 .backgroundColor($r("app.color.white")) 220 .backgroundColor($r("app.color.white"))
271 } 221 }
272 222
@@ -7,6 +7,7 @@ import { OtherHomePageBottomCommentComponent } from '../components/mine/home/Oth @@ -7,6 +7,7 @@ import { OtherHomePageBottomCommentComponent } from '../components/mine/home/Oth
7 import { OtherHomePageBottomFollowComponent } from '../components/mine/home/OtherHomePageBottomFollowComponent'; 7 import { OtherHomePageBottomFollowComponent } from '../components/mine/home/OtherHomePageBottomFollowComponent';
8 import { CustomTitleUI } from '../components/reusable/CustomTitleUI'; 8 import { CustomTitleUI } from '../components/reusable/CustomTitleUI';
9 import { EmptyComponent } from '../components/view/EmptyComponent'; 9 import { EmptyComponent } from '../components/view/EmptyComponent';
  10 +import { UserGradeTextSpan } from '../components/view/UserGradeTextSpan';
10 import MinePageDatasModel from '../model/MinePageDatasModel'; 11 import MinePageDatasModel from '../model/MinePageDatasModel';
11 import { OtherUserDetailRequestItem } from '../viewmodel/OtherUserDetailRequestItem'; 12 import { OtherUserDetailRequestItem } from '../viewmodel/OtherUserDetailRequestItem';
12 13
@@ -110,6 +111,12 @@ struct OtherNormalUserHomePage { @@ -110,6 +111,12 @@ struct OtherNormalUserHomePage {
110 111
111 Column() { 112 Column() {
112 Row() { 113 Row() {
  114 + UserGradeTextSpan({nameContent:`${this.userName}`,gradeContent:`等级${this.levelId}`,gradeWidth:this.levelId >9 ? 50 : 45})
  115 +
  116 + }.constraintSize({maxWidth:`calc(100% - 16vp - 90vp)`})
  117 + .padding({top:8})
  118 +
  119 + /*Row() {
113 Text(`${this.userName}`) 120 Text(`${this.userName}`)
114 .fontColor($r('app.color.white')) 121 .fontColor($r('app.color.white'))
115 .maxLines(1) 122 .maxLines(1)
@@ -130,7 +137,7 @@ struct OtherNormalUserHomePage { @@ -130,7 +137,7 @@ struct OtherNormalUserHomePage {
130 .height('35lpx') 137 .height('35lpx')
131 } 138 }
132 Blank() 139 Blank()
133 - }.width('507lpx') 140 + }.width('507lpx')*/
134 141
135 Row() { 142 Row() {
136 Row() { 143 Row() {
@@ -114,10 +114,9 @@ struct OneKeyLoginPage { @@ -114,10 +114,9 @@ struct OneKeyLoginPage {
114 114
115 this.loginButton() 115 this.loginButton()
116 116
117 - Text("账号密码登录") 117 + Text("其它手机号登录")
118 .fontColor("#666666") 118 .fontColor("#666666")
119 .height(26) 119 .height(26)
120 - .width(100)  
121 .margin({top: 20}) 120 .margin({top: 20})
122 .onClick(() => { 121 .onClick(() => {
123 router.replaceUrl({url: WDRouterPage.loginPage.url()}) 122 router.replaceUrl({url: WDRouterPage.loginPage.url()})
@@ -128,31 +127,6 @@ struct OneKeyLoginPage { @@ -128,31 +127,6 @@ struct OneKeyLoginPage {
128 .padding({top: `${this.topSafeHeight}px`}) 127 .padding({top: `${this.topSafeHeight}px`})
129 } 128 }
130 129
131 - // @Builder loginButton() {  
132 - // Column() {  
133 - // LoginWithHuaweiIDButton({  
134 - // params: {  
135 - // // LoginWithHuaweiIDButton支持的样式。  
136 - // style: loginComponentManager.Style.BUTTON_CUSTOM,  
137 - // // LoginWithHuaweiIDButton的边框圆角半径。  
138 - // borderRadius: 4,  
139 - // // LoginWithHuaweiIDButton支持的登录类型。  
140 - // loginType: loginComponentManager.LoginType.QUICK_LOGIN,  
141 - // // LoginWithHuaweiIDButton支持按钮的样式跟随系统深浅色模式切换。  
142 - // supportDarkMode: true,  
143 - // customButtonParams: {  
144 - // fontColor: loginComponentManager.FontColor.WHITE,  
145 - // // backgroundColor:!this.agreeProtocol ? "#60ED2800" : "#ED2800"  
146 - // backgroundColor:"#ED2800"  
147 - // }  
148 - // },  
149 - // controller: this.controller  
150 - // })  
151 - // }  
152 - // .backgroundColor("#ED2800")  
153 - // .height(48)  
154 - // .margin({ top: 20 ,left: 25, right: 25 })  
155 - // }  
156 130
157 @Builder loginButton() { 131 @Builder loginButton() {
158 Row() { 132 Row() {