fanmingyou3_wd

删除重复的VideoInfo,LiveInfo改名为LiveInfoDTO

当获取播放地址错误时,给出Toast
1 -import { FullColumnImgUrlsDTO } from './FullColumnImgUrlsDTO';  
2 -import { LiveInfo } from './LiveInfo';  
3 -import { VideoInfo } from './VideoInfo'; 1 +import { FullColumnImgUrlDTO } from '../detail/FullColumnImgUrlDTO';
  2 +import { LiveInfoDTO } from '../detail/LiveInfoDTO';
  3 +import { VideoInfoDTO } from '../detail/VideoInfoDTO';
4 4
5 export interface ContentDTO { 5 export interface ContentDTO {
6 cityCode: string; 6 cityCode: string;
@@ -49,7 +49,7 @@ export interface ContentDTO { @@ -49,7 +49,7 @@ export interface ContentDTO {
49 newsTitle:string; 49 newsTitle:string;
50 publishTime:string; 50 publishTime:string;
51 visitorComment:number; 51 visitorComment:number;
52 - fullColumnImgUrls:FullColumnImgUrlsDTO[];  
53 - liveInfo?: LiveInfo; // 直播新闻信息【BFF聚合】  
54 - videoInfo?: VideoInfo; // 视频新闻信息【BFF聚合】,视频非原片+清晰度最高的 52 + fullColumnImgUrls:FullColumnImgUrlDTO[];
  53 + liveInfo?: LiveInfoDTO; // 直播新闻信息【BFF聚合】
  54 + videoInfo?: VideoInfoDTO; // 视频新闻信息【BFF聚合】,视频非原片+清晰度最高的
55 } 55 }
1 -export interface FullColumnImgUrlsDTO {  
2 - format: number;  
3 - height: number;  
4 - weight: number;  
5 - landscape: number;  
6 - size: number;  
7 - url: string;  
8 -}  
1 -export interface VideoInfo {  
2 - videoUrl: string; //视频播放地址  
3 - videoDuration: string; // 视频时长  
4 - videoLandscape: string; // 1横屏 2竖屏  
5 - firstFrameImageUri: string; // 首帧图;【视频内容,contentPictures中】  
6 -}  
1 -export interface VideoInfoDTO {  
2 - clarity: number;  
3 - resolutionHeight: number;  
4 - resolutionWidth: number;  
5 - videoDuration: number;  
6 - videoLandScape: number;  
7 - videoType: number;  
8 - videoUrl: string;  
9 -}  
1 -export interface LiveInfo { 1 +export interface LiveInfoDTO {
2 liveState: string; // 直播新闻-直播状态 2 liveState: string; // 直播新闻-直播状态
3 liveUrl: string; //【暂时未使用,默认取第一个】直播新闻-直播地址 3 liveUrl: string; //【暂时未使用,默认取第一个】直播新闻-直播地址
4 liveStartTime: string; 4 liveStartTime: string;
@@ -2,8 +2,9 @@ export interface VideoInfoDTO { @@ -2,8 +2,9 @@ export interface VideoInfoDTO {
2 clarity: number; 2 clarity: number;
3 resolutionHeight: number; 3 resolutionHeight: number;
4 resolutionWidth: number; 4 resolutionWidth: number;
5 - videoDuration: number;  
6 - videoLandScape: number; 5 + videoDuration: string; // 视频时长
  6 + videoLandScape: number; // 1横屏 2竖屏
7 videoType: number; 7 videoType: number;
8 - videoUrl: string; 8 + videoUrl: string; //视频播放地址
  9 + firstFrameImageUri: string; // 首帧图;【视频内容,contentPictures中】
9 } 10 }
1 import { BusinessError } from '@ohos.base' 1 import { BusinessError } from '@ohos.base'
2 -import { Logger } from 'wdKit' 2 +import { Logger, ToastUtils } from 'wdKit'
3 import { ResponseDTO} from 'wdNetwork' 3 import { ResponseDTO} from 'wdNetwork'
4 import { ContentDetailRequest } from 'wdDetailPlayApi' 4 import { ContentDetailRequest } from 'wdDetailPlayApi'
5 import { ContentDetailDTO } from 'wdBean' 5 import { ContentDetailDTO } from 'wdBean'
@@ -56,7 +56,8 @@ export class PlayViewModel { @@ -56,7 +56,8 @@ export class PlayViewModel {
56 // this.title = '旅途平安!这首歌送给即将启程回家的你' 56 // this.title = '旅途平安!这首歌送给即将启程回家的你'
57 // this.url = 'https://cdnjdout.aikan.pdnews.cn/zhbj-20240127/vod/content/output/f45ef51bb33f4ffd9458f8b386aa3227_opt.mp4' 57 // this.url = 'https://cdnjdout.aikan.pdnews.cn/zhbj-20240127/vod/content/output/f45ef51bb33f4ffd9458f8b386aa3227_opt.mp4'
58 this.canStart = false; 58 this.canStart = false;
59 - this.message = '获取播放地址错误'; 59 + this.message = '获取播放地址异常';
  60 + ToastUtils.showToast(this.message, 1000);
60 }) 61 })
61 .finally(() => { 62 .finally(() => {
62 Logger.debug(TAG, `getContentDetailData finally`); 63 Logger.debug(TAG, `getContentDetailData finally`);