developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
陈剑华
12c93fbe 2 parents 3bfe2518 0bf1c609

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 2 changed files with 2 additions and 1 deletions
@@ -126,6 +126,7 @@ export struct DetailPlayVLivePage { @@ -126,6 +126,7 @@ export struct DetailPlayVLivePage {
126 } break 126 } break
127 case LiveMessageOptType.ZH_STOP_LIVE: { 127 case LiveMessageOptType.ZH_STOP_LIVE: {
128 this.liveState = "end" 128 this.liveState = "end"
  129 + this.playUrl = ""
129 this.contentDetailData.liveInfo.liveState = "end" 130 this.contentDetailData.liveInfo.liveState = "end"
130 } break 131 } break
131 case LiveMessageOptType.ZH_CHANGE_PAD: { 132 case LiveMessageOptType.ZH_CHANGE_PAD: {
@@ -28,7 +28,7 @@ export struct PlayerEndView { @@ -28,7 +28,7 @@ export struct PlayerEndView {
28 DateTimeUtils.parseDate(this.contentDetailData.liveInfo.startTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN) 28 DateTimeUtils.parseDate(this.contentDetailData.liveInfo.startTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)
29 let en = DateTimeUtils.parseDate(this.contentDetailData.liveInfo.endTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN) 29 let en = DateTimeUtils.parseDate(this.contentDetailData.liveInfo.endTime, DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)
30 if (this.contentDetailData.liveInfo?.endTime == null) { 30 if (this.contentDetailData.liveInfo?.endTime == null) {
31 - en = DateTimeUtils.getTimeStamp() 31 + en = DateTimeUtils.parseDate(DateTimeUtils.getCurTime(DateTimeUtils.PATTERN_DATE_TIME_HYPHEN),DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)
32 } 32 }
33 const sd = DateTimeUtils.getDuration(sn, en) 33 const sd = DateTimeUtils.getDuration(sn, en)
34 this.duration = DateTimeUtils.liveDurationSecondToTime(sd / 1000) 34 this.duration = DateTimeUtils.liveDurationSecondToTime(sd / 1000)