From ad3ac53da1c3a11a96ae62d790aa61a81b9eab91 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 20 三月 2021 18:47:23 +0800
Subject: [PATCH] 完善APP首页顶部标签栏兼容，初步处理推送
---
src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java | 125 +++++++++++++++++++++++++++++++----------
1 files changed, 94 insertions(+), 31 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 689ca09..8fe2cee 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
@@ -2,32 +2,38 @@
import java.io.IOException;
import java.io.PrintWriter;
+import java.math.BigDecimal;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.google.gson.Gson;
import com.yeshi.buwan.domain.*;
+import com.yeshi.buwan.domain.jump.JumpDetail;
+import com.yeshi.buwan.domain.jump.JumpTypeEnum;
+import com.yeshi.buwan.domain.recommend.HomeRecommendSpecial;
+import com.yeshi.buwan.domain.system.DetailSystemConfig;
+import com.yeshi.buwan.domain.system.DetailSystem;
+import com.yeshi.buwan.domain.video.VideoWatchHistory;
import com.yeshi.buwan.pptv.PPTVUtil;
import com.yeshi.buwan.pptv.entity.PPTVSeries;
import com.yeshi.buwan.service.imp.*;
import com.yeshi.buwan.service.inter.juhe.PPTVService;
+import com.yeshi.buwan.service.inter.recommend.HomeRecommendSpecialService;
+import com.yeshi.buwan.service.inter.video.VideoWatchHistoryService;
+import com.yeshi.buwan.util.*;
import com.yeshi.buwan.util.annotation.RequireUid;
+import com.yeshi.buwan.util.log.VideoLogFactory;
import com.yeshi.buwan.vo.AcceptData;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.methods.GetMethod;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import com.yeshi.buwan.domain.entity.PlayUrl;
-import com.yeshi.buwan.util.CacheUtil;
-import com.yeshi.buwan.util.Constant;
-import com.yeshi.buwan.util.JsonUtil;
-import com.yeshi.buwan.util.JuheVideoUtil;
-import com.yeshi.buwan.util.StringUtil;
-import com.yeshi.buwan.util.TimeUtil;
-import com.yeshi.buwan.util.Utils;
-import com.yeshi.buwan.util.VideoPictureUtil;
import com.yeshi.buwan.util.JuHe.VideoResourceUtil;
import com.yeshi.buwan.util.video.VideoDetailUtil;
import com.yeshi.buwan.util.zhibo.MeiNvZhiBoUtil;
@@ -44,7 +50,7 @@
@Resource
private HomeTypeService homeTypeService;
@Resource
- private ConfigService configService;
+ private DetailSystemConfigService configService;
@Resource
private AdService adService;
@Resource
@@ -76,15 +82,26 @@
@Resource
private PPTVService pptvService;
+ @Resource
+ private VideoWatchHistoryService videoWatchHistoryService;
+
+ @Resource
+ private HomeRecommendSpecialService homeRecommendSpecialService;
+
+ private final Logger userPlayLogger = LoggerFactory.getLogger("videoPlayUser");
+
@RequireUid
public void getHomeAd(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
String vtid = request.getParameter("Vtid");
- if (!"310".equals(vtid)) {
+ HomeRecommendSpecial special = homeRecommendSpecialService.getSpecial(vtid);
+ //鍏煎鏂扮増鏈�
+ if (special != null) {
+
JSONObject object = new JSONObject();
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- List<HomeAd> list = homeAdService.getHomeAdList(detailSystem);
+ List<HomeAd> list = homeAdService.getHomeAdList(detailSystem, special != null ? special.getDataKey() : null);
if (acceptData.getPlatform().equalsIgnoreCase("ios"))// IOS娴嬭瘯
{
@@ -110,7 +127,6 @@
for (int i = 0; i < list.size(); i++)
array.add(StringUtil.outPutResultJson(list.get(i)));
object.put("data", array);
-
} else {
for (HomeAd ad : list) {
if (ad.getVideo() != null) {
@@ -120,14 +136,6 @@
if (!StringUtil.isNullOrEmpty(ad.getParams())) {
ad.setParams(ad.getParams().replace("\"", "\\" + "\""));
}
-
- // 3.4.7浠ヤ笂鐨勭増鏈墠鍙互鐢�
- // com.weikou.beibeivideo.ui.mine.FXBrowserActivity
- if ("com.weikou.beibeivideo.ui.mine.FXBrowserActivity".equalsIgnoreCase(ad.getClazz())
- && acceptData.getVersion() < 71)
- ad.setClazz("com.weikou.beibeivideo.ui.mine.BrowserActivity");
- else
- ad.setClazz("com.weikou.beibeivideo.ui.mine.FXBrowserActivity");
}
object.put("count", (new StringBuilder(String.valueOf(list.size()))).toString());
JSONArray array = new JSONArray();
@@ -136,6 +144,7 @@
object.put("data", array);
}
+ object.put("bannerSizeRate", special.getBannerSizeRate());
out.print(JsonUtil.loadTrueJson(object.toString()));
} else {
classParser.getRecommendCategoryVideoBanner(acceptData, request, out);
@@ -154,12 +163,15 @@
if (StringUtil.isNullOrEmpty(vtid)) {
vtid = "309"; // 涓轰簡鍏煎浠ュ墠鐨勬帹鑽�
}
+
+ HomeRecommendSpecial special = homeRecommendSpecialService.getSpecial(vtid);
+
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
JSONObject object = new JSONObject();
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
List<HomeType> list1 = homeTypeService.getHomeType(detailSystem.getId(), resourceList,
- CacheUtil.getMD5Long(resourceList), -1, Long.parseLong(vtid));
+ CacheUtil.getMD5Long(resourceList), -1, special != null ? special.getDataKey() : null);
List<HomeType> list = new ArrayList<>();
for (HomeType ht : list1)
list.add(ht);
@@ -190,6 +202,20 @@
}
} catch (Exception e) {
e.printStackTrace();
+ }
+ }
+
+ 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());
+ if (adContent != null && adPosition != null) {
+ HomeType.HomeTypeAd ad = new Gson().fromJson(adContent.getValue(), HomeType.HomeTypeAd.class);
+ int adP = Integer.parseInt(adPosition.getValue());
+ if (adP < list.size() && adP > -1) {
+ HomeType homeType = new HomeType();
+ homeType.setAd(ad);
+ list.add(adP, homeType);
+ }
}
}
}
@@ -224,13 +250,14 @@
JSONArray array = new JSONArray();
for (HomeType ht : list) {
- for (int i = 0; i < ht.getHomeVideoList().size(); i++) {
- //鏀瑰彉鍥剧墖
- if (JuheVideoUtil.isNeedDelete(ht.getHomeVideoList().get(i).getVideo(), detailSystem.getId())) {
- ht.getHomeVideoList().remove(i);
- i--;
+ if (ht.getHomeVideoList() != null)
+ for (int i = 0; i < ht.getHomeVideoList().size(); i++) {
+ //鏀瑰彉鍥剧墖
+ if (JuheVideoUtil.isNeedDelete(ht.getHomeVideoList().get(i).getVideo(), detailSystem.getId())) {
+ ht.getHomeVideoList().remove(i);
+ i--;
+ }
}
- }
}
for (int i = 0; i < list.size(); i++)
@@ -323,6 +350,8 @@
String resourceId = request.getParameter("ResourceId");
String thirdType = request.getParameter("Type");
String loginUid = request.getParameter("LoginUid");
+ String position = request.getParameter("Position");
+ String from = request.getParameter("From");
if (StringUtil.isNullOrEmpty(videoId)) {
out.print(JsonUtil.loadFalseJson("璇蜂笂浼燰ideoId"));
@@ -335,7 +364,7 @@
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
//鑾峰彇浼樺厛灞曠ず鐨勬笭閬�
if (StringUtil.isNullOrEmpty(resourceId)) {
@@ -347,13 +376,47 @@
}
}
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ int p = 0;
+ if (!StringUtil.isNullOrEmpty(position)) {
+ p = Integer.parseInt(position);
+ }
+
+ VideoWatchHistory history = new VideoWatchHistory();
+ history.setDevice(acceptData.getDevice());
+ history.setVideoId(videoId);
+ history.setUid(loginUid);
+ history.setPosition(p);
+ videoWatchHistoryService.add(history);
+ }
+ });
+
+ userPlayLogger.info(VideoLogFactory.createUserVideoDetailLog(acceptData.getDevice(), acceptData.getUtdId(), loginUid, acceptData.getDetailSystem().getId(), videoId, resourceId, from));
+
+
//PPTV缃戦〉鎾斁
if (resourceId != null && Integer.parseInt(resourceId) == PPTVUtil.RESOURCE_ID) {
JSONObject data = new JSONObject();
PPTVSeries series = pptvService.getSeriesDetailByVideoId(videoId);
- String playUrl = PPTVUtil.getPlayUrl(series, series.getSeries().get(0));
+ int p = 0;
+ if (!StringUtil.isNullOrEmpty(position)) {
+ p = Integer.parseInt(position);
+ } else {
+ //鍙栨挱鏀捐褰�
+ VideoWatchHistory history = videoWatchHistoryService.getWatchHistory(acceptData.getDevice(), videoId);
+ if (history != null && history.getPosition() != null) {
+ p = history.getPosition();
+ }
+ }
+
+ p = p >= series.getSeries().size() ? 0 : p;
+
+ String playUrl = PPTVUtil.getPlayUrl(series, series.getSeries().get(p));
data.put("videoId", videoId);
data.put("playUrl", playUrl);
+ data.put("name", series.getName());
data.put("pptv", true);
out.print(JsonUtil.loadTrueJson(data.toString()));
return;
@@ -552,7 +615,7 @@
public void isPraise(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- Config config = configService.getConfigByKey("banner_praise", detailSystem, acceptData.getVersion());
+ DetailSystemConfig config = configService.getConfigByKey("banner_praise", detailSystem, acceptData.getVersion());
if ("鏄�".equals(config.getValue())) {
out.print(JsonUtil.loadTrueJson("1"));
} else {
--
Gitblit v1.8.0