From f788607ff771a47bc60d6a86e00b3433c40f3d2c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 九月 2021 15:22:03 +0800
Subject: [PATCH] 接入视频直播

---
 src/main/java/com/yeshi/buwan/vo/tvlive/TVLiveChannelVO.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/vo/tvlive/TVLiveChannelVO.java b/src/main/java/com/yeshi/buwan/vo/tvlive/TVLiveChannelVO.java
index a5fdde2..adf0beb 100644
--- a/src/main/java/com/yeshi/buwan/vo/tvlive/TVLiveChannelVO.java
+++ b/src/main/java/com/yeshi/buwan/vo/tvlive/TVLiveChannelVO.java
@@ -2,6 +2,9 @@
 
 import com.yeshi.buwan.domain.live.TVLiveChannel;
 import com.yeshi.buwan.util.StringUtil;
+import com.yeshi.buwan.util.tvlive.TVChannelUtil;
+
+import java.util.Date;
 
 public class TVLiveChannelVO {
 
@@ -17,17 +20,19 @@
         vo.setName(tvLiveChannel.getName());
         vo.setPicture(tvLiveChannel.gethPicture());
 
-        if (!StringUtil.isNullOrEmpty(tvLiveChannel.getNowProgram()) && !StringUtil.isNullOrEmpty(tvLiveChannel.getNowProgramTime())) {
-            vo.setNowProgram(tvLiveChannel.getNowProgramTime() + " " + tvLiveChannel.getNowProgram());
+        TVLiveChannel.TVLiveProgram[] programs = TVChannelUtil.getNowProgram(new Date(), tvLiveChannel.getProgramList());
+
+        if (programs != null && programs.length > 0) {
+            vo.setNowProgram(programs[0].getTime() + " " + programs[0].getName());
         } else {
             vo.setNowProgram("鏆傛棤鑺傜洰淇℃伅");
         }
 
 
-        if (!StringUtil.isNullOrEmpty(tvLiveChannel.getNextProgram()) && !StringUtil.isNullOrEmpty(tvLiveChannel.getNextProgramTime())) {
-            vo.setNowProgram(tvLiveChannel.getNextProgramTime() + " " + tvLiveChannel.getNextProgram());
+        if (programs != null && programs.length > 1) {
+            vo.setNextProgram(programs[1].getTime() + " " + programs[1].getName());
         } else {
-            vo.setNowProgram("鏆傛棤鑺傜洰淇℃伅");
+            vo.setNextProgram("鏆傛棤鑺傜洰淇℃伅");
         }
         return vo;
     }

--
Gitblit v1.8.0