From f537abe9f3646c739beaf15076246a2f71a347e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 20 二月 2025 16:57:55 +0800
Subject: [PATCH] IOS广告增加区域屏蔽
---
src/main/java/com/yeshi/buwan/vo/tvlive/TVLiveChannelVO.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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..7d31b62 100644
--- a/src/main/java/com/yeshi/buwan/vo/tvlive/TVLiveChannelVO.java
+++ b/src/main/java/com/yeshi/buwan/vo/tvlive/TVLiveChannelVO.java
@@ -1,7 +1,9 @@
package com.yeshi.buwan.vo.tvlive;
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 +19,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