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/controller/parser/HomeParser.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
index 60f8d41..cc8d534 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
@@ -12,6 +12,7 @@
import com.yeshi.buwan.domain.video.VideoWatchHistory;
import com.yeshi.buwan.dto.log.BaseLog;
import com.yeshi.buwan.dto.statistic.video.VideoDetailStatisticData;
+import com.yeshi.buwan.exception.video.VideoPlayException;
import com.yeshi.buwan.videos.mogotv.MogoTVUtil;
import com.yeshi.buwan.videos.pptv.PPTVApiUtil;
import com.yeshi.buwan.videos.pptv.PPTVUtil;
@@ -203,9 +204,9 @@
List<HomeType> list = new ArrayList<>();
for (HomeType ht : list1)
list.add(ht);
- if ("309".equals(vtid)) {
- if (!"ios".equalsIgnoreCase(acceptData.getPlatform())) {
- Map<String, String> confMap = configService.getConfigAsMap(detailSystem, acceptData.getVersion());
+ if ("309" .equals(vtid)) {
+ if (!"ios" .equalsIgnoreCase(acceptData.getPlatform())) {
+ Map<String, String> confMap = configService.getConfigAsMap(acceptData.getChildDetailSystem(), acceptData.getVersion());
String mm = confMap.get("meinv_mm_count");
int count = Integer.parseInt(mm);
if (count > 0) {
@@ -234,8 +235,8 @@
}
if (VersionUtil.isGraterThan387(acceptData.getPlatform(), acceptData.getVersion())) {
- DetailSystemConfig adContent = configService.getConfigByKey("home_banner_ad_content", acceptData.getDetailSystem(), acceptData.getVersion());
- DetailSystemConfig adPosition = configService.getConfigByKey("home_banner_ad_position", acceptData.getDetailSystem(), acceptData.getVersion());
+ DetailSystemConfig adContent = configService.getConfigByKey("home_banner_ad_content", acceptData.getChildDetailSystem(), acceptData.getVersion());
+ DetailSystemConfig adPosition = configService.getConfigByKey("home_banner_ad_position", acceptData.getChildDetailSystem(), acceptData.getVersion());
if (adContent != null && adPosition != null) {
HomeType.HomeTypeAd ad = new Gson().fromJson(adContent.getValue(), HomeType.HomeTypeAd.class);
int adP = Integer.parseInt(adPosition.getValue());
@@ -264,7 +265,7 @@
}
}
- if ("huawei".equalsIgnoreCase(channel)) {
+ if ("huawei" .equalsIgnoreCase(channel)) {
for (int i = 0; i < list.size(); i++) {
if (list.get(i).getName().equalsIgnoreCase("缇庡コ")) {
list.remove(i);
@@ -335,15 +336,15 @@
try {
if (VersionUtil.isGraterThan387(acceptData.getPlatform(), acceptData.getVersion()) && dataKey.equalsIgnoreCase("recommend")) {
- DetailSystemConfig adContent = configService.getConfigByKey("home_banner_ad_content", acceptData.getDetailSystem(), acceptData.getVersion());
- DetailSystemConfig adPosition = configService.getConfigByKey("home_banner_ad_position", acceptData.getDetailSystem(), acceptData.getVersion());
+ DetailSystemConfig adContent = configService.getConfigByKey("home_banner_ad_content", acceptData.getChildDetailSystem(), acceptData.getVersion());
+ DetailSystemConfig adPosition = configService.getConfigByKey("home_banner_ad_position", acceptData.getChildDetailSystem(), acceptData.getVersion());
if (adContent != null && adPosition != null) {
HomeType.HomeTypeAd ad = new Gson().fromJson(adContent.getValue(), HomeType.HomeTypeAd.class);
int adP = Integer.parseInt(adPosition.getValue());
if (adP < homeTypeList.size() && adP > -1) {
HomeType homeType = new HomeType();
homeType.setAd(ad);
- if ("1".equalsIgnoreCase(page)) {
+ if ("1" .equalsIgnoreCase(page)) {
homeTypeList.add(adP, homeType);
}
count++;
@@ -590,6 +591,17 @@
if (StringUtil.isNullOrEmpty(resourceId)) {
resourceId = internetSearchVideo.getResourceIds().split(",")[0];
}
+
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
+
+ if (resourceList != null) {
+ if (!resourceList.contains(Long.parseLong(resourceId))) {
+ out.print(JsonUtil.loadFalseAdmin(""));
+ return;
+ }
+ }
+
+
VideoInfo info = null;
if (Integer.parseInt(resourceId) == YouKuUtil.RESOURCE_ID) {
try {
@@ -777,7 +789,7 @@
data.put("playUrl", playUrl);
data.put("name", videoName);
data.put("pptv", true);
- data.put("vip", "1".equalsIgnoreCase(series.getFree()));
+ data.put("vip", "1" .equalsIgnoreCase(series.getFree()));
data.put("sessionId", sessionId);
out.print(JsonUtil.loadTrueJson(data.toString()));
LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createVideoDetail(new BaseLog(acceptData, loginUid), videoId, series.getName(), from));
@@ -965,7 +977,12 @@
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- PlayUrl pu = videoDeailUtil.getPlayUrl(acceptData, detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
+ PlayUrl pu = null;
+ try {
+ pu = videoDeailUtil.getPlayUrl(acceptData, detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
+ } catch (VideoPlayException e) {
+ e.printStackTrace();
+ }
if (pu != null) {
if (!StringUtil.isNullOrEmpty(pu.getUrl()))
@@ -1019,8 +1036,8 @@
public void isPraise(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- DetailSystemConfig config = configService.getConfigByKey("banner_praise", detailSystem, acceptData.getVersion());
- if ("鏄�".equals(config.getValue())) {
+ DetailSystemConfig config = configService.getConfigByKey("banner_praise", acceptData.getChildDetailSystem(), acceptData.getVersion());
+ if ("鏄�" .equals(config.getValue())) {
out.print(JsonUtil.loadTrueJson("1"));
} else {
out.print(JsonUtil.loadTrueJson("0"));
@@ -1041,7 +1058,7 @@
public void getRecommendSearchSpecial(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
//鎺ㄨ崘鎼滅储涓撻
- DetailSystemConfig config = configService.getConfigByKey("recommend_search_special_position", detailSystem, acceptData.getVersion());
+ DetailSystemConfig config = configService.getConfigByKey("recommend_search_special_position", acceptData.getChildDetailSystem(), acceptData.getVersion());
if (config == null) {
out.print(JsonUtil.loadFalseAdmin("浣嶇疆涓虹┖"));
return;
--
Gitblit v1.8.0