From 0a18a8cb0a7a57bf1f82df425251334c57f8c39a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 一月 2021 15:40:37 +0800
Subject: [PATCH] 新增手机号/qq/微信绑定
---
src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java | 85 ++++++++++++++++++++++++------------------
1 files changed, 49 insertions(+), 36 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 2567b24..9fbd87b 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
@@ -9,6 +9,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.util.annotation.RequireUid;
import com.yeshi.buwan.vo.AcceptData;
import org.apache.commons.httpclient.HttpClient;
@@ -16,16 +17,6 @@
import org.apache.commons.httpclient.methods.GetMethod;
import org.springframework.stereotype.Controller;
-import com.yeshi.buwan.domain.Config;
-import com.yeshi.buwan.domain.DetailSystem;
-import com.yeshi.buwan.domain.HomeAd;
-import com.yeshi.buwan.domain.HomeType;
-import com.yeshi.buwan.domain.HomeVideo;
-import com.yeshi.buwan.domain.RecommendAd;
-import com.yeshi.buwan.domain.UserInfo;
-import com.yeshi.buwan.domain.VideoDetailInfo;
-import com.yeshi.buwan.domain.VideoInfo;
-import com.yeshi.buwan.domain.VideoType;
import com.yeshi.buwan.domain.entity.PlayUrl;
import com.yeshi.buwan.service.imp.AdService;
import com.yeshi.buwan.service.imp.AttentionService;
@@ -86,6 +77,9 @@
@Resource
private ClassParser classParser;
+ @Resource
+ private VideoDetailUtil videoDetailUtil;
+
@RequireUid
public void getHomeAd(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
String vtid = request.getParameter("Vtid");
@@ -95,28 +89,6 @@
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
List<HomeAd> list = homeAdService.getHomeAdList(detailSystem);
-
- // 娴嬭瘯璺宠浆灏忕▼搴�
- // JSONObject xcx = new JSONObject();
- // xcx.put("thumb",
- // "http://img.zcool.cn/community/0169235af03daea801206aba8664d7.jpeg@260w_195h_1c_1e_1o_100sh.jpg");
- // xcx.put("title", "娴嬭瘯鏍囬");
- // xcx.put("desc", "绠�浠�");
- // xcx.put("path", "pages/index/index");
- // xcx.put("username", "gh_33b9bea57aff");
- // xcx.put("url", "http://video.yeshitv.com");
-
- // 娴嬭瘯鏍囬
- // HomeAd homeAd = new HomeAd();
- // homeAd.setClazz("com");
- // homeAd.setLinkType(5);
- // homeAd.setOrderby(0);
- // homeAd.setPicture(
- // "http://img.zcool.cn/community/0169235af03daea801206aba8664d7.jpeg@260w_195h_1c_1e_1o_100sh.jpg");
- // homeAd.setVideo(new VideoInfo(1 + ""));
- // homeAd.setParams(xcx.toString());
- // homeAd.setTitle("鏍囬");
- // list.add(homeAd);
if (acceptData.getPlatform().equalsIgnoreCase("ios"))// IOS娴嬭瘯
{
@@ -172,7 +144,6 @@
} else {
classParser.getRecommendCategoryVideoBanner(acceptData, request, out);
}
-
}
// 棣栭〉绫诲瀷鑾峰彇
@@ -366,9 +337,11 @@
return;
}
+ DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
+
List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion());
- VideoInfo info = (videoDeailUtil.getVideoInfo(videoId, resourceId, resourceList,
+ VideoInfo info = (videoDeailUtil.getVideoInfo(detailSystem.getId(), videoId, resourceId, resourceList,
CacheUtil.getMD5Long(resourceList)));
List<VideoType> typeList = classService.getVideoTypeList(info.getId());
@@ -391,7 +364,7 @@
// version));
// 杩囨护鐗堟潈瑙嗛鍏抽敭瀛�
- DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
+
// 缁熻娣诲姞
// statisticsService.addStatistics(detailSystem.getId(), videoId);
@@ -431,6 +404,46 @@
out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
obj.toString()));
}
+
+ /**
+ * 鑾峰彇瑙嗛鐨勫墽闆嗗垪琛�
+ *
+ * @param acceptData
+ * @param request
+ * @param out
+ */
+ @RequireUid
+ public void getVideoEpisodeList(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+ String videoId = request.getParameter("VideoId");
+ String resourceId = request.getParameter("ResourceId");
+ String page = request.getParameter("Page");//椤电爜
+
+ if (StringUtil.isNullOrEmpty(videoId)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼燰ideoId"));
+ return;
+ }
+ if (StringUtil.isNullOrEmpty(resourceId)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼燫esourceId"));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(page)) {
+ out.print(JsonUtil.loadFalseJson("璇蜂笂浼燩age"));
+ return;
+ }
+
+
+ List<VideoDetailInfo> list = videoDetailUtil.getVideoDetailList(videoId, new VideoResource(resourceId), Integer.parseInt(page), 100);
+ if (list == null)
+ list = new ArrayList<>();
+ JSONObject data = new JSONObject();
+ String listStr = StringUtil.outPutResultJson(list);
+ boolean hasMore = list != null && list.size() > 0;
+ data.put("list", listStr);
+ data.put("hasMore", hasMore);
+ out.print(JsonUtil.loadTrueJson(data.toString()));
+ }
+
@RequireUid
public void getNewVideoDetail(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
@@ -481,7 +494,7 @@
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- PlayUrl pu = videoDeailUtil.getPlayUrl(detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
+ PlayUrl pu = videoDeailUtil.getPlayUrl(acceptData, detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
if (pu != null) {
if (!StringUtil.isNullOrEmpty(pu.getUrl()))
--
Gitblit v1.8.0