developOne / harmonyPool

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

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

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