developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
zhenghy
0009a421 2 parents 8326924f 57b7cd81

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

# Conflicts:
#	sight_harmony/features/wdDetailPlayLive/src/main/ets/pages/DetailPlayHLivePage.ets
Inline Side-by-side
Showing 45 changed files with 1087 additions and 436 deletions
@@ -16,7 +16,7 @@ export const enum CompStyle { @@ -16,7 +16,7 @@ export const enum CompStyle {
16 Single_Column_05 = 'Single_Column-05', // 海报图卡：/ 16 Single_Column_05 = 'Single_Column-05', // 海报图卡：/
17 Single_Column_06 = 'Single_Column-06', // 留言板卡：/ 17 Single_Column_06 = 'Single_Column-06', // 留言板卡：/
18 Grid_Layout_01 = 'Grid_Layout-01', // 横屏宫格卡:视频、直播 18 Grid_Layout_01 = 'Grid_Layout-01', // 横屏宫格卡:视频、直播
19 - Grid_Layout_02 = 'Grid_Layout-02', // 竖屏宫格卡:视频、直播、榜单 19 + Grid_Layout_02 = 'Grid_Layout-02', // 竖屏宫格卡 :视频、直播、榜单
20 Masonry_Layout_01 = 'Masonry_Layout-01', // 双列瀑布流/瀑布流卡：视频、直播、专题、活动 20 Masonry_Layout_01 = 'Masonry_Layout-01', // 双列瀑布流/瀑布流卡：视频、直播、专题、活动
21 21
22 22
@@ -14,6 +14,16 @@ export class WDRouterPage { @@ -14,6 +14,16 @@ export class WDRouterPage {
14 return `@bundle:${bundleInfo.name}/${"phone"}/${"ets/pages/MainPage"}` 14 return `@bundle:${bundleInfo.name}/${"phone"}/${"ets/pages/MainPage"}`
15 } 15 }
16 16
  17 + static getLoginBundleInfo() {
  18 + let bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT)
  19 + return `@bundle:${bundleInfo.name}/${"wdLogin"}/${"ets/pages/login/LoginPage"}`
  20 + }
  21 +
  22 + static getSettingBundleInfo() {
  23 + let bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT)
  24 + return `@bundle:${bundleInfo.name}/${"wdComponent"}/${"ets/components/page/SettingPage"}`
  25 + }
  26 +
17 27
18 url() { 28 url() {
19 let bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT) 29 let bundleInfo = bundleManager.getBundleInfoForSelfSync(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT)
@@ -82,7 +82,6 @@ export struct WdWebLocalComponent { @@ -82,7 +82,6 @@ export struct WdWebLocalComponent {
82 82
83 //webview 高度设置 83 //webview 高度设置
84 private setCurrentPageOperate: (data: Message) => void = (data) => { 84 private setCurrentPageOperate: (data: Message) => void = (data) => {
85 - console.log("setCurrentPageOperate", JSON.stringify(data))  
86 if (data.handlerName === H5CallNativeType.jsCall_currentPageOperate && data?.data?.operateType === '8') { 85 if (data.handlerName === H5CallNativeType.jsCall_currentPageOperate && data?.data?.operateType === '8') {
87 if (typeof this.webHeight === 'number') { 86 if (typeof this.webHeight === 'number') {
88 if (Number(data?.data?.webViewHeight) > this.webHeight) { 87 if (Number(data?.data?.webViewHeight) > this.webHeight) {
@@ -64,5 +64,8 @@ export { SpacialTopicPageComponent } from './src/main/ets/components/SpacialTopi @@ -64,5 +64,8 @@ export { SpacialTopicPageComponent } from './src/main/ets/components/SpacialTopi
64 export { LogoutViewModel } from "./src/main/ets/viewmodel/LogoutViewModel" 64 export { LogoutViewModel } from "./src/main/ets/viewmodel/LogoutViewModel"
65 65
66 export { ImageSwiperComponent } from "./src/main/ets/components/ImageSwiperComponent" 66 export { ImageSwiperComponent } from "./src/main/ets/components/ImageSwiperComponent"
  67 +
67 export { newsSkeleton } from "./src/main/ets/components/skeleton/newsSkeleton" 68 export { newsSkeleton } from "./src/main/ets/components/skeleton/newsSkeleton"
68 69
  70 +export { LiveCommentComponent } from "./src/main/ets/components/comment/view/LiveCommentComponent"
  71 +
@@ -8,8 +8,11 @@ import { Card6Component } from './cardview/Card6Component'; @@ -8,8 +8,11 @@ import { Card6Component } from './cardview/Card6Component';
8 import { Card9Component } from './cardview/Card9Component'; 8 import { Card9Component } from './cardview/Card9Component';
9 import { Card10Component } from './cardview/Card10Component'; 9 import { Card10Component } from './cardview/Card10Component';
10 import { Card11Component } from './cardview/Card11Component'; 10 import { Card11Component } from './cardview/Card11Component';
11 -import { Card17Component } from './cardview/Card17Component'; 11 +import { Card12Component } from './cardview/Card12Component';
  12 +import { Card14Component } from './cardview/Card14Component';
12 import { Card15Component } from './cardview/Card15Component'; 13 import { Card15Component } from './cardview/Card15Component';
  14 +import { Card16Component } from './cardview/Card16Component';
  15 +import { Card17Component } from './cardview/Card17Component';
13 import { Card19Component } from './cardview/Card19Component'; 16 import { Card19Component } from './cardview/Card19Component';
14 import { Card20Component } from './cardview/Card20Component'; 17 import { Card20Component } from './cardview/Card20Component';
15 import { Card21Component } from './cardview/Card21Component'; 18 import { Card21Component } from './cardview/Card21Component';
@@ -45,8 +48,14 @@ export struct CardParser { @@ -45,8 +48,14 @@ export struct CardParser {
45 Card10Component({ contentDTO }) 48 Card10Component({ contentDTO })
46 } else if (contentDTO.appStyle === CompStyle.Card_11) { 49 } else if (contentDTO.appStyle === CompStyle.Card_11) {
47 Card11Component({ contentDTO }) 50 Card11Component({ contentDTO })
  51 + } else if (contentDTO.appStyle === CompStyle.Card_12) {
  52 + Card12Component({ contentDTO })
  53 + } else if (contentDTO.appStyle === CompStyle.Card_14) {
  54 + Card14Component({ contentDTO })
48 } else if (contentDTO.appStyle === CompStyle.Card_15) { 55 } else if (contentDTO.appStyle === CompStyle.Card_15) {
49 Card15Component({ contentDTO }) 56 Card15Component({ contentDTO })
  57 + } else if (contentDTO.appStyle === CompStyle.Card_16) {
  58 + Card16Component({ contentDTO })
50 } else if (contentDTO.appStyle === CompStyle.Card_17) { 59 } else if (contentDTO.appStyle === CompStyle.Card_17) {
51 Card17Component({ contentDTO }) 60 Card17Component({ contentDTO })
52 } else if (contentDTO.appStyle === CompStyle.Card_19) { 61 } else if (contentDTO.appStyle === CompStyle.Card_19) {
@@ -9,6 +9,7 @@ import { @@ -9,6 +9,7 @@ import {
9 import { 9 import {
10 HorizontalStrokeCardThreeTwoRadioForOneComponent 10 HorizontalStrokeCardThreeTwoRadioForOneComponent
11 } from './view/HorizontalStrokeCardThreeTwoRadioForOneComponent'; 11 } from './view/HorizontalStrokeCardThreeTwoRadioForOneComponent';
  12 +import { ZhSingleRow02 } from './compview/ZhSingleRow02';
12 import { ZhSingleRow04 } from './compview/ZhSingleRow04'; 13 import { ZhSingleRow04 } from './compview/ZhSingleRow04';
13 import { ZhSingleColumn04 } from './compview/ZhSingleColumn04'; 14 import { ZhSingleColumn04 } from './compview/ZhSingleColumn04';
14 import { ZhSingleColumn05 } from './compview/ZhSingleColumn05'; 15 import { ZhSingleColumn05 } from './compview/ZhSingleColumn05';
@@ -29,7 +30,10 @@ export struct CompParser { @@ -29,7 +30,10 @@ export struct CompParser {
29 compIndex: number = 0; 30 compIndex: number = 0;
30 31
31 build() { 32 build() {
32 - this.componentBuilder(this.compDTO, this.compIndex); 33 + Column(){
  34 + this.componentBuilder(this.compDTO, this.compIndex);
  35 + Divider().strokeWidth(1).color('#f5f5f5').padding({left:16,right:16})
  36 + }
33 } 37 }
34 38
35 @Builder 39 @Builder
@@ -46,6 +50,8 @@ export struct CompParser { @@ -46,6 +50,8 @@ export struct CompParser {
46 } else { 50 } else {
47 HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: compDTO }) 51 HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: compDTO })
48 } 52 }
  53 + } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_02) {
  54 + ZhSingleRow02({ compDTO })
49 } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_03) { 55 } else if (compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
50 LiveHorizontalReservationComponent({ compDTO: compDTO }) 56 LiveHorizontalReservationComponent({ compDTO: compDTO })
51 } else if (compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { 57 } else if (compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) {
1 -import { Logger } from 'wdKit'; 1 +import { AccountManagerUtils, Logger } from 'wdKit';
2 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel'; 2 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
3 -import { ContentDetailDTO } from 'wdBean'; 3 +import { ContentDetailDTO,batchLikeAndCollectResult,batchLikeAndCollectParams,postBatchAttentionStatusParams,
  4 + PhotoListBean,
  5 + ContentDTO, } from 'wdBean';
4 import media from '@ohos.multimedia.media'; 6 import media from '@ohos.multimedia.media';
5 import { OperRowListView } from './view/OperRowListView'; 7 import { OperRowListView } from './view/OperRowListView';
6 import { WDPlayerController } from 'wdPlayer/Index'; 8 import { WDPlayerController } from 'wdPlayer/Index';
  9 +import { ContentConstants } from '../constants/ContentConstants';
  10 +import { ProcessUtils } from '../utils/ProcessUtils';
7 11
8 const TAG = 'DynamicDetailComponent' 12 const TAG = 'DynamicDetailComponent'
9 @Preview 13 @Preview
@@ -19,8 +23,11 @@ export struct DynamicDetailComponent { @@ -19,8 +23,11 @@ export struct DynamicDetailComponent {
19 /** 23 /**
20 * 默认未关注 点击去关注 24 * 默认未关注 点击去关注
21 */ 25 */
22 - private followStatus: boolean = false; 26 + private followStatus: String = '0';
  27 + @State newsStatusOfUser: batchLikeAndCollectResult | undefined = undefined // 点赞、收藏状态
23 28
  29 + //跳转
  30 + private mJumpInfo: ContentDTO = {} as ContentDTO;
24 31
25 async aboutToAppear() { 32 async aboutToAppear() {
26 await this.getContentDetailData() 33 await this.getContentDetailData()
@@ -85,7 +92,7 @@ export struct DynamicDetailComponent { @@ -85,7 +92,7 @@ export struct DynamicDetailComponent {
85 .fontWeight(FontWeight.Medium) 92 .fontWeight(FontWeight.Medium)
86 .margin({ left: $r('app.float.margin_5') }) 93 .margin({ left: $r('app.float.margin_5') })
87 } 94 }
88 - if (!this.followStatus) { 95 + if (this.followStatus == '0') {
89 Text('关注') 96 Text('关注')
90 .width(60) 97 .width(60)
91 .height($r('app.float.margin_48')) 98 .height($r('app.float.margin_48'))
@@ -121,6 +128,31 @@ export struct DynamicDetailComponent { @@ -121,6 +128,31 @@ export struct DynamicDetailComponent {
121 .margin({ top: $r('app.float.margin_6') 128 .margin({ top: $r('app.float.margin_6')
122 ,left: $r('app.float.margin_16') 129 ,left: $r('app.float.margin_16')
123 ,right: $r('app.float.margin_16') }) 130 ,right: $r('app.float.margin_16') })
  131 + if(this.contentDetailData.photoList!= null && this.contentDetailData.photoList.length>0){
  132 + //附件内容：图片/视频
  133 + if(this.contentDetailData.newsType+"" == ContentConstants.TYPE_FOURTEEN){
  134 + GridRow({
  135 + columns: { sm: this.contentDetailData.photoList.length
  136 + , md: this.contentDetailData.photoList.length == 1?1:
  137 + this.contentDetailData.photoList.length == 4?2:
  138 + 3 },
  139 + breakpoints: { value: ['320vp', '520vp', '840vp'] }
  140 + }) {
  141 + ForEach(this.contentDetailData.photoList, (item: PhotoListBean, index: number) => {
  142 + GridCol() {
  143 + this.buildItemCard(this.contentDetailData.photoList[index],this.contentDetailData.photoList.length, index);
  144 + }
  145 + })
  146 + }
  147 + }else{
  148 + //附件内容：视频，只有一个
  149 + ForEach(this.contentDetailData.photoList, (item: PhotoListBean, index: number) => {
  150 + GridCol() {
  151 + this.buildItemCard(this.contentDetailData.photoList[index],this.contentDetailData.photoList.length, index);
  152 + }
  153 + })
  154 + }
  155 + }
124 //特别声明 156 //特别声明
125 Text("特别声明：本文为人民日报新媒体平台“人民号”作者上传并发布，仅代表作者观点。人民日报仅提供信息发布平台。") 157 Text("特别声明：本文为人民日报新媒体平台“人民号”作者上传并发布，仅代表作者观点。人民日报仅提供信息发布平台。")
126 .fontColor($r('app.color.color_CCCCCC')) 158 .fontColor($r('app.color.color_CCCCCC'))
@@ -160,17 +192,253 @@ export struct DynamicDetailComponent { @@ -160,17 +192,253 @@ export struct DynamicDetailComponent {
160 .margin({ left: $r('app.float.margin_2')}) 192 .margin({ left: $r('app.float.margin_2')})
161 } 193 }
162 //评论组件/底部组件 194 //评论组件/底部组件
  195 +
163 } 196 }
164 } 197 }
165 .backgroundColor('#FFFFFFFF') 198 .backgroundColor('#FFFFFFFF')
166 } 199 }
  200 + /**
  201 + * 请求（动态）详情页数据
  202 + * */
167 private async getContentDetailData() { 203 private async getContentDetailData() {
168 try { 204 try {
169 let data = await MultiPictureDetailViewModel.getDetailData(this.relId, this.contentId, this.relType) 205 let data = await MultiPictureDetailViewModel.getDetailData(this.relId, this.contentId, this.relType)
170 this.contentDetailData = data[0]; 206 this.contentDetailData = data[0];
  207 + this.makeJumpInfo
171 console.log('动态详情',JSON.stringify(this.contentDetailData)) 208 console.log('动态详情',JSON.stringify(this.contentDetailData))
172 } catch (exception) { 209 } catch (exception) {
173 console.log('请求失败',JSON.stringify(exception)) 210 console.log('请求失败',JSON.stringify(exception))
174 } 211 }
  212 + this.getBatchAttentionStatus
  213 + this.getInteractDataStatus
  214 + }
  215 +
  216 + // 查询当前登录用户点赞状态
  217 + private async getInteractDataStatus() {
  218 + //未登录
  219 + if(!AccountManagerUtils.isLoginSync() || this.contentDetailData?.openLikes != 1){
  220 + return
  221 + }
  222 + try {
  223 + const params: batchLikeAndCollectParams = {
  224 + contentList: [
  225 + {
  226 + contentId: this.contentDetailData?.newsId + '',
  227 + contentType: this.contentDetailData?.newsType + '',
  228 + }
  229 + ]
  230 + }
  231 + console.error(TAG, JSON.stringify(this.contentDetailData))
  232 + let data = await MultiPictureDetailViewModel.getInteractDataStatus(params)
  233 + console.error(TAG, '查询用户对作品点赞、收藏状态', JSON.stringify(data))
  234 + this.newsStatusOfUser = data[0];
  235 + Logger.info(TAG, `newsStatusOfUser：${JSON.stringify(this.newsStatusOfUser)}`)
  236 + } catch (exception) {
  237 + console.error(TAG, JSON.stringify(exception))
  238 + }
  239 + }
  240 +
  241 + /**
  242 + * 查询当前登录用户是否关注作品号主
  243 + * */
  244 + private async getBatchAttentionStatus() {
  245 + try {
  246 + const params: postBatchAttentionStatusParams = {
  247 + creatorIds: [{ creatorId: this.contentDetailData?.rmhInfo?.rmhId ?? '' }]
  248 + }
  249 + let data = await MultiPictureDetailViewModel.getBatchAttentionStatus(params)
  250 + this.followStatus = data[0]?.status;
  251 + Logger.info(TAG, `followStatus：${JSON.stringify(this.followStatus)}`)
  252 + } catch (exception) {
  253 +
  254 + }
  255 + }
  256 + @Builder
  257 + setItemImageStyle(picPath: string,topLeft: number,topRight: number,bottomLeft: number,bottomRight: number){
  258 + //四角圆角
  259 + Image(picPath)
  260 + .width(44).aspectRatio(1 / 1).margin(16).borderRadius({topLeft: topLeft, topRight: topRight, bottomLeft: bottomLeft, bottomRight: bottomRight})
  261 + }
  262 + /**
  263 + * 组件项
  264 + *
  265 + * @param programmeBean item 组件项, 上面icon,下面标题
  266 + */
  267 + @Builder
  268 + buildItemCard(item: PhotoListBean,len: number,index: number) {
  269 + Column() {
  270 + this.setItemImageRoundCorner(len, item, index)
  271 + Flex({ direction: FlexDirection.Row }) {
  272 + Image($r('app.media.icon_long_pic'))
  273 + .width(14)
  274 + .height(14)
  275 + .margin({right: 4})
  276 + Text('长图')
  277 + .fontSize(12)
  278 + .fontWeight(400)
  279 + .fontColor(0xffffff)
  280 + .fontFamily('PingFang SC')
  281 + }
  282 + .width(48)
  283 + .padding({bottom: 9})
  284 + }
  285 + .width('100%')
  286 + .onClick((event: ClickEvent) => {
  287 + if(this.contentDetailData.newsType+"" == ContentConstants.TYPE_FOURTEEN){
  288 + //fixme 跳转到查看图片页面（带页脚/下载按钮）
  289 + // this.mJumpInfo.objectType = ContentConstants.TYPE_
  290 + ProcessUtils.processPage(this.mJumpInfo)
  291 + }else{
  292 + //fixme 跳转到播放视频页面（点播）
  293 + this.mJumpInfo.objectType = ContentConstants.TYPE_VOD
  294 + ProcessUtils.processPage(this.mJumpInfo)
  295 + }
  296 + })
  297 + }
  298 +
  299 + //创建跳转信息
  300 + makeJumpInfo(){
  301 + this.mJumpInfo.pageId = 'dynamicDetailPage';
  302 + // this.mJumpInfo.from = 'dynamicDetailPage';
  303 + this.mJumpInfo.objectId = this.contentDetailData.newsId+"";
  304 + this.mJumpInfo.relType = this.contentDetailData.reLInfo?.relType+"";
  305 + this.mJumpInfo.relId = this.contentDetailData.reLInfo?.relId+"";
  306 + }
  307 +
  308 + //设置图片圆角
  309 + @Builder
  310 + setItemImageRoundCorner(len: number, item: PhotoListBean, index: number) {
  311 + if (len == 1) {
  312 + //四角圆角
  313 + this.setItemImageStyle(item.picPath, 4, 4, 4, 4);
  314 + } else if (len == 2) {
  315 + if (index == 0) {
  316 + //左边圆角
  317 + this.setItemImageStyle(item.picPath, 4, 0, 4, 0);
  318 + } else {
  319 + //右边圆角
  320 + this.setItemImageStyle(item.picPath, 0, 4, 0, 4);
  321 + }
  322 + } else if (3 == len) {
  323 + if (index == 0) {
  324 + //左边圆角
  325 + this.setItemImageStyle(item.picPath, 4, 0, 4, 0);
  326 + } else if (index == 1) {
  327 + //直角
  328 + this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
  329 + } else {
  330 + //右边圆角
  331 + this.setItemImageStyle(item.picPath, 0, 4, 0, 4);
  332 + }
  333 + } else if (4 == len) {
  334 + if (index == 0) {
  335 + //左边圆角
  336 + this.setItemImageStyle(item.picPath, 4, 0, 4, 0);
  337 + } else if (index == 1) {
  338 + //右边圆角
  339 + this.setItemImageStyle(item.picPath, 0, 4, 0, 4);
  340 + } else if (index = 2) {
  341 + //左边圆角
  342 + this.setItemImageStyle(item.picPath, 4, 0, 4, 0);
  343 + } else {
  344 + //右边圆角
  345 + this.setItemImageStyle(item.picPath, 0, 4, 0, 4);
  346 + }
  347 + } else if (5 == len) {
  348 + if (index == 0) {
  349 + this.setItemImageStyle(item.picPath, 4, 0, 0, 0);
  350 + } else if (index == 1) {
  351 + //直角
  352 + this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
  353 + } else if (index = 2) {
  354 + this.setItemImageStyle(item.picPath, 4, 4, 4, 4);
  355 + } else if (index = 3) {
  356 + this.setItemImageStyle(item.picPath, 0, 0, 4, 0);
  357 + } else {
  358 + this.setItemImageStyle(item.picPath, 0, 0, 0, 4);
  359 + }
  360 + } else if (6 == len) {
  361 + if (index == 0) {
  362 + this.setItemImageStyle(item.picPath, 4, 0, 0, 0);
  363 + } else if (index == 1) {
  364 + //直角
  365 + this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
  366 + } else if (index = 2) {
  367 + this.setItemImageStyle(item.picPath, 0, 4, 0, 0);
  368 + } else if (index = 3) {
  369 + this.setItemImageStyle(item.picPath, 0, 0, 4, 0);
  370 + } else if (index = 4) {
  371 + //直角
  372 + this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
  373 + } else {
  374 + //右边圆角
  375 + this.setItemImageStyle(item.picPath, 0, 0, 0, 4);
  376 + }
  377 + } else if (7 == len) {
  378 + if (index == 0) {
  379 + this.setItemImageStyle(item.picPath, 4, 0, 0, 0);
  380 + } else if (index == 1) {
  381 + //直角
  382 + this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
  383 + } else if (index = 2) {
  384 + this.setItemImageStyle(item.picPath, 0, 4, 0, 0);
  385 + } else if (index = 3) {
  386 + //直角
  387 + this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
  388 + } else if (index = 4) {
  389 + //直角
  390 + this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
  391 + } else if (index = 5) {
  392 + this.setItemImageStyle(item.picPath, 0, 0, 0, 4);
  393 + } else {
  394 + this.setItemImageStyle(item.picPath, 0, 0, 4, 4);
  395 + }
  396 + } else if (8 == len) {
  397 + if (index == 0) {
  398 + this.setItemImageStyle(item.picPath, 4, 0, 0, 0);
  399 + } else if (index == 1) {
  400 + //直角
  401 + this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
  402 + } else if (index = 2) {
  403 + this.setItemImageStyle(item.picPath, 0, 4, 0, 0);
  404 + } else if (index = 3) {
  405 + //直角
  406 + this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
  407 + } else if (index = 4) {
  408 + //直角
  409 + this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
  410 + } else if (index = 5) {
  411 + this.setItemImageStyle(item.picPath, 0, 0, 0, 4);
  412 + } else if (index = 6) {
  413 + this.setItemImageStyle(item.picPath, 0, 0, 4, 0);
  414 + } else {
  415 + this.setItemImageStyle(item.picPath, 0, 0, 0, 4);
  416 + }
  417 + } else {
  418 + if (index == 0) {
  419 + this.setItemImageStyle(item.picPath, 4, 0, 0, 0);
  420 + } else if (index == 1) {
  421 + //直角
  422 + this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
  423 + } else if (index == 2) {
  424 + this.setItemImageStyle(item.picPath, 0, 4, 0, 0);
  425 + } else if (index == 3) {
  426 + //直角
  427 + this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
  428 + } else if (index == 4) {
  429 + //直角
  430 + this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
  431 + } else if (index == 5) {
  432 + //直角
  433 + this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
  434 + } else if (index == 6) {
  435 + this.setItemImageStyle(item.picPath, 0, 0, 4, 0);
  436 + } else if (index == 7) {
  437 + //直角
  438 + this.setItemImageStyle(item.picPath, 0, 0, 0, 0);
  439 + } else {
  440 + this.setItemImageStyle(item.picPath, 0, 0, 0, 4);
  441 + }
  442 + }
175 } 443 }
176 } 444 }
@@ -2,6 +2,7 @@ import { ContentDTO } from 'wdBean'; @@ -2,6 +2,7 @@ import { ContentDTO } from 'wdBean';
2 import { RmhTitle } from '../cardCommon/RmhTitle' 2 import { RmhTitle } from '../cardCommon/RmhTitle'
3 import { CardMediaInfo } from '../cardCommon/CardMediaInfo' 3 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
4 import { CommonConstants } from 'wdConstant/Index'; 4 import { CommonConstants } from 'wdConstant/Index';
  5 +import { ProcessUtils } from '../../utils/ProcessUtils';
5 6
6 const TAG = 'Card12Component'; 7 const TAG = 'Card12Component';
7 8
@@ -10,39 +11,7 @@ const TAG = 'Card12Component'; @@ -10,39 +11,7 @@ const TAG = 'Card12Component';
10 */ 11 */
11 @Component 12 @Component
12 export struct Card12Component { 13 export struct Card12Component {
13 - @State contentDTO: ContentDTO = {  
14 - appStyle: '20',  
15 - coverType: 1,  
16 - coverUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',  
17 - fullColumnImgUrls: [  
18 - {  
19 - landscape: 1,  
20 - size: 1,  
21 - url: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',  
22 - weight: 1600  
23 - }  
24 - ],  
25 - newsTitle: '好玩！》10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人',  
26 - rmhInfo: {  
27 - authIcon:  
28 - 'https://cdnjdphoto.aikan.pdnews.cn/creator-category/icon/auth/yellow.png',  
29 - authTitle: '10后音乐人王烁然个人人民号',  
30 - authTitle2: '10后音乐人王烁然个人人民号',  
31 - banControl: 0,  
32 - cnIsAttention: 1,  
33 - rmhDesc: '10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人',  
34 - rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn/image/creator/rmh/20221031/3d3419e86a.jpeg?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg',  
35 - rmhName: '王烁然',  
36 - userId: '522435359667845',  
37 - userType: '2'  
38 - },  
39 - objectType: '1',  
40 - videoInfo: {  
41 - firstFrameImageUri: '',  
42 - videoDuration: 37,  
43 - videoUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/mp4/202105/rmrb_GSNARt6P1622451310.mp4'  
44 - }  
45 - } as ContentDTO; 14 + @State contentDTO: ContentDTO = {} as ContentDTO;
46 15
47 aboutToAppear(): void { 16 aboutToAppear(): void {
48 } 17 }
@@ -50,7 +19,9 @@ export struct Card12Component { @@ -50,7 +19,9 @@ export struct Card12Component {
50 build() { 19 build() {
51 Column() { 20 Column() {
52 // rmh信息 21 // rmh信息
53 - RmhTitle({ rmhInfo: this.contentDTO.rmhInfo }) 22 + if (this.contentDTO.rmhInfo) {
  23 + RmhTitle({ rmhInfo: this.contentDTO.rmhInfo })
  24 + }
54 // 标题 25 // 标题
55 if (this.contentDTO.newsTitle) { 26 if (this.contentDTO.newsTitle) {
56 Text(this.contentDTO.newsTitle) 27 Text(this.contentDTO.newsTitle)
@@ -64,9 +35,6 @@ export struct Card12Component { @@ -64,9 +35,6 @@ export struct Card12Component {
64 .fontFamily('PingFang SC-Regular') 35 .fontFamily('PingFang SC-Regular')
65 } 36 }
66 37
67 - // if (this.contentDTO.fullColumnImgUrls?.[0]) {  
68 - // createImg({ contentDTO: this.contentDTO })  
69 - // }  
70 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件 38 //TODO 底部的：分享、评论、点赞 功能；需要引用一个公共组件
71 } 39 }
72 .padding({ 40 .padding({
@@ -75,6 +43,9 @@ export struct Card12Component { @@ -75,6 +43,9 @@ export struct Card12Component {
75 top: $r('app.float.card_comp_pagePadding_tb'), 43 top: $r('app.float.card_comp_pagePadding_tb'),
76 bottom: $r('app.float.card_comp_pagePadding_tb') 44 bottom: $r('app.float.card_comp_pagePadding_tb')
77 }) 45 })
  46 + .onClick((event: ClickEvent) => {
  47 + ProcessUtils.processPage(this.contentDTO)
  48 + })
78 } 49 }
79 } 50 }
80 51
@@ -85,45 +56,6 @@ interface radiusType { @@ -85,45 +56,6 @@ interface radiusType {
85 bottomRight: number | Resource; 56 bottomRight: number | Resource;
86 } 57 }
87 58
88 -@Component  
89 -struct createImg {  
90 - @Prop contentDTO: ContentDTO  
91 -  
92 - build() {  
93 - GridRow() {  
94 - if (this.contentDTO.fullColumnImgUrls[0].landscape === 1) {  
95 - // 横屏  
96 - GridCol({  
97 - span: { xs: 12 }  
98 - }) {  
99 - Stack() {  
100 - Image(this.contentDTO.coverUrl)  
101 - .width(CommonConstants.FULL_WIDTH)  
102 - .aspectRatio(16 / 9)  
103 - .borderRadius($r('app.float.image_border_radius'))  
104 - CardMediaInfo({ contentDTO: this.contentDTO })  
105 - }  
106 - .align(Alignment.BottomEnd)  
107 - }  
108 - } else {  
109 - // 竖图显示，宽度占50%，高度自适应  
110 - GridCol({  
111 - span: { xs: 6 }  
112 - }) {  
113 - Stack() {  
114 - Image(this.contentDTO.coverUrl)  
115 - .width(CommonConstants.FULL_WIDTH)  
116 - .borderRadius($r('app.float.image_border_radius'))  
117 - CardMediaInfo({ contentDTO: this.contentDTO })  
118 - }  
119 - .align(Alignment.BottomEnd)  
120 - }  
121 - }  
122 - }  
123 - }  
124 -}  
125 -  
126 -  
127 @Extend(Text) 59 @Extend(Text)
128 function textOverflowStyle(maxLine: number) { 60 function textOverflowStyle(maxLine: number) {
129 .maxLines(maxLine) 61 .maxLines(maxLine)
@@ -2,6 +2,7 @@ import { ContentDTO } from 'wdBean'; @@ -2,6 +2,7 @@ import { ContentDTO } from 'wdBean';
2 import { RmhTitle } from '../cardCommon/RmhTitle' 2 import { RmhTitle } from '../cardCommon/RmhTitle'
3 import { CardMediaInfo } from '../cardCommon/CardMediaInfo' 3 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
4 import { CommonConstants } from 'wdConstant/Index'; 4 import { CommonConstants } from 'wdConstant/Index';
  5 +import { ProcessUtils } from '../../utils/ProcessUtils';
5 6
6 const TAG = 'Card14Component'; 7 const TAG = 'Card14Component';
7 8
@@ -11,37 +12,37 @@ const TAG = 'Card14Component'; @@ -11,37 +12,37 @@ const TAG = 'Card14Component';
11 @Component 12 @Component
12 export struct Card14Component { 13 export struct Card14Component {
13 @State contentDTO: ContentDTO = { 14 @State contentDTO: ContentDTO = {
14 - // appStyle: '20',  
15 - // coverType: 1,  
16 - // coverUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',  
17 - // fullColumnImgUrls: [  
18 - // {  
19 - // landscape: 1,  
20 - // size: 1,  
21 - // url: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',  
22 - // weight: 1600  
23 - // }  
24 - // ],  
25 - // newsTitle: '好玩！》10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人',  
26 - // rmhInfo: {  
27 - // authIcon:  
28 - // 'https://cdnjdphoto.aikan.pdnews.cn/creator-category/icon/auth/yellow.png',  
29 - // authTitle: '10后音乐人王烁然个人人民号',  
30 - // authTitle2: '10后音乐人王烁然个人人民号',  
31 - // banControl: 0,  
32 - // cnIsAttention: 1,  
33 - // rmhDesc: '10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人',  
34 - // rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn/image/creator/rmh/20221031/3d3419e86a.jpeg?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg',  
35 - // rmhName: '王烁然',  
36 - // userId: '522435359667845',  
37 - // userType: '2'  
38 - // },  
39 - // objectType: '1',  
40 - // videoInfo: {  
41 - // firstFrameImageUri: '',  
42 - // videoDuration: 37,  
43 - // videoUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/mp4/202105/rmrb_GSNARt6P1622451310.mp4'  
44 - // } 15 + appStyle: '20',
  16 + coverType: 1,
  17 + coverUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',
  18 + fullColumnImgUrls: [
  19 + {
  20 + landscape: 1,
  21 + size: 1,
  22 + url: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',
  23 + weight: 1600
  24 + }
  25 + ],
  26 + newsTitle: '好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》好玩！》',
  27 + rmhInfo: {
  28 + authIcon:
  29 + 'https://cdnjdphoto.aikan.pdnews.cn/creator-category/icon/auth/yellow.png',
  30 + authTitle: '10后音乐人王烁然个人人民号',
  31 + authTitle2: '10后音乐人王烁然个人人民号',
  32 + banControl: 0,
  33 + cnIsAttention: 1,
  34 + rmhDesc: '10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人',
  35 + rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn/image/creator/rmh/20221031/3d3419e86a.jpeg?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg',
  36 + rmhName: '王烁然',
  37 + userId: '522435359667845',
  38 + userType: '2'
  39 + },
  40 + objectType: '1',
  41 + videoInfo: {
  42 + firstFrameImageUri: '',
  43 + videoDuration: 37,
  44 + videoUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/mp4/202105/rmrb_GSNARt6P1622451310.mp4'
  45 + }
45 } as ContentDTO; 46 } as ContentDTO;
46 47
47 aboutToAppear(): void { 48 aboutToAppear(): void {
@@ -50,9 +51,11 @@ export struct Card14Component { @@ -50,9 +51,11 @@ export struct Card14Component {
50 build() { 51 build() {
51 Column() { 52 Column() {
52 // rmh信息 53 // rmh信息
53 - RmhTitle({ rmhInfo: this.contentDTO.rmhInfo }) 54 + if (this.contentDTO.rmhInfo) {
  55 + RmhTitle({ rmhInfo: this.contentDTO.rmhInfo })
  56 + }
54 // 左标题，右图 57 // 左标题，右图
55 - Flex({ direction: FlexDirection.Row }) { 58 + Flex({ direction: FlexDirection.Row, justifyContent: FlexAlign.SpaceBetween }) {
56 59
57 Text(this.contentDTO.newsTitle) 60 Text(this.contentDTO.newsTitle)
58 .fontSize($r('app.float.font_size_17')) 61 .fontSize($r('app.float.font_size_17'))
@@ -61,12 +64,13 @@ export struct Card14Component { @@ -61,12 +64,13 @@ export struct Card14Component {
61 .lineHeight(25) 64 .lineHeight(25)
62 .fontFamily('PingFang SC-Regular') 65 .fontFamily('PingFang SC-Regular')
63 .textAlign(TextAlign.Start) 66 .textAlign(TextAlign.Start)
64 - .flexBasis('auto') 67 + // .flexBasis('auto')
65 .margin({right: 12}) 68 .margin({right: 12})
  69 + .flexBasis(214)
66 70
67 Image(this.contentDTO.coverUrl) 71 Image(this.contentDTO.coverUrl)
68 - .flexBasis(174)  
69 - .height(75) 72 + .flexBasis(117)
  73 + .height(78)
70 .borderRadius($r('app.float.image_border_radius')) 74 .borderRadius($r('app.float.image_border_radius'))
71 // .flexBasis(160) 75 // .flexBasis(160)
72 .backgroundImageSize(ImageSize.Auto) 76 .backgroundImageSize(ImageSize.Auto)
@@ -85,6 +89,9 @@ export struct Card14Component { @@ -85,6 +89,9 @@ export struct Card14Component {
85 top: $r('app.float.card_comp_pagePadding_tb'), 89 top: $r('app.float.card_comp_pagePadding_tb'),
86 bottom: $r('app.float.card_comp_pagePadding_tb') 90 bottom: $r('app.float.card_comp_pagePadding_tb')
87 }) 91 })
  92 + .onClick((event: ClickEvent) => {
  93 + ProcessUtils.processPage(this.contentDTO)
  94 + })
88 } 95 }
89 } 96 }
90 97
@@ -2,47 +2,21 @@ import { ContentDTO } from 'wdBean'; @@ -2,47 +2,21 @@ import { ContentDTO } from 'wdBean';
2 import { RmhTitle } from '../cardCommon/RmhTitle' 2 import { RmhTitle } from '../cardCommon/RmhTitle'
3 import { CardMediaInfo } from '../cardCommon/CardMediaInfo' 3 import { CardMediaInfo } from '../cardCommon/CardMediaInfo'
4 import { CommonConstants } from 'wdConstant/Index'; 4 import { CommonConstants } from 'wdConstant/Index';
  5 +import { ProcessUtils } from '../../utils/ProcessUtils';
5 6
6 const TAG = 'Card16Component'; 7 const TAG = 'Card16Component';
7 8
  9 +interface fullColumnImgUrlItem {
  10 + url: string
  11 +}
  12 +
  13 +
8 /** 14 /**
9 * 人民号-动态---16：人民号三图卡； 15 * 人民号-动态---16：人民号三图卡；
10 */ 16 */
11 @Component 17 @Component
12 export struct Card16Component { 18 export struct Card16Component {
13 - @State contentDTO: ContentDTO = {  
14 - appStyle: '20',  
15 - coverType: 1,  
16 - coverUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90;https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90;https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',  
17 - fullColumnImgUrls: [  
18 - {  
19 - landscape: 1,  
20 - size: 1,  
21 - url: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/default_image/202105/rmrb_default_image_4GdWrgSw1622451312.jpg?x-oss-process=image/resize,m_fill,h_480,w_360/quality,q_90',  
22 - weight: 1600  
23 - }  
24 - ],  
25 - newsTitle: '好玩！》10后音乐人王烁然个人人民号10后音乐人王烁然个人人民号10后音乐人王烁然个人人民号10后音乐人王烁然个人人民号10后音乐人王烁然个人人民号10后音乐人王烁然个人人民号',  
26 - rmhInfo: {  
27 - authIcon:  
28 - 'https://cdnjdphoto.aikan.pdnews.cn/creator-category/icon/auth/yellow.png',  
29 - authTitle: '10后音乐人王烁然个人人民号',  
30 - authTitle2: '10后音乐人王烁然个人人民号',  
31 - banControl: 0,  
32 - cnIsAttention: 1,  
33 - rmhDesc: '10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人10后少年音乐人',  
34 - rmhHeadUrl: 'https://cdnjdphoto.aikan.pdnews.cn/image/creator/rmh/20221031/3d3419e86a.jpeg?x-oss-process=image/resize,l_100/auto-orient,1/quality,q_90/format,jpg',  
35 - rmhName: '王烁然',  
36 - userId: '522435359667845',  
37 - userType: '2'  
38 - },  
39 - objectType: '1',  
40 - videoInfo: {  
41 - firstFrameImageUri: '',  
42 - videoDuration: 37,  
43 - videoUrl: 'https://rmrbcmsonline.peopleapp.com/upload/user_app/gov_dynamic/video/mp4/202105/rmrb_GSNARt6P1622451310.mp4'  
44 - }  
45 - } as ContentDTO; 19 + @State contentDTO: ContentDTO = {} as ContentDTO;
46 20
47 aboutToAppear(): void { 21 aboutToAppear(): void {
48 } 22 }
@@ -50,7 +24,9 @@ export struct Card16Component { @@ -50,7 +24,9 @@ export struct Card16Component {
50 build() { 24 build() {
51 Column() { 25 Column() {
52 // rmh信息 26 // rmh信息
53 - RmhTitle({ rmhInfo: this.contentDTO.rmhInfo }) 27 + if (this.contentDTO.rmhInfo) {
  28 + RmhTitle({ rmhInfo: this.contentDTO.rmhInfo })
  29 + }
54 // 标题 30 // 标题
55 if (this.contentDTO.newsTitle) { 31 if (this.contentDTO.newsTitle) {
56 Text(this.contentDTO.newsTitle) 32 Text(this.contentDTO.newsTitle)
@@ -61,10 +37,10 @@ export struct Card16Component { @@ -61,10 +37,10 @@ export struct Card16Component {
61 .margin({ bottom: 8 }) 37 .margin({ bottom: 8 })
62 .lineHeight(25) 38 .lineHeight(25)
63 } 39 }
64 - if (this.contentDTO.coverUrl) { 40 + if (this.contentDTO.fullColumnImgUrls?.length > 0) {
65 Flex() { 41 Flex() {
66 - ForEach(this.contentDTO.coverUrl?.split(';'), (item: string) => {  
67 - Image(item).flexBasis(113).height(75).margin({right: 2}) 42 + ForEach(this.contentDTO.fullColumnImgUrls.slice(0, 3), (item: fullColumnImgUrlItem, index: number) => {
  43 + Image(item.url).flexBasis(113).height(75).margin({ right: index > 1 ? 0 : 2 })
68 }) 44 })
69 } 45 }
70 } 46 }
@@ -76,6 +52,9 @@ export struct Card16Component { @@ -76,6 +52,9 @@ export struct Card16Component {
76 top: $r('app.float.card_comp_pagePadding_tb'), 52 top: $r('app.float.card_comp_pagePadding_tb'),
77 bottom: $r('app.float.card_comp_pagePadding_tb') 53 bottom: $r('app.float.card_comp_pagePadding_tb')
78 }) 54 })
  55 + .onClick((event: ClickEvent) => {
  56 + ProcessUtils.processPage(this.contentDTO)
  57 + })
79 } 58 }
80 } 59 }
81 60
  1 +import { router } from '@kit.ArkUI'
  2 +import { NumberFormatterUtils, ToastUtils } from 'wdKit/Index'
  3 +
  4 +@Component
  5 +export struct LiveCommentComponent {
  6 + public clickCollect?: (isCollect: boolean) => void
  7 + public clickHeart?: (isHeart: boolean) => void
  8 + @State isCollect: boolean = false
  9 + @State isLike: boolean = false
  10 + @State heartNum: number = 0
  11 +
  12 + build() {
  13 + Row() {
  14 + Image($r('app.media.back_icon'))
  15 + .width(24)
  16 + .height(24)
  17 + .margin({
  18 + left: 16,
  19 + right: 12
  20 + })
  21 + .onClick(() => {
  22 + router.back()
  23 + })
  24 + Stack() {
  25 + Image($r('app.media.background_search'))
  26 + .interpolation(ImageInterpolation.High)
  27 + .width('100%')
  28 + .height(30)
  29 + TextArea({ placeholder: '说两句...' })
  30 + .backgroundColor(Color.Transparent)
  31 + .enabled(false)
  32 + .margin({
  33 + left: 5,
  34 + right: 20
  35 + })
  36 + }
  37 + .layoutWeight(1)
  38 + .onClick(() => {
  39 + ToastUtils.shortToast('依赖其它功能开发')
  40 + })
  41 +
  42 + Image(this.isCollect ? $r('app.media.ic_collect_check') : $r('app.media.iv_live_comment_collect_un'))
  43 + .width(24)
  44 + .height(24)
  45 + .margin({
  46 + left: 20,
  47 + right: 24
  48 + })
  49 + .onClick(() => {
  50 + this.isCollect = !this.isCollect
  51 + })
  52 + Image($r('app.media.iv_live_comment_share'))
  53 + .width(24)
  54 + .height(24)
  55 + .onClick(() => {
  56 + ToastUtils.shortToast('依赖其它功能开发')
  57 + })
  58 + Stack() {
  59 + Text(NumberFormatterUtils.formatNumberWithWan(this.heartNum))
  60 + .height(12)
  61 + .fontSize('8fp')
  62 + .fontWeight(500)
  63 + .fontColor(Color.White)
  64 + .backgroundImage($r('app.media.iv_live_comment_hert_num'))
  65 + .backgroundImageSize(ImageSize.Cover)
  66 + .margin({
  67 + left: 6,
  68 + bottom: 33
  69 + })
  70 + .padding({
  71 + left: 6,
  72 + right: 2
  73 + })
  74 + Image(this.isLike ? $r('app.media.iv_live_comment_hert_light') : $r('app.media.comment_like_normal'))
  75 + .width(24)
  76 + .height(24)
  77 + .margin({
  78 + right: 20,
  79 + })
  80 + }
  81 + .width(44)
  82 + .height(56)
  83 + .margin({
  84 + left: 24
  85 + })
  86 + .onClick(() => {
  87 + this.isLike = !this.isLike
  88 + })
  89 + }
  90 + .height(56)
  91 + .width('100%')
  92 + .backgroundColor(Color.White)
  93 + }
  94 +}
@@ -56,6 +56,9 @@ export struct ZhGridLayout03 { @@ -56,6 +56,9 @@ export struct ZhGridLayout03 {
56 .textOverflow({ overflow: TextOverflow.Ellipsis }) 56 .textOverflow({ overflow: TextOverflow.Ellipsis })
57 } 57 }
58 .width('100%') 58 .width('100%')
  59 + .onClick((event: ClickEvent) => {
  60 + ProcessUtils.processPage(item)
  61 + })
59 } 62 }
60 } 63 }
61 64
@@ -38,6 +38,15 @@ export default struct MinePagePersonFunctionUI { @@ -38,6 +38,15 @@ export default struct MinePagePersonFunctionUI {
38 }.onClick(()=>{ 38 }.onClick(()=>{
39 console.log(index+"") 39 console.log(index+"")
40 switch (item.msg){ 40 switch (item.msg){
  41 + case "评论":{
  42 + if(!this.isLogin){
  43 + WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
  44 + return
  45 + }else {
  46 + WDRouterRule.jumpWithPage(WDRouterPage.mineHomePage)
  47 + }
  48 + break;
  49 + }
41 case "预约":{ 50 case "预约":{
42 if(!this.isLogin){ 51 if(!this.isLogin){
43 WDRouterRule.jumpWithPage(WDRouterPage.loginPage) 52 WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
  1 +import { StringUtils } from 'wdKit/Index'
  2 +import { HttpUrlUtils } from 'wdNetwork/Index'
  3 +import MinePageDatasModel from '../../../model/MinePageDatasModel'
  4 +import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem'
  5 +import { FollowOperationRequestItem } from '../../../viewmodel/FollowOperationRequestItem'
  6 +
  7 +@Component
  8 +export struct FollowChildComponent{
  9 + @ObjectLink data: FollowListDetailItem
  10 + @State type:number = 0
  11 +
  12 + build() {
  13 + if(this.type == 0 ){
  14 + Column(){
  15 + Blank().height('27lpx')
  16 +
  17 + Row() {
  18 + Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.default_head'):this.data.headPhotoUrl)
  19 + .objectFit(ImageFit.Auto)
  20 + .width('92lpx')
  21 + .height('92lpx')
  22 + .margin({right:'15lpx'})
  23 +
  24 + Column(){
  25 + Text(this.data.cnUserName)
  26 + .fontWeight('400lpx')
  27 + .fontSize('31lpx')
  28 + .lineHeight('38lpx')
  29 + .fontColor($r('app.color.color_222222'))
  30 + .maxLines(1)
  31 + Text(`粉丝${this.data.cnFansNum}`)
  32 + .fontColor($r('app.color.color_B0B0B0'))
  33 + .fontSize('23lpx')
  34 + .maxLines(1)
  35 + Text(`${this.data.introduction}`)
  36 + .fontColor($r('app.color.color_B0B0B0'))
  37 + .fontSize('23lpx')
  38 + .maxLines(2)
  39 + .textOverflow({ overflow: TextOverflow.Ellipsis })
  40 + }.layoutWeight(1)
  41 + .alignItems(HorizontalAlign.Start)
  42 +
  43 + if(this.data.status == "1"){
  44 + Row(){
  45 + Text(`已关注`)
  46 + .fontColor($r('app.color.color_CCCCCC'))
  47 + .fontSize('23lpx')
  48 + .fontWeight('500lpx')
  49 + .lineHeight('35lpx')
  50 + }.backgroundColor($r('app.color.color_F5F5F5'))
  51 + .borderRadius('6lpx')
  52 + .borderColor($r('app.color.color_F5F5F5'))
  53 + .borderWidth('2lpx')
  54 + .justifyContent(FlexAlign.Center)
  55 + .width('100lpx')
  56 + .height('46lpx')
  57 + .margin({left:'4lpx',top:'23lpx'})
  58 + .onClick(()=>{
  59 + this.followOperation()
  60 + // this.data.status = "0"
  61 + })
  62 + }else{
  63 + Row(){
  64 + Image($r('app.media.follow_icon'))
  65 + .margin({right:'4lpx'})
  66 + .width('23lpx')
  67 + .height('23lpx')
  68 + Text(`关注`)
  69 + .fontColor($r('app.color.color_ED2800'))
  70 + .fontSize('23lpx')
  71 + .fontWeight('500lpx')
  72 + .lineHeight('35lpx')
  73 + }.borderColor($r('app.color.color_1AED2800'))
  74 + .borderRadius('6lpx')
  75 + .borderWidth('2lpx')
  76 + .justifyContent(FlexAlign.Center)
  77 + .width('100lpx')
  78 + .height('46lpx')
  79 + .margin({left:'4lpx',top:'23lpx'})
  80 + .onClick(()=>{
  81 + this.followOperation()
  82 + // this.data.status = "1"
  83 + })
  84 + }
  85 + }.alignItems(VerticalAlign.Top)
  86 + .width('100%')
  87 + .layoutWeight(1)
  88 +
  89 + Divider().width('100%')
  90 + .height('2lpx')
  91 + .strokeWidth('1lpx')
  92 + .backgroundColor($r('app.color.color_EDEDED'))
  93 +
  94 + }.height('146lpx')
  95 + .justifyContent(FlexAlign.Center)
  96 + .onClick(()=>{
  97 + //跳转 人民号的 主页
  98 + })
  99 + }else if(this.type == 1 ){
  100 + Column(){
  101 + Column(){
  102 +
  103 + Row() {
  104 + Row(){
  105 + Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.default_head'):this.data.headPhotoUrl)
  106 + .objectFit(ImageFit.Auto)
  107 + .width('92lpx')
  108 + .height('92lpx')
  109 + .margin({right:'15lpx'})
  110 + .borderRadius(50)
  111 + .borderWidth('1lpx')
  112 + .borderColor($r('app.color.color_0D000000'))
  113 +
  114 + Column(){
  115 + Text(this.data.cnUserName)
  116 + .fontWeight('400lpx')
  117 + .fontSize('31lpx')
  118 + .lineHeight('38lpx')
  119 + .fontColor($r('app.color.color_222222'))
  120 + .maxLines(1)
  121 + .margin({bottom:'12lpx'})
  122 + Row(){
  123 + Text(`粉丝${this.data.cnFansNum}`)
  124 + .fontColor($r('app.color.color_B0B0B0'))
  125 + .fontSize('23lpx')
  126 +
  127 + Image($r("app.media.point"))
  128 + .width('31lpx')
  129 + .height('31lpx')
  130 + .objectFit(ImageFit.Auto)
  131 +
  132 + Text(`${this.data.introduction}`)
  133 + .fontColor($r('app.color.color_B0B0B0'))
  134 + .fontSize('23lpx')
  135 + .layoutWeight(1)
  136 + .maxLines(1)
  137 + .textOverflow({ overflow: TextOverflow.Ellipsis })
  138 + }.width('100%')
  139 + }
  140 + .layoutWeight(1)
  141 + .alignItems(HorizontalAlign.Start)
  142 + }.layoutWeight(1)
  143 +
  144 + if(this.data.status == "1"){
  145 + Row(){
  146 + Text(`已关注`)
  147 + .fontColor($r('app.color.color_CCCCCC'))
  148 + .fontSize('23lpx')
  149 + .fontWeight('500lpx')
  150 + .lineHeight('35lpx')
  151 + }
  152 + .justifyContent(FlexAlign.Center)
  153 + .width('100lpx')
  154 + .height('46lpx')
  155 + .onClick(()=>{
  156 + this.followOperation()
  157 + })
  158 + }else{
  159 + Row(){
  160 + Image($r('app.media.follow_icon'))
  161 + .margin({right:'4lpx'})
  162 + .width('23lpx')
  163 + .height('23lpx')
  164 + Text(`关注`)
  165 + .fontColor($r('app.color.color_ED2800'))
  166 + .fontSize('23lpx')
  167 + .fontWeight('500lpx')
  168 + .lineHeight('35lpx')
  169 + }.borderColor($r('app.color.color_1AED2800'))
  170 + .borderRadius('6lpx')
  171 + .borderWidth('2lpx')
  172 + .justifyContent(FlexAlign.Center)
  173 + .width('100lpx')
  174 + .height('46lpx')
  175 + .onClick(()=>{
  176 + this.followOperation()
  177 + })
  178 + }
  179 + }
  180 + .width('100%')
  181 + .height('92lpx')
  182 + .justifyContent(FlexAlign.SpaceBetween)
  183 +
  184 + }.height('146lpx')
  185 + .justifyContent(FlexAlign.Center)
  186 + .onClick(()=>{
  187 + })
  188 +
  189 + Divider().width('100%')
  190 + .height('1lpx')
  191 + .strokeWidth('1lpx')
  192 + .backgroundColor($r('app.color.color_EDEDED'))
  193 + }.width('100%')
  194 +
  195 + }
  196 +
  197 + }
  198 +
  199 + followOperation(){
  200 + let item = new FollowOperationRequestItem(this.data.cnUserType,this.data.cnUserId,this.data.creatorId,HttpUrlUtils.getUserType(),HttpUrlUtils.getUserId(),this.data.status==="0" ? 1:0)
  201 + MinePageDatasModel.getFollowOperation(item,getContext(this)).then((value)=>{
  202 + if(value!=null){
  203 + if (value.code === 0 || value.code.toString() === "0") {
  204 + this.data.status = this.data.status ==="0"?"1":"0"
  205 + }
  206 + }
  207 + })
  208 + }
  209 +}
1 -import { Params } from 'wdBean';  
2 -import { LazyDataSource, StringUtils } from 'wdKit';  
3 -import { HttpUrlUtils } from 'wdNetwork';  
4 -import { WDRouterPage, WDRouterRule } from 'wdRouter'; 1 +import { LazyDataSource } from 'wdKit';
5 import MinePageDatasModel from '../../../model/MinePageDatasModel'; 2 import MinePageDatasModel from '../../../model/MinePageDatasModel';
6 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem' 3 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem'
7 import { FollowListDetailRequestItem } from '../../../viewmodel/FollowListDetailRequestItem'; 4 import { FollowListDetailRequestItem } from '../../../viewmodel/FollowListDetailRequestItem';
8 import { FollowListStatusRequestItem } from '../../../viewmodel/FollowListStatusRequestItem'; 5 import { FollowListStatusRequestItem } from '../../../viewmodel/FollowListStatusRequestItem';
9 -import { FollowOperationRequestItem } from '../../../viewmodel/FollowOperationRequestItem';  
10 import { MineFollowListDetailItem } from '../../../viewmodel/MineFollowListDetailItem'; 6 import { MineFollowListDetailItem } from '../../../viewmodel/MineFollowListDetailItem';
11 import { QueryListIsFollowedItem } from '../../../viewmodel/QueryListIsFollowedItem'; 7 import { QueryListIsFollowedItem } from '../../../viewmodel/QueryListIsFollowedItem';
12 import { ListHasNoMoreDataUI } from '../../reusable/ListHasNoMoreDataUI'; 8 import { ListHasNoMoreDataUI } from '../../reusable/ListHasNoMoreDataUI';
  9 +import { FollowChildComponent } from './FollowChildComponent';
13 10
14 const TAG = "FollowListDetailUI" 11 const TAG = "FollowListDetailUI"
15 @Component 12 @Component
16 export struct FollowListDetailUI{ 13 export struct FollowListDetailUI{
17 @State creatorDirectoryId:number = -1; 14 @State creatorDirectoryId:number = -1;
  15 + @State type:number = 0
18 @State data: LazyDataSource<FollowListDetailItem> = new LazyDataSource(); 16 @State data: LazyDataSource<FollowListDetailItem> = new LazyDataSource();
19 @State count:number = 0; 17 @State count:number = 0;
20 @State isLoading:boolean = false 18 @State isLoading:boolean = false
@@ -22,7 +20,6 @@ export struct FollowListDetailUI{ @@ -22,7 +20,6 @@ export struct FollowListDetailUI{
22 curPageNum:number = 1; 20 curPageNum:number = 1;
23 21
24 aboutToAppear(){ 22 aboutToAppear(){
25 - console.log("YCG","aboutToAppear==="+this.creatorDirectoryId);  
26 this.getNewPageData() 23 this.getNewPageData()
27 } 24 }
28 25
@@ -35,7 +32,7 @@ export struct FollowListDetailUI{ @@ -35,7 +32,7 @@ export struct FollowListDetailUI{
35 List({ space: 3 }) { 32 List({ space: 3 }) {
36 LazyForEach(this.data, (item: FollowListDetailItem, index: number = 0) => { 33 LazyForEach(this.data, (item: FollowListDetailItem, index: number = 0) => {
37 ListItem() { 34 ListItem() {
38 - ChildComponent({data: item}) 35 + FollowChildComponent({data: item,type:this.type})
39 } 36 }
40 .onClick(() => { 37 .onClick(() => {
41 }) 38 })
@@ -76,7 +73,8 @@ export struct FollowListDetailUI{ @@ -76,7 +73,8 @@ export struct FollowListDetailUI{
76 this.hasMore = false 73 this.hasMore = false
77 }else{ 74 }else{
78 value.list.forEach((value)=>{ 75 value.list.forEach((value)=>{
79 - this.data.push(new FollowListDetailItem(value.attentionHeadPhotoUrl,value.attentionUserName,value.fansNum,value.introduction,value.attentionCreatorId,"1",value.attentionUserId,value.attentionUserType,value.attentionUserId)) 76 +
  77 + this.data.push(new FollowListDetailItem(value.attentionHeadPhotoUrl,value.attentionUserName,value.fansNum+"",value.introduction,value.attentionCreatorId,"1",value.attentionUserId,value.attentionUserType,value.attentionUserId))
80 }) 78 })
81 this.data.notifyDataReload() 79 this.data.notifyDataReload()
82 this.count = this.data.totalCount() 80 this.count = this.data.totalCount()
@@ -148,112 +146,4 @@ export struct FollowListDetailUI{ @@ -148,112 +146,4 @@ export struct FollowListDetailUI{
148 }) 146 })
149 } 147 }
150 148
151 -}  
152 -  
153 -@Component  
154 -struct ChildComponent {  
155 - @ObjectLink data: FollowListDetailItem  
156 -  
157 - build() {  
158 - Column(){  
159 - Blank().height('27lpx')  
160 -  
161 - Row() {  
162 - Image(StringUtils.isEmpty(this.data.headPhotoUrl)?$r('app.media.default_head'):this.data.headPhotoUrl)  
163 - .objectFit(ImageFit.Auto)  
164 - .width('92lpx')  
165 - .height('92lpx')  
166 - .margin({right:'15lpx'})  
167 -  
168 - Column(){  
169 - Text(this.data.cnUserName)  
170 - .fontWeight('400lpx')  
171 - .fontSize('31lpx')  
172 - .lineHeight('38lpx')  
173 - .fontColor($r('app.color.color_222222'))  
174 - .maxLines(1)  
175 - Text(`粉丝${this.data.cnFansNum}`)  
176 - .fontColor($r('app.color.color_B0B0B0'))  
177 - .fontSize('23lpx')  
178 - .maxLines(1)  
179 - Text(`${this.data.introduction}`)  
180 - .fontColor($r('app.color.color_B0B0B0'))  
181 - .fontSize('23lpx')  
182 - .maxLines(2)  
183 - .textOverflow({ overflow: TextOverflow.Ellipsis })  
184 - }.layoutWeight(1)  
185 - .alignItems(HorizontalAlign.Start)  
186 -  
187 - if(this.data.status == "1"){  
188 - Row(){  
189 - Text(`已关注`)  
190 - .fontColor($r('app.color.color_CCCCCC'))  
191 - .fontSize('23lpx')  
192 - .fontWeight('500lpx')  
193 - .lineHeight('35lpx')  
194 - }.backgroundColor($r('app.color.color_F5F5F5'))  
195 - .borderRadius('6lpx')  
196 - .borderColor($r('app.color.color_F5F5F5'))  
197 - .borderWidth('2lpx')  
198 - .justifyContent(FlexAlign.Center)  
199 - .width('100lpx')  
200 - .height('46lpx')  
201 - .margin({left:'4lpx',top:'23lpx'})  
202 - .onClick(()=>{  
203 - this.followOperation()  
204 - // this.data.status = "0"  
205 - })  
206 - }else{  
207 - Row(){  
208 - Image($r('app.media.follow_icon'))  
209 - .margin({right:'4lpx'})  
210 - .width('23lpx')  
211 - .height('23lpx')  
212 - Text(`关注`)  
213 - .fontColor($r('app.color.color_ED2800'))  
214 - .fontSize('23lpx')  
215 - .fontWeight('500lpx')  
216 - .lineHeight('35lpx')  
217 - }.borderColor($r('app.color.color_1AED2800'))  
218 - .borderRadius('6lpx')  
219 - .borderWidth('2lpx')  
220 - .justifyContent(FlexAlign.Center)  
221 - .width('100lpx')  
222 - .height('46lpx')  
223 - .margin({left:'4lpx',top:'23lpx'})  
224 - .onClick(()=>{  
225 - this.followOperation()  
226 - // this.data.status = "1"  
227 - })  
228 - }  
229 - }.alignItems(VerticalAlign.Top)  
230 - .width('100%')  
231 - .layoutWeight(1)  
232 -  
233 - Divider().width('100%')  
234 - .height('2lpx')  
235 - .strokeWidth('1lpx')  
236 - .backgroundColor($r('app.color.color_EDEDED'))  
237 -  
238 - }.height('146lpx')  
239 - .justifyContent(FlexAlign.Center)  
240 - .onClick(()=>{  
241 - //跳转 人民号的 主页  
242 - // let params: Params = {  
243 - // pageID: this.data.attentionUserId  
244 - // }  
245 - // WDRouterRule.jumpWithPage(WDRouterPage.otherNormalUserHomePagePage,params)  
246 - })  
247 - }  
248 -  
249 - followOperation(){  
250 - let item = new FollowOperationRequestItem(this.data.cnUserType,this.data.cnUserId,this.data.creatorId,HttpUrlUtils.getUserType(),HttpUrlUtils.getUserId(),this.data.status==="0" ? 1:0)  
251 - MinePageDatasModel.getFollowOperation(item,getContext(this)).then((value)=>{  
252 - if(value!=null){  
253 - if (value.code === 0 || value.code.toString() === "0") {  
254 - this.data.status = this.data.status ==="0"?"1":"0"  
255 - }  
256 - }  
257 - })  
258 - }  
259 } 149 }
@@ -23,7 +23,8 @@ export struct FollowSecondTabsComponent{ @@ -23,7 +23,8 @@ export struct FollowSecondTabsComponent{
23 23
24 if(this.data != null){ 24 if(this.data != null){
25 if(this.data[this.firstIndex].children == null || this.data[this.firstIndex].children.length == 0){ 25 if(this.data[this.firstIndex].children == null || this.data[this.firstIndex].children.length == 0){
26 - FollowListDetailUI({creatorDirectoryId:this.data[this.firstIndex].id}).layoutWeight(1) 26 + FollowListDetailUI({creatorDirectoryId:this.data[this.firstIndex].id,type:1})
  27 + .layoutWeight(1)
27 }else{ 28 }else{
28 this.FollowSecondUI() 29 this.FollowSecondUI()
29 } 30 }
@@ -184,7 +184,7 @@ export struct HomePageBottomComponent{ @@ -184,7 +184,7 @@ export struct HomePageBottomComponent{
184 this.hasMore = false 184 this.hasMore = false
185 }else{ 185 }else{
186 value.list.forEach((value)=>{ 186 value.list.forEach((value)=>{
187 - this.data_follow.push(new FollowListDetailItem(value.attentionHeadPhotoUrl,value.attentionUserName,value.fansNum,value.introduction,value.attentionCreatorId,"1",value.attentionUserId,value.attentionUserType,value.attentionUserId)) 187 + this.data_follow.push(new FollowListDetailItem(value.attentionHeadPhotoUrl,value.attentionUserName,value.fansNum+"",value.introduction,value.attentionCreatorId,"1",value.attentionUserId,value.attentionUserType,value.attentionUserId))
188 }) 188 })
189 this.data_follow.notifyDataReload() 189 this.data_follow.notifyDataReload()
190 this.count = this.data_follow.totalCount() 190 this.count = this.data_follow.totalCount()
@@ -116,7 +116,7 @@ export struct OtherHomePageBottomFollowComponent{ @@ -116,7 +116,7 @@ export struct OtherHomePageBottomFollowComponent{
116 this.hasMore = false 116 this.hasMore = false
117 }else{ 117 }else{
118 value.list.forEach((value)=>{ 118 value.list.forEach((value)=>{
119 - this.data_follow.push(new FollowListDetailItem(value.attentionHeadPhotoUrl,value.attentionUserName,value.fansNum,value.introduction,value.attentionCreatorId,"1",value.attentionUserId,value.cnUserType,value.cnUserId)) 119 + this.data_follow.push(new FollowListDetailItem(value.attentionHeadPhotoUrl,value.attentionUserName,value.fansNum+"",value.introduction,value.attentionCreatorId,"1",value.attentionUserId,value.cnUserType,value.cnUserId))
120 }) 120 })
121 this.data_follow.notifyDataReload() 121 this.data_follow.notifyDataReload()
122 this.count = this.data_follow.totalCount() 122 this.count = this.data_follow.totalCount()
@@ -9,12 +9,13 @@ import { RefreshLayoutBean } from './RefreshLayoutBean'; @@ -9,12 +9,13 @@ import { RefreshLayoutBean } from './RefreshLayoutBean';
9 import { CompDTO, ContentDTO } from 'wdBean' 9 import { CompDTO, ContentDTO } from 'wdBean'
10 import LoadMoreLayout from './LoadMoreLayout' 10 import LoadMoreLayout from './LoadMoreLayout'
11 import NoMoreLayout from './NoMoreLayout' 11 import NoMoreLayout from './NoMoreLayout'
12 -import { CompParser } from '../CompParser'  
13 import CustomRefreshLoadLayout from './CustomRefreshLoadLayout'; 12 import CustomRefreshLoadLayout from './CustomRefreshLoadLayout';
14 import { CustomSelectUI } from '../view/CustomSelectUI'; 13 import { CustomSelectUI } from '../view/CustomSelectUI';
15 import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI'; 14 import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI';
16 import { BigPicCardComponent } from '../view/BigPicCardComponent'; 15 import { BigPicCardComponent } from '../view/BigPicCardComponent';
17 16
  17 +import { CustomPullToRefresh } from '../reusable/CustomPullToRefresh';
  18 +
18 @Entry 19 @Entry
19 @Component 20 @Component
20 struct BrowsingHistoryPage { 21 struct BrowsingHistoryPage {
@@ -25,6 +26,8 @@ struct BrowsingHistoryPage { @@ -25,6 +26,8 @@ struct BrowsingHistoryPage {
25 @State selectDatas :ContentDTO[] = []; 26 @State selectDatas :ContentDTO[] = [];
26 @Provide deleteNum :number = 0; 27 @Provide deleteNum :number = 0;
27 @Provide isAllSelect:boolean = false 28 @Provide isAllSelect:boolean = false
  29 + private scroller: Scroller = new Scroller();
  30 +
28 aboutToAppear(){ 31 aboutToAppear(){
29 this.getData() 32 this.getData()
30 } 33 }
@@ -37,15 +40,33 @@ struct BrowsingHistoryPage { @@ -37,15 +40,33 @@ struct BrowsingHistoryPage {
37 this.selectDatas = [] 40 this.selectDatas = []
38 this.deleteNum = 0 41 this.deleteNum = 0
39 }}) 42 }})
40 - if (this.browSingModel.viewType == ViewType.LOADING){  
41 - this.LoadingLayout()  
42 - }else if(this.browSingModel.viewType == ViewType.ERROR){  
43 - ErrorComponent()  
44 - }else if(this.browSingModel.viewType == ViewType.EMPTY){  
45 - EmptyComponent()  
46 - }else {  
47 - this.ListLayout()  
48 - } 43 +
  44 + CustomPullToRefresh({
  45 + alldata:this.allDatas,
  46 + scroller:this.scroller,
  47 + customList:()=>{
  48 + this.ListLayout()
  49 + },
  50 + onRefresh:(resolve)=>{
  51 + this.browSingModel.currentPage = 0
  52 + this.getData(resolve)
  53 + },
  54 + onLoadMore:(resolve)=> {
  55 + this.browSingModel.currentPage++
  56 + this.getData()
  57 + }
  58 + })
  59 +
  60 +
  61 + // if (this.browSingModel.viewType == ViewType.LOADING){
  62 + // this.LoadingLayout()
  63 + // }else if(this.browSingModel.viewType == ViewType.ERROR){
  64 + // ErrorComponent()
  65 + // }else if(this.browSingModel.viewType == ViewType.EMPTY){
  66 + // EmptyComponent()
  67 + // }else {
  68 + // this.ListLayout()
  69 + // }
49 70
50 if (this.isEditState){ 71 if (this.isEditState){
51 CustomBottomFuctionUI({ 72 CustomBottomFuctionUI({
@@ -64,34 +85,27 @@ struct BrowsingHistoryPage { @@ -64,34 +85,27 @@ struct BrowsingHistoryPage {
64 } 85 }
65 86
66 @Builder ListLayout() { 87 @Builder ListLayout() {
67 - List() { 88 + List({scroller: this.scroller}) {
68 // 下拉刷新 89 // 下拉刷新
69 - ListItem() {  
70 - RefreshLayout({  
71 - refreshBean: new RefreshLayoutBean(this.browSingModel.isVisiblePullDown, this.browSingModel.pullDownRefreshImage,  
72 - this.browSingModel.pullDownRefreshText, this.browSingModel.pullDownRefreshHeight)  
73 - })  
74 - }  
75 -  
76 ForEach(this.allDatas, (compDTO: ContentDTO, compIndex: number) => { 90 ForEach(this.allDatas, (compDTO: ContentDTO, compIndex: number) => {
77 ListItem() { 91 ListItem() {
78 this.newCompParser(compDTO,compIndex) 92 this.newCompParser(compDTO,compIndex)
79 } 93 }
80 }) 94 })
81 -  
82 // 加载更多 95 // 加载更多
83 ListItem() { 96 ListItem() {
84 if (this.browSingModel.hasMore) { 97 if (this.browSingModel.hasMore) {
85 - LoadMoreLayout({  
86 - refreshBean: new RefreshLayoutBean(this.browSingModel.isVisiblePullUpLoad, this.browSingModel.pullUpLoadImage,  
87 - this.browSingModel.pullUpLoadText, this.browSingModel.pullUpLoadHeight)  
88 - }) 98 + // LoadMoreLayout({
  99 + // refreshBean: new RefreshLayoutBean(this.browSingModel.isVisiblePullUpLoad, this.browSingModel.pullUpLoadImage,
  100 + // this.browSingModel.pullUpLoadText, this.browSingModel.pullUpLoadHeight)
  101 + // })
89 } else { 102 } else {
90 NoMoreLayout() 103 NoMoreLayout()
91 } 104 }
92 } 105 }
93 } 106 }
94 .height(CommonConstants.FULL_PARENT) 107 .height(CommonConstants.FULL_PARENT)
  108 + .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
95 } 109 }
96 110
97 @Builder 111 @Builder
@@ -117,9 +131,9 @@ struct BrowsingHistoryPage { @@ -117,9 +131,9 @@ struct BrowsingHistoryPage {
117 $r('app.media.ic_pull_up_load'), $r('app.string.pull_up_load_text'), this.browSingModel.pullDownRefreshHeight) }) 131 $r('app.media.ic_pull_up_load'), $r('app.string.pull_up_load_text'), this.browSingModel.pullDownRefreshHeight) })
118 } 132 }
119 133
120 - async getData() {  
121 - this.browSingModel.currentPage = 1 134 + async getData(resolve?: (value: string | PromiseLike<string>) => void){
122 MyCollectionViewModel.fetchMyCollectList(2,'1',this.browSingModel.currentPage,getContext(this)).then(collectionItem => { 135 MyCollectionViewModel.fetchMyCollectList(2,'1',this.browSingModel.currentPage,getContext(this)).then(collectionItem => {
  136 + if(resolve) resolve('刷新成功')
123 if (collectionItem && collectionItem.list && collectionItem.list.length > 0) { 137 if (collectionItem && collectionItem.list && collectionItem.list.length > 0) {
124 this.browSingModel.viewType = ViewType.LOADED; 138 this.browSingModel.viewType = ViewType.LOADED;
125 this.allDatas.push(...collectionItem.list) 139 this.allDatas.push(...collectionItem.list)
@@ -4,17 +4,13 @@ import PageModel from '../../viewmodel/PageModel'; @@ -4,17 +4,13 @@ import PageModel from '../../viewmodel/PageModel';
4 import { CommonConstants, ViewType } from 'wdConstant' 4 import { CommonConstants, ViewType } from 'wdConstant'
5 import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent' 5 import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent'
6 import { ErrorComponent } from '../view/ErrorComponent' 6 import { ErrorComponent } from '../view/ErrorComponent'
7 -import RefreshLayout from './RefreshLayout'  
8 -import { RefreshLayoutBean } from './RefreshLayoutBean';  
9 -import { CompDTO, ContentDTO } from 'wdBean'  
10 -import LoadMoreLayout from './LoadMoreLayout' 7 +import { ContentDTO } from 'wdBean'
11 import NoMoreLayout from './NoMoreLayout' 8 import NoMoreLayout from './NoMoreLayout'
12 -import { CompParser } from '../CompParser'  
13 -import CustomRefreshLoadLayout from './CustomRefreshLoadLayout';  
14 import { CustomSelectUI } from '../view/CustomSelectUI'; 9 import { CustomSelectUI } from '../view/CustomSelectUI';
15 import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI'; 10 import { CustomBottomFuctionUI } from '../view/CustomBottomFuctionUI';
16 import { BigPicCardComponent } from '../view/BigPicCardComponent'; 11 import { BigPicCardComponent } from '../view/BigPicCardComponent';
17 import { contentListItemParams } from '../../model/MyCollectionModel'; 12 import { contentListItemParams } from '../../model/MyCollectionModel';
  13 +import { CustomPullToRefresh } from '../reusable/CustomPullToRefresh';
18 14
19 @Entry 15 @Entry
20 @Component 16 @Component
@@ -26,6 +22,10 @@ struct MyCollectionListPage { @@ -26,6 +22,10 @@ struct MyCollectionListPage {
26 @State selectDatas :ContentDTO[] = []; 22 @State selectDatas :ContentDTO[] = [];
27 @Provide deleteNum :number = 0; 23 @Provide deleteNum :number = 0;
28 @Provide isAllSelect:boolean = false 24 @Provide isAllSelect:boolean = false
  25 +
  26 + @State currentPage: number = 1;
  27 + private scroller: Scroller = new Scroller();
  28 +
29 aboutToAppear(){ 29 aboutToAppear(){
30 this.getData() 30 this.getData()
31 } 31 }
@@ -38,14 +38,31 @@ struct MyCollectionListPage { @@ -38,14 +38,31 @@ struct MyCollectionListPage {
38 this.selectDatas = [] 38 this.selectDatas = []
39 this.deleteNum = 0 39 this.deleteNum = 0
40 }}) 40 }})
41 - if (this.browSingModel.viewType == ViewType.LOADING){  
42 - this.LoadingLayout()  
43 - }else if(this.browSingModel.viewType == ViewType.ERROR){ 41 +
  42 + if(this.browSingModel.viewType == ViewType.ERROR){
44 ErrorComponent() 43 ErrorComponent()
45 }else if(this.browSingModel.viewType == ViewType.EMPTY){ 44 }else if(this.browSingModel.viewType == ViewType.EMPTY){
46 EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoCollection}) 45 EmptyComponent({emptyType:WDViewDefaultType.WDViewDefaultType_NoCollection})
47 }else { 46 }else {
48 - this.ListLayout() 47 + CustomPullToRefresh({
  48 + alldata:this.allDatas,
  49 + scroller:this.scroller,
  50 + customList:()=>{
  51 + this.ListLayout()
  52 + },
  53 + onRefresh:(resolve)=>{
  54 + this.currentPage = 1
  55 + this.getData(resolve)
  56 + },
  57 + onLoadMore:(resolve)=> {
  58 + if (this.browSingModel.hasMore === false) {
  59 + if(resolve) resolve('')
  60 + return
  61 + }
  62 + this.currentPage++
  63 + this.getData(resolve)
  64 + }
  65 + })
49 } 66 }
50 67
51 if (this.isEditState){ 68 if (this.isEditState){
@@ -65,34 +82,19 @@ struct MyCollectionListPage { @@ -65,34 +82,19 @@ struct MyCollectionListPage {
65 } 82 }
66 83
67 @Builder ListLayout() { 84 @Builder ListLayout() {
68 - List() {  
69 - // 下拉刷新  
70 - ListItem() {  
71 - RefreshLayout({  
72 - refreshBean: new RefreshLayoutBean(this.browSingModel.isVisiblePullDown, this.browSingModel.pullDownRefreshImage,  
73 - this.browSingModel.pullDownRefreshText, this.browSingModel.pullDownRefreshHeight)  
74 - })  
75 - }  
76 - 85 + List({scroller: this.scroller}) {
77 ForEach(this.allDatas, (compDTO: ContentDTO, compIndex: number) => { 86 ForEach(this.allDatas, (compDTO: ContentDTO, compIndex: number) => {
78 ListItem() { 87 ListItem() {
79 this.newCompParser(compDTO,compIndex) 88 this.newCompParser(compDTO,compIndex)
80 } 89 }
81 }) 90 })
82 -  
83 // 加载更多 91 // 加载更多
84 ListItem() { 92 ListItem() {
85 - if (this.browSingModel.hasMore) {  
86 - LoadMoreLayout({  
87 - refreshBean: new RefreshLayoutBean(this.browSingModel.isVisiblePullUpLoad, this.browSingModel.pullUpLoadImage,  
88 - this.browSingModel.pullUpLoadText, this.browSingModel.pullUpLoadHeight)  
89 - })  
90 - } else {  
91 - NoMoreLayout()  
92 - } 93 + if (this.browSingModel.hasMore === false) NoMoreLayout()
93 } 94 }
94 } 95 }
95 .height(CommonConstants.FULL_PARENT) 96 .height(CommonConstants.FULL_PARENT)
  97 + .edgeEffect(EdgeEffect.None) // 必须设置列表为滑动到边缘无效果
96 } 98 }
97 99
98 @Builder 100 @Builder
@@ -113,22 +115,16 @@ struct MyCollectionListPage { @@ -113,22 +115,16 @@ struct MyCollectionListPage {
113 } 115 }
114 } 116 }
115 117
116 - @Builder LoadingLayout() {  
117 - CustomRefreshLoadLayout({ refreshBean: new RefreshLayoutBean(true,  
118 - $r('app.media.ic_pull_up_load'), $r('app.string.pull_up_load_text'), this.browSingModel.pullDownRefreshHeight) })  
119 - }  
120 -  
121 - async getData() {  
122 - this.browSingModel.currentPage = 1  
123 - MyCollectionViewModel.fetchMyCollectList(1,'1',this.browSingModel.currentPage,getContext(this)).then(collectionItem => { 118 + async getData(resolve?: (value: string | PromiseLike<string>) => void) {
  119 + MyCollectionViewModel.fetchMyCollectList(1,'1',this.currentPage,getContext(this)).then(collectionItem => {
  120 + if(resolve) resolve('刷新成功')
124 if (collectionItem && collectionItem.list && collectionItem.list.length > 0) { 121 if (collectionItem && collectionItem.list && collectionItem.list.length > 0) {
125 - this.browSingModel.viewType = ViewType.LOADED;  
126 - this.allDatas.push(...collectionItem.list)  
127 - if (collectionItem.list.length === this.browSingModel.pageSize) {  
128 - this.browSingModel.currentPage++;  
129 - this.browSingModel.hasMore = true;  
130 - } else { 122 + if (this.currentPage === 1) this.allDatas = []
  123 + this.allDatas = this.allDatas.concat(...collectionItem.list)
  124 + if (collectionItem.totalCount === this.allDatas.length) {
131 this.browSingModel.hasMore = false; 125 this.browSingModel.hasMore = false;
  126 + } else {
  127 + this.browSingModel.hasMore = true;
132 } 128 }
133 } else { 129 } else {
134 this.browSingModel.viewType = ViewType.EMPTY; 130 this.browSingModel.viewType = ViewType.EMPTY;
  1 +import { PullToRefresh, PullToRefreshConfigurator } from '@ohos/pulltorefresh';
  2 +
  3 +@Component
  4 +export struct CustomPullToRefresh {
  5 + @Link alldata: Object[];
  6 + scroller: Scroller = new Scroller();
  7 + @BuilderParam customList: () => void;
  8 + onRefresh: (resolve?: (value: string | PromiseLike<string>) => void) => void = () => {
  9 + }
  10 + onLoadMore: (resolve?: (value: string | PromiseLike<string>) => void) => void = () => {
  11 + }
  12 + ///是否存在上拉更多
  13 + @State hasMore: boolean = true
  14 + refreshConfigurator: PullToRefreshConfigurator = new PullToRefreshConfigurator().setHasLoadMore(this.hasMore);
  15 + build() {
  16 + Column(){
  17 + PullToRefresh({
  18 + data:this.alldata,
  19 + scroller:this.scroller,
  20 + refreshConfigurator:this.refreshConfigurator,
  21 + customList:()=>{
  22 + this.customList();
  23 + },
  24 + onRefresh:()=>{
  25 + return new Promise<string>((resolve, reject) => {
  26 + this.onRefresh(resolve)
  27 + });
  28 + },
  29 + onLoadMore:()=>{
  30 + return new Promise<string>((resolve, reject) => {
  31 + this.onLoadMore(resolve)
  32 + });
  33 + },
  34 + customLoad: null,
  35 + customRefresh: null,
  36 + })
  37 + }
  38 + }
  39 +}
  1 +import { SearchRmhDescription } from '../../viewmodel/SearchResultContentItem'
  2 +
  3 +@Component
  4 +export struct SearchCreatorComponent{
  5 + @ObjectLink item: SearchRmhDescription
  6 +
  7 + build() {
  8 + Column(){
  9 + Image(this.item.headerPhotoUrl)
  10 + .width('92lpx')
  11 + .alt($r('app.media.default_head'))
  12 + .height('92lpx')
  13 + .margin({bottom:'15lpx'})
  14 + .borderRadius(50)
  15 + Text(this.item.creatorName)
  16 + .fontSize('25lpx')
  17 + .fontWeight('400lpx')
  18 + .lineHeight('35lpx')
  19 + .constraintSize({maxWidth:'150lpx'})
  20 + .maxLines(1)
  21 + .textOverflow({ overflow: TextOverflow.Ellipsis })
  22 + }.alignItems(HorizontalAlign.Center)
  23 + .justifyContent(FlexAlign.Center)
  24 + }
  25 +}
1 import { ContentDTO, 1 import { ContentDTO,
2 contentListParams, 2 contentListParams,
3 - FullColumnImgUrlDTO, InteractDataDTO, RmhInfoDTO, VideoInfoDTO } from 'wdBean/Index' 3 + FullColumnImgUrlDTO, InteractDataDTO,
  4 + Params,
  5 + RmhInfoDTO, VideoInfoDTO } from 'wdBean/Index'
4 import { LiveInfoDTO } from 'wdBean/src/main/ets/bean/detail/LiveInfoDTO' 6 import { LiveInfoDTO } from 'wdBean/src/main/ets/bean/detail/LiveInfoDTO'
5 import { VoiceInfoDTO } from 'wdBean/src/main/ets/bean/detail/VoiceInfoDTO' 7 import { VoiceInfoDTO } from 'wdBean/src/main/ets/bean/detail/VoiceInfoDTO'
6 -import { LazyDataSource, StringUtils, ToastUtils } from 'wdKit/Index' 8 +import { LazyDataSource, Logger, StringUtils, ToastUtils } from 'wdKit/Index'
7 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index' 9 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
8 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel' 10 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
9 import { CreatorDetailRequestItem } from '../../viewmodel/CreatorDetailRequestItem' 11 import { CreatorDetailRequestItem } from '../../viewmodel/CreatorDetailRequestItem'
@@ -12,6 +14,7 @@ import { SearchRmhDescription } from '../../viewmodel/SearchResultContentItem' @@ -12,6 +14,7 @@ import { SearchRmhDescription } from '../../viewmodel/SearchResultContentItem'
12 import { CardParser } from '../CardParser' 14 import { CardParser } from '../CardParser'
13 import { ListHasNoMoreDataUI } from '../reusable/ListHasNoMoreDataUI' 15 import { ListHasNoMoreDataUI } from '../reusable/ListHasNoMoreDataUI'
14 import { ActivityItemComponent } from './ActivityItemComponent' 16 import { ActivityItemComponent } from './ActivityItemComponent'
  17 +import { SearchCreatorComponent } from './SearchCreatorComponent'
15 18
16 const TAG = "SearchResultContentComponent" 19 const TAG = "SearchResultContentComponent"
17 20
@@ -53,24 +56,30 @@ export struct SearchResultContentComponent{ @@ -53,24 +56,30 @@ export struct SearchResultContentComponent{
53 this.isLoading = false 56 this.isLoading = false
54 }else{ 57 }else{
55 if(value.list[0].dataList!=null){ 58 if(value.list[0].dataList!=null){
56 - this.data_rmh = value.list[0].dataList 59 + let data_temp: SearchRmhDescription[] = []
  60 + data_temp = value.list[0].dataList
  61 +
57 //TODO 查询创作者详情接口 62 //TODO 查询创作者详情接口
58 let request = new CreatorDetailRequestItem() 63 let request = new CreatorDetailRequestItem()
59 64
60 - this.data_rmh .forEach((data)=>{ 65 + data_temp.forEach((data)=>{
61 request.creatorIdList.push(data.creatorId) 66 request.creatorIdList.push(data.creatorId)
62 }) 67 })
63 68
64 SearcherAboutDataModel.getCreatorDetailListData(request).then((value)=>{ 69 SearcherAboutDataModel.getCreatorDetailListData(request).then((value)=>{
65 if(value!=null && value.length>0){ 70 if(value!=null && value.length>0){
66 - this.data_rmh.forEach((data)=>{ 71 + data_temp.forEach((data)=>{
67 value.forEach((item)=>{ 72 value.forEach((item)=>{
68 if(data.creatorId == item.creatorId){ 73 if(data.creatorId == item.creatorId){
69 - data.headerPhotoUrl = item.headPhotoUrl 74 + data.headerPhotoUrl = item.headPhotoUrl.split("?")[0]
70 } 75 }
71 }) 76 })
72 }) 77 })
73 } 78 }
  79 + data_temp.forEach((data)=>{
  80 + this.data_rmh.push(data)
  81 + })
  82 +
74 }).catch((err:Error)=>{ 83 }).catch((err:Error)=>{
75 console.log(TAG,JSON.stringify(err)) 84 console.log(TAG,JSON.stringify(err))
76 }) 85 })
@@ -212,23 +221,7 @@ export struct SearchResultContentComponent{ @@ -212,23 +221,7 @@ export struct SearchResultContentComponent{
212 List({space:'8lpx'}) { 221 List({space:'8lpx'}) {
213 ForEach(this.data_rmh, (item: SearchRmhDescription, index: number) => { 222 ForEach(this.data_rmh, (item: SearchRmhDescription, index: number) => {
214 ListItem() { 223 ListItem() {
215 - Column(){  
216 - Image(item.headerPhotoUrl)  
217 - .width('92lpx')  
218 - .alt($r('app.media.default_head'))  
219 - .height('92lpx')  
220 - .margin({bottom:'15lpx'})  
221 - .borderRadius(50)  
222 - Text(item.creatorName)  
223 - .fontSize('25lpx')  
224 - .fontWeight('400lpx')  
225 - .lineHeight('35lpx')  
226 - .constraintSize({maxWidth:'150lpx'})  
227 - .maxLines(1)  
228 - .textOverflow({ overflow: TextOverflow.Ellipsis })  
229 - }.alignItems(HorizontalAlign.Center)  
230 - .justifyContent(FlexAlign.Center)  
231 - 224 + SearchCreatorComponent({item:item})
232 }.onClick(()=>{ 225 }.onClick(()=>{
233 //TODO 跳转 226 //TODO 跳转
234 }) 227 })
@@ -253,7 +246,10 @@ export struct SearchResultContentComponent{ @@ -253,7 +246,10 @@ export struct SearchResultContentComponent{
253 }.height('100%') 246 }.height('100%')
254 .margin({left:'23lpx'}) 247 .margin({left:'23lpx'})
255 .onClick(()=>{ 248 .onClick(()=>{
256 - WDRouterRule.jumpWithPage(WDRouterPage.searchCreatorPage) 249 + let params: Params = {
  250 + pageID: this.keywords
  251 + }
  252 + WDRouterRule.jumpWithPage(WDRouterPage.searchCreatorPage,params)
257 }) 253 })
258 } 254 }
259 .cachedCount(6) 255 .cachedCount(6)
@@ -36,7 +36,13 @@ export const enum WDViewDefaultType { @@ -36,7 +36,13 @@ export const enum WDViewDefaultType {
36 ///该号主无法访问 36 ///该号主无法访问
37 WDViewDefaultType_NoVisitAccount, 37 WDViewDefaultType_NoVisitAccount,
38 ///暂无关注 38 ///暂无关注
39 - WDViewDefaultType_NoFollow 39 + WDViewDefaultType_NoFollow,
  40 + ///直播结束
  41 + WDViewDefaultType_NoLiveEnd,
  42 + /// 直播暂停
  43 + WDViewDefaultType_NoLiveSuspend,
  44 + /// 视频加载失败
  45 + WDViewDefaultType_NoVideo,
40 } 46 }
41 47
42 /** 48 /**
@@ -120,6 +126,12 @@ export struct EmptyComponent { @@ -120,6 +126,12 @@ export struct EmptyComponent {
120 contentString = '' // 前方拥堵，请耐心等待 126 contentString = '' // 前方拥堵，请耐心等待
121 } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoVisitAccount) { 127 } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoVisitAccount) {
122 contentString = '该号主暂时无法访问' // 前方拥堵，请耐心等待 128 contentString = '该号主暂时无法访问' // 前方拥堵，请耐心等待
  129 + }else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoLiveEnd) {
  130 + contentString = '直播已结束' // 前方拥堵，请耐心等待
  131 + }else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoLiveSuspend) {
  132 + contentString = '主播暂时离开，马上回来' // 前方拥堵，请耐心等待
  133 + }else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoVideo) {
  134 + contentString = '获取内容失败请重试' // 前方拥堵，请耐心等待
123 } 135 }
124 136
125 return contentString 137 return contentString
@@ -148,6 +160,10 @@ export struct EmptyComponent { @@ -148,6 +160,10 @@ export struct EmptyComponent {
148 imageString = $r('app.media.icon_no_net') 160 imageString = $r('app.media.icon_no_net')
149 } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoVisitAccount) { 161 } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoVisitAccount) {
150 imageString = $r('app.media.icon_no_master1') 162 imageString = $r('app.media.icon_no_master1')
  163 + }else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoLiveEnd) {
  164 + imageString = $r('app.media.icon_no_end')
  165 + }else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoVideo) {
  166 + imageString = $r('app.media.icon_no_content')
151 } 167 }
152 return imageString 168 return imageString
153 } 169 }
@@ -30,10 +30,10 @@ export struct RecommendList { @@ -30,10 +30,10 @@ export struct RecommendList {
30 ForEach(this.recommendList, (item: ContentDTO, index: number) => { 30 ForEach(this.recommendList, (item: ContentDTO, index: number) => {
31 Row() { 31 Row() {
32 CardParser({ contentDTO: item }); 32 CardParser({ contentDTO: item });
33 - }.border({  
34 - width: { bottom: this.recommendList.length === index + 1 ? 0 : 1 },  
35 - color: '#f5f5f5'  
36 - }) 33 + }
  34 + if (this.recommendList.length !== index + 1) {
  35 + Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
  36 + }
37 }, (item: ContentDTO) => JSON.stringify(item)) 37 }, (item: ContentDTO) => JSON.stringify(item))
38 }.width('100%') 38 }.width('100%')
39 } 39 }
  1 +import { Params } from 'wdBean/Index';
1 import { CustomTitleUI } from '../components/reusable/CustomTitleUI'; 2 import { CustomTitleUI } from '../components/reusable/CustomTitleUI';
  3 +import { router } from '@kit.ArkUI';
  4 +import { FollowListDetailItem } from '../viewmodel/FollowListDetailItem';
  5 +import { LazyDataSource } from 'wdKit/Index';
  6 +import SearcherAboutDataModel from '../model/SearcherAboutDataModel';
  7 +import { CreatorDetailRequestItem } from '../viewmodel/CreatorDetailRequestItem';
  8 +import { FollowListStatusRequestItem } from '../viewmodel/FollowListStatusRequestItem';
  9 +import { QueryListIsFollowedItem } from '../viewmodel/QueryListIsFollowedItem';
  10 +import MinePageDatasModel from '../model/MinePageDatasModel';
  11 +import { ListHasNoMoreDataUI } from '../components/reusable/ListHasNoMoreDataUI';
  12 +import { FollowChildComponent } from '../components/mine/follow/FollowChildComponent';
  13 +
  14 +const TAG = "SearchCreatorPage"
2 15
3 @Entry 16 @Entry
4 @Component 17 @Component
5 struct SearchCreatorPage { 18 struct SearchCreatorPage {
  19 + @State params: Params = router.getParams() as Params;
  20 + @State keyword: string = '';
  21 + @State searchType:string = ""
  22 + @State data_temp: FollowListDetailItem[] = []
  23 + @State data: LazyDataSource<FollowListDetailItem> = new LazyDataSource();
  24 + @State count: number = -1;
  25 + @State isLoading: boolean = false
  26 + @State hasMore: boolean = true
  27 + curPageNum: number = 1;
6 28
7 - build() {  
8 - Row() {  
9 - Column() {  
10 - CustomTitleUI({titleName:"全部结果"}) 29 + onPageShow() {
  30 + this.keyword = this.params?.pageID;
  31 + this.searchType = "onlyRmh"
  32 + this.getNewPageData()
  33 + }
  34 +
  35 + getNewPageData() {
  36 + this.isLoading = true
  37 + if (this.hasMore) {
  38 + SearcherAboutDataModel.getSearchResultListData("20",`${this.curPageNum}`,this.searchType,this.keyword,getContext(this)).then((result)=>{
  39 + if (!this.data || result.list.length == 0){
  40 + this.hasMore = false
  41 + this.isLoading = false
  42 + }else{
  43 + result.list.forEach((data)=>{
  44 + this.data_temp.push(new FollowListDetailItem("",data.data.creatorName,"0","",data.data.id,"0",data.data.userId,data.data.userType,data.data.userId))
  45 + })
  46 +
  47 + let request = new CreatorDetailRequestItem()
  48 +
  49 + this.data_temp.forEach((data)=>{
  50 + request.creatorIdList.push(data.creatorId)
  51 + })
  52 +
  53 + SearcherAboutDataModel.getCreatorDetailListData(request).then((value)=>{
  54 + if(value!=null && value.length>0){
  55 + this.data_temp.forEach((data)=>{
  56 + value.forEach((item)=>{
  57 + if(data.creatorId == item.creatorId){
  58 + data.headPhotoUrl = item.headPhotoUrl
  59 + if(item.fansNum>10000){
  60 + let temp = (item.fansNum/10000)+""
  61 + let index = temp.indexOf('.')
  62 + if(index != -1){
  63 + temp = temp.substring(0,index+2)
  64 + }else{
  65 + temp = temp
  66 + }
  67 + data.cnFansNum = temp + "万"
  68 + }else{
  69 + data.cnFansNum = item.fansNum + ""
  70 + }
  71 + data.introduction = item.introduction
  72 + }
  73 + })
  74 + })
  75 + this.getFollowListStatus(result.totalCount)
  76 + }
  77 + }).catch((err:Error)=>{
  78 + console.log(TAG,JSON.stringify(err))
  79 + this.isLoading = false
  80 + this.count = this.count===-1?0:this.count
  81 + })
  82 + }
  83 + }).catch((err:Error)=>{
  84 + console.log(TAG,JSON.stringify(err))
  85 + this.isLoading = false
  86 + this.count = this.count===-1?0:this.count
  87 + })
  88 + }
  89 + }
  90 +
  91 + getFollowListStatus(totalCount:number){
  92 + let status = new FollowListStatusRequestItem()
  93 + this.data_temp.forEach((item)=>{
  94 + status.creatorIds.push(new QueryListIsFollowedItem(item.creatorId))
  95 + })
11 96
  97 + MinePageDatasModel.getFollowListStatusData(status,getContext(this)).then((newValue)=>{
  98 + newValue.forEach((item)=>{
  99 + this.data_temp.forEach((list)=>{
  100 + if (item.creatorId == list.creatorId) {
  101 + list.status = item.status
  102 + }
  103 + })
  104 + })
  105 +
  106 + this.data_temp.forEach((item)=>{
  107 + this.data.push(new FollowListDetailItem(item.headPhotoUrl,item.cnUserName,item.cnFansNum,item.introduction,item.creatorId,item.status,item.attentionUserId,item.cnUserType,item.cnUserId))
  108 + })
  109 +
  110 + this.data.notifyDataReload()
  111 +
  112 + this.count = this.data.totalCount()
  113 + if (this.data.totalCount() < totalCount) {
  114 + this.curPageNum++
  115 + }else {
  116 + this.hasMore = false
12 } 117 }
  118 +
  119 + this.isLoading = false
  120 + }).catch((err:Error)=>{
  121 + console.log(TAG,"请求失败")
  122 + this.isLoading = false
  123 + this.count = this.count===-1?0:this.count
  124 + })
  125 + }
  126 +
  127 + build() {
  128 + Column() {
  129 + CustomTitleUI({ titleName: "全部结果" })
  130 + Divider()
  131 + .width('100%')
  132 + .height('1lpx')
  133 + .color($r('app.color.color_F5F5F5'))
  134 + .strokeWidth('1lpx')
  135 +
  136 + Column(){
  137 + if(this.count === 0){
  138 + ListHasNoMoreDataUI({style:2})
  139 + .height('100%')
  140 + }else{
  141 + List({ space: 3 }) {
  142 + LazyForEach(this.data, (item: FollowListDetailItem, index: number = 0) => {
  143 + ListItem() {
  144 + FollowChildComponent({data: item,type:1})
  145 + }
  146 + .onClick(() => {
  147 + })
  148 + }, (item: FollowListDetailItem, index: number) => index.toString())
  149 +
  150 + //没有更多数据 显示提示
  151 + if(!this.hasMore){
  152 + ListItem(){
  153 + ListHasNoMoreDataUI()
  154 + }
  155 + }
  156 + }.cachedCount(10)
  157 + .padding({left:'31lpx',right:'31lpx'})
  158 + .layoutWeight(1)
  159 + .scrollBar(BarState.Off)
  160 + .onReachEnd(()=>{
  161 + console.log(TAG,"触底了");
  162 + if(!this.isLoading){
  163 + this.isLoading = true
  164 + //加载分页数据
  165 + this.getNewPageData()
  166 + }
  167 + })
  168 + }
  169 + }.layoutWeight(1)
13 .width('100%') 170 .width('100%')
14 } 171 }
  172 + .width('100%')
15 .height('100%') 173 .height('100%')
16 } 174 }
17 } 175 }
@@ -34,7 +34,7 @@ export class RefreshConstants { @@ -34,7 +34,7 @@ export class RefreshConstants {
34 /** 34 /**
35 * The refresh and load height. 35 * The refresh and load height.
36 */ 36 */
37 - static readonly CUSTOM_LAYOUT_HEIGHT: number = 70; 37 + static readonly CUSTOM_LAYOUT_HEIGHT: number = 90;
38 /** 38 /**
39 * Full the width. 39 * Full the width.
40 */ 40 */
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 export class FollowListDetailItem{ 63 export class FollowListDetailItem{
64 headPhotoUrl:string //头像 64 headPhotoUrl:string //头像
65 cnUserName:string //昵称 65 cnUserName:string //昵称
66 - cnFansNum:number //粉丝数 66 + cnFansNum:string //粉丝数
67 introduction:string //介绍 67 introduction:string //介绍
68 status:string = "0" //是否已经关注 68 status:string = "0" //是否已经关注
69 creatorId:string = "" 69 creatorId:string = ""
@@ -80,7 +80,7 @@ export class FollowListDetailItem{ @@ -80,7 +80,7 @@ export class FollowListDetailItem{
80 fansNum :number = 0 80 fansNum :number = 0
81 81
82 82
83 - constructor(headPhotoUrl:string,cnUserName:string,cnFansNum:number,introduction:string,creatorId:string,status:string,attentionUserId:string,cnUserType:string,cnUserId:string) { 83 + constructor(headPhotoUrl:string,cnUserName:string,cnFansNum:string,introduction:string,creatorId:string,status:string,attentionUserId:string,cnUserType:string,cnUserId:string) {
84 this.headPhotoUrl = headPhotoUrl 84 this.headPhotoUrl = headPhotoUrl
85 this.cnUserName = cnUserName 85 this.cnUserName = cnUserName
86 this.cnFansNum = cnFansNum 86 this.cnFansNum = cnFansNum
@@ -181,6 +181,7 @@ class SearchDescription{ @@ -181,6 +181,7 @@ class SearchDescription{
181 181
182 } 182 }
183 183
  184 +@Observed
184 export class SearchRmhDescription{ 185 export class SearchRmhDescription{
185 likeEnable: string= "" 186 likeEnable: string= ""
186 previewUri: string= "" 187 previewUri: string= ""
@@ -147,6 +147,10 @@ @@ -147,6 +147,10 @@
147 { 147 {
148 "name": "color_9E9E9E", 148 "name": "color_9E9E9E",
149 "value": "#9E9E9E" 149 "value": "#9E9E9E"
  150 + },
  151 + {
  152 + "name": "color_0D000000",
  153 + "value": "#0D000000"
150 } 154 }
151 ] 155 ]
152 } 156 }
1 import { Action, LiveDetailsBean, LiveRoomDataBean } from 'wdBean/Index'; 1 import { Action, LiveDetailsBean, LiveRoomDataBean } from 'wdBean/Index';
2 import { LiveViewModel } from '../viewModel/LiveViewModel'; 2 import { LiveViewModel } from '../viewModel/LiveViewModel';
3 -import { BottomComponent } from '../widgets/details/BottomComponent';  
4 import { TabComponent } from '../widgets/details/TabComponent'; 3 import { TabComponent } from '../widgets/details/TabComponent';
5 import { TopPlayComponent } from '../widgets/details/video/TopPlayComponet'; 4 import { TopPlayComponent } from '../widgets/details/video/TopPlayComponet';
6 import router from '@ohos.router'; 5 import router from '@ohos.router';
@@ -9,6 +8,7 @@ import mediaquery from '@ohos.mediaquery'; @@ -9,6 +8,7 @@ import mediaquery from '@ohos.mediaquery';
9 import { Logger, WindowModel } from 'wdKit/Index'; 8 import { Logger, WindowModel } from 'wdKit/Index';
10 import { window } from '@kit.ArkUI'; 9 import { window } from '@kit.ArkUI';
11 import { devicePLSensorManager } from 'wdDetailPlayApi/Index'; 10 import { devicePLSensorManager } from 'wdDetailPlayApi/Index';
  11 +import { LiveCommentComponent } from 'wdComponent/Index';
12 12
13 @Entry 13 @Entry
14 @Component 14 @Component
@@ -28,7 +28,7 @@ export struct DetailPlayLivePage { @@ -28,7 +28,7 @@ export struct DetailPlayLivePage {
28 //监听屏幕横竖屏变化 28 //监听屏幕横竖屏变化
29 let listener = mediaquery.matchMediaSync('(orientation: landscape)'); 29 let listener = mediaquery.matchMediaSync('(orientation: landscape)');
30 listener.on("change", (mediaQueryResult) => { 30 listener.on("change", (mediaQueryResult) => {
31 - Logger.info(this.TAG,`change;${mediaQueryResult.matches}`) 31 + Logger.info(this.TAG, `change;${mediaQueryResult.matches}`)
32 if (mediaQueryResult.matches) { 32 if (mediaQueryResult.matches) {
33 this.displayDirection = DisplayDirection.VIDEO_HORIZONTAL 33 this.displayDirection = DisplayDirection.VIDEO_HORIZONTAL
34 } else { 34 } else {
@@ -52,7 +52,7 @@ export struct DetailPlayLivePage { @@ -52,7 +52,7 @@ export struct DetailPlayLivePage {
52 TabComponent({ tabs: this.tabs }) 52 TabComponent({ tabs: this.tabs })
53 .layoutWeight(503) 53 .layoutWeight(503)
54 .visibility(this.displayDirection == DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None) 54 .visibility(this.displayDirection == DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None)
55 - BottomComponent() 55 + LiveCommentComponent({ heartNum: this.liveRoomDataBean.likeNum })
56 .visibility(this.displayDirection == DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None) 56 .visibility(this.displayDirection == DisplayDirection.VERTICAL ? Visibility.Visible : Visibility.None)
57 } 57 }
58 .height('100%') 58 .height('100%')
1 -@Component  
2 -export struct BottomComponent {  
3 - aboutToAppear(): void {  
4 - }  
5 -  
6 - build() {  
7 - Row() {  
8 -  
9 - }.backgroundColor(Color.Gray)  
10 - .height(56)  
11 - .width('100%')  
12 - }  
13 -  
14 - aboutToDisappear(): void {  
15 - }  
16 -}  
1 export interface CheckVerifyBean{ 1 export interface CheckVerifyBean{
2 - temToken: string 2 + tempToken: string
3 jwtToken: string 3 jwtToken: string
4 } 4 }
@@ -200,36 +200,15 @@ export class LoginModel { @@ -200,36 +200,15 @@ export class LoginModel {
200 bean['tempToken'] = tempToken; 200 bean['tempToken'] = tempToken;
201 201
202 let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders(); 202 let headers: HashMap<string, string> = HttpUrlUtils.getCommonHeaders();
203 - // let JwtToken = SPHelper.default.getSync(SpConstants.USER_JWT_TOKEN, '') as string;  
204 - // headers.set('JwtToken',(JwtToken));  
205 - // headers.set('rmrb-x-token',(JwtToken));  
206 - // headers.set('cookie', 'RMRB-X-TOKEN=' + JwtToken)  
207 203
208 -  
209 -// let obj: Record<string, string> = {};  
210 -// headers.forEach((value, key) =>{  
211 -// if(key != undefined && key != null && value != undefined && value != null) {  
212 -// obj[key as string] = value;  
213 -// }  
214 -// })  
215 -// let headerString = JSON.stringify(obj);  
216 -// let beanString = JSON.stringify(bean);  
217 -// AlertDialog.show({  
218 -// message:headerString + beanString  
219 -// })  
220 -  
221 - return new Promise<string>((success, fail) => {  
222 - HttpRequest.post<ResponseDTO<string>>(HttpUrlUtils.getForgetPasswordUrl(), bean, headers).then((data: ResponseDTO<string>) => { 204 + return new Promise<object>((success, fail) => {
  205 + HttpRequest.post<ResponseDTO<object>>(HttpUrlUtils.getForgetPasswordUrl(), bean, headers).then((data: ResponseDTO<object>) => {
223 206
224 if (data.code != 0) { 207 if (data.code != 0) {
225 fail(data.message) 208 fail(data.message)
226 return 209 return
227 } 210 }
228 - if (!data || !data.data) {  
229 - fail("数据为空")  
230 - return  
231 - }  
232 - success(data.data) 211 + success(data)
233 }, (error: Error) => { 212 }, (error: Error) => {
234 fail(error.message) 213 fail(error.message)
235 Logger.debug("LoginViewModel:error ", error.toString()) 214 Logger.debug("LoginViewModel:error ", error.toString())
@@ -331,7 +331,7 @@ struct LoginPage { @@ -331,7 +331,7 @@ struct LoginPage {
331 router.back({ 331 router.back({
332 params: { userName: data.userName, 332 params: { userName: data.userName,
333 userId:data.id}, 333 userId:data.id},
334 - url: 'pages/MainPage' 334 + url: `${WDRouterPage.getBundleInfo()}`
335 }) 335 })
336 }).catch((value: string) => { 336 }).catch((value: string) => {
337 promptAction.showToast({ message: value }) 337 promptAction.showToast({ message: value })
@@ -95,7 +95,7 @@ export class LoginViewModel { @@ -95,7 +95,7 @@ export class LoginViewModel {
95 return new Promise<CheckVerifyBean>((success, reject) => { 95 return new Promise<CheckVerifyBean>((success, reject) => {
96 this.loginModel.checkVerifyCode(phone, verifyCode).then((data: CheckVerifyBean) => { 96 this.loginModel.checkVerifyCode(phone, verifyCode).then((data: CheckVerifyBean) => {
97 //todo 保存数据 97 //todo 保存数据
98 - SPHelper.default.save(SpConstants.USER_TEMP_TOKEN, data.temToken) 98 + SPHelper.default.save(SpConstants.USER_TEMP_TOKEN, data.tempToken)
99 SPHelper.default.save(SpConstants.USER_JWT_TOKEN, data.jwtToken) 99 SPHelper.default.save(SpConstants.USER_JWT_TOKEN, data.jwtToken)
100 success(data) 100 success(data)
101 101
@@ -108,7 +108,7 @@ export class LoginViewModel { @@ -108,7 +108,7 @@ export class LoginViewModel {
108 return new Promise<CheckVerifyBean>((success, reject) => { 108 return new Promise<CheckVerifyBean>((success, reject) => {
109 this.loginModel.checkVerifyCodeByToken(verifyCode).then((data: CheckVerifyBean) => { 109 this.loginModel.checkVerifyCodeByToken(verifyCode).then((data: CheckVerifyBean) => {
110 //todo 保存数据 110 //todo 保存数据
111 - SPHelper.default.save(SpConstants.USER_TEMP_TOKEN, data.temToken) 111 + SPHelper.default.save(SpConstants.USER_TEMP_TOKEN, data.tempToken)
112 SPHelper.default.save(SpConstants.USER_JWT_TOKEN, data.jwtToken) 112 SPHelper.default.save(SpConstants.USER_JWT_TOKEN, data.jwtToken)
113 success(data) 113 success(data)
114 114
@@ -134,7 +134,7 @@ export class LoginViewModel { @@ -134,7 +134,7 @@ export class LoginViewModel {
134 134
135 //忘记密码 135 //忘记密码
136 forgotPassword(password: string, tempToken: string) { 136 forgotPassword(password: string, tempToken: string) {
137 - return new Promise<string>(async (success, fail) => { 137 + return new Promise<object>(async (success, fail) => {
138 let passwordNew = await encryptMessage(password) 138 let passwordNew = await encryptMessage(password)
139 this.loginModel.forgotPassword(passwordNew, tempToken).then((data) => { 139 this.loginModel.forgotPassword(passwordNew, tempToken).then((data) => {
140 success(data) 140 success(data)
@@ -3,7 +3,7 @@ import promptAction from '@ohos.promptAction'; @@ -3,7 +3,7 @@ import promptAction from '@ohos.promptAction';
3 import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/Index'; 3 import { Params } from '../../../../../../../commons/wdRouter/oh_modules/wdBean/Index';
4 import router from '@ohos.router'; 4 import router from '@ohos.router';
5 import { LoginViewModel } from './LoginViewModel'; 5 import { LoginViewModel } from './LoginViewModel';
6 -import { Logger, SPHelper } from 'wdKit'; 6 +import { Logger, SPHelper, ToastUtils } from 'wdKit';
7 import { 7 import {
8 SpConstants 8 SpConstants
9 } from '../../../../../../../commons/wdNetwork/oh_modules/wdConstant/src/main/ets/constants/SpConstants' 9 } from '../../../../../../../commons/wdNetwork/oh_modules/wdConstant/src/main/ets/constants/SpConstants'
@@ -303,7 +303,7 @@ export struct SettingPasswordLayout { @@ -303,7 +303,7 @@ export struct SettingPasswordLayout {
303 303
304 /***************************** 事件处理 ******************************************/ 304 /***************************** 事件处理 ******************************************/
305 // 提交按钮点击事件 305 // 提交按钮点击事件
306 - buttonClick() { 306 + async buttonClick() {
307 if (this.btnStatus) { 307 if (this.btnStatus) {
308 // 需要+手机号校验 308 // 需要+手机号校验
309 if (this.password01.length < 6 || this.password01.length > 20) { 309 if (this.password01.length < 6 || this.password01.length > 20) {
@@ -315,18 +315,27 @@ export struct SettingPasswordLayout { @@ -315,18 +315,27 @@ export struct SettingPasswordLayout {
315 return 315 return
316 } 316 }
317 if(this.pageId == 1){ //设置密码 317 if(this.pageId == 1){ //设置密码
318 - SPHelper.default.get(SpConstants.USER_JWT_TOKEN, '').then((str) => { 318 + SPHelper.default.get(SpConstants.USER_TEMP_TOKEN, '').then((str) => {
319 this.loginViewModel.forgotPassword(this.password01, str.toString()).then((data =>{ 319 this.loginViewModel.forgotPassword(this.password01, str.toString()).then((data =>{
320 if (this.pageType == 0) {//登录页 320 if (this.pageType == 0) {//登录页
321 - WDRouterRule.jumpWithPage(WDRouterPage.loginPage); 321 + ToastUtils.shortToast("修改成功")
  322 + router.back({
  323 + url: `${WDRouterPage.getLoginBundleInfo()}`
  324 + })
322 }else if(this.pageType == 1){//设置 325 }else if(this.pageType == 1){//设置
323 let params: Params = { 326 let params: Params = {
324 pageID: 'AccountAndSecurityLayout' 327 pageID: 'AccountAndSecurityLayout'
325 } 328 }
326 - WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params) 329 + ToastUtils.shortToast("修改成功")
  330 + router.back({
  331 + params:params,
  332 + url: `${WDRouterPage.getSettingBundleInfo()}`
  333 + })
  334 + // WDRouterRule.jumpWithPage(WDRouterPage.settingPage, params)
327 } 335 }
328 })) 336 }))
329 - }).catch((err: Error) => { 337 + }).catch((err: string) => {
  338 + ToastUtils.shortToast(err)
330 Logger.error(TAG, 'catch err:' + JSON.stringify(err)); 339 Logger.error(TAG, 'catch err:' + JSON.stringify(err));
331 }); 340 });
332 } 341 }
@@ -5,7 +5,8 @@ @@ -5,7 +5,8 @@
5 "lockfileVersion": 3, 5 "lockfileVersion": 3,
6 "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", 6 "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
7 "specifiers": { 7 "specifiers": {
8 - "@ohos/hypium@1.0.16": "@ohos/hypium@1.0.16" 8 + "@ohos/hypium@1.0.16": "@ohos/hypium@1.0.16",
  9 + "@ohos/pulltorefresh@^2.0.5": "@ohos/pulltorefresh@2.0.5"
9 }, 10 },
10 "packages": { 11 "packages": {
11 "@ohos/hypium@1.0.16": { 12 "@ohos/hypium@1.0.16": {
@@ -13,6 +14,12 @@ @@ -13,6 +14,12 @@
13 "integrity": "sha512-PC3jpwKERg68V+4dmKU+SLjNps9i5JcQH57rQriaTsh62NBgVZs4SceMmNOtrIOyldbEJ5mXSwoZwiG/nkRmTw==", 14 "integrity": "sha512-PC3jpwKERg68V+4dmKU+SLjNps9i5JcQH57rQriaTsh62NBgVZs4SceMmNOtrIOyldbEJ5mXSwoZwiG/nkRmTw==",
14 "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.16.har", 15 "resolved": "https://repo.harmonyos.com/ohpm/@ohos/hypium/-/hypium-1.0.16.har",
15 "registryType": "ohpm" 16 "registryType": "ohpm"
  17 + },
  18 + "@ohos/pulltorefresh@2.0.5": {
  19 + "name": "@ohos/pulltorefresh",
  20 + "integrity": "sha512-mgBvJ6Ga70LmAoPKTOEPLFJluHUEAaBt2+7wF7R6223Vw6UEbZrof1MyvVOLEHk8Uc64ASIMW/TNQ8AHraTV5A==",
  21 + "resolved": "https://repo.harmonyos.com/ohpm/@ohos/pulltorefresh/-/pulltorefresh-2.0.5.har",
  22 + "registryType": "ohpm"
16 } 23 }
17 } 24 }
18 } 25 }
@@ -8,5 +8,8 @@ @@ -8,5 +8,8 @@
8 "description": "Please describe the basic information.", 8 "description": "Please describe the basic information.",
9 "main": "", 9 "main": "",
10 "version": "1.0.0", 10 "version": "1.0.0",
11 - "dependencies": {}  
12 -} 11 + "dependencies": {
  12 + "@ohos/pulltorefresh": "^2.0.5"
  13 + },
  14 + "dynamicDependencies": {}
  15 +}
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 "pages/MorningEveningPaperPage", 7 "pages/MorningEveningPaperPage",
8 "pages/detail/AudioDetail", 8 "pages/detail/AudioDetail",
9 "pages/detail/MultiPictureDetailPage", 9 "pages/detail/MultiPictureDetailPage",
  10 + "pages/detail/DynamicDetailPage",
10 "pages/launchPage/PrivacyPage", 11 "pages/launchPage/PrivacyPage",
11 "pages/launchPage/LaunchPage", 12 "pages/launchPage/LaunchPage",
12 "pages/launchPage/LaunchAdvertisingPage", 13 "pages/launchPage/LaunchAdvertisingPage",