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/web/WebHomeParser.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/controller/parser/web/WebHomeParser.java b/src/main/java/com/yeshi/buwan/controller/parser/web/WebHomeParser.java
index cf1797c..b4721e7 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/web/WebHomeParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/web/WebHomeParser.java
@@ -193,7 +193,7 @@
 		List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(platform, 0);
 		List<HomeType> list1 = homeTypeService.getHomeType(detailsystemid, resourceList,
 				CacheUtil.getMD5Long(resourceList),10,309);
-		List<HomeType> list = new ArrayList<HomeType>();
+		List<HomeType> list = new ArrayList<>();
 		for (HomeType ht : list1)
 			list.add(ht);
 
@@ -261,10 +261,10 @@
 		DetailSystem detailSystem = systemService.getDetailSystemByPackage(packageName);
 
 		List<SuperVideoType> clist = classService.getSuperVideoTypeList(detailSystem.getId());
-		List<SuperVideoType> list = new ArrayList<SuperVideoType>();
+		List<SuperVideoType> list = new ArrayList<>();
 		list.addAll(clist);
 
-		List<VideoType> typelist = new ArrayList<VideoType>();
+		List<VideoType> typelist = new ArrayList<>();
 		for (SuperVideoType sv : list) {
 			if (!StringUtil.isNullOrEmpty(sv.getPicture())) {
 				sv.getType().setIcon(sv.getPicture());
@@ -395,12 +395,12 @@
 		List<VideoType> typeList = getFirstType(pid);
 		JSONArray data = new JSONArray();
 		for (VideoType vt : typeList) {
-			List<VideoInfo> list = new ArrayList<VideoInfo>();
+			List<VideoInfo> list = new ArrayList<>();
 			if (StringUtil.isNullOrEmpty(vt.getCategoryType()) || "genre".equalsIgnoreCase(vt.getCategoryType())) {// 鎸夊垎绫绘绱㈡暟鎹�
 				Long startTime = System.currentTimeMillis();
 				List<VideoInfo> list1 = classService.getTypeVideoList(vt.getId() + "", detailSystem, 1, 20, 2,
 						resourceList, CacheUtil.getMD5Long(resourceList));
-				list = new ArrayList<VideoInfo>();
+				list = new ArrayList<>();
 				if (list1 != null)
 					for (VideoInfo info : list1)
 						list.add(info);
@@ -514,7 +514,7 @@
 	}
 
 	private List<VideoType> getFirstType(String parentId) {
-		List<VideoType> list = new ArrayList<VideoType>();
+		List<VideoType> list = new ArrayList<>();
 
 		if ("150".equalsIgnoreCase(parentId) || "151".equalsIgnoreCase(parentId) || "152".equalsIgnoreCase(parentId)
 				|| "153".equalsIgnoreCase(parentId)) {
@@ -550,7 +550,7 @@
 
 		} else {
 			List<VideoType> clist = classService.getFirstTypeList(parentId);
-			list = new ArrayList<VideoType>();
+			list = new ArrayList<>();
 			if (clist != null)
 				for (VideoType vt : clist) {
 					vt.setCategoryType("genre");
@@ -600,7 +600,7 @@
 	}
 
 	public HomeType convertHomeVideoList(HomeType type) {
-		List<VideoInfo> vlist = new ArrayList<VideoInfo>();
+		List<VideoInfo> vlist = new ArrayList<>();
 		List<HomeVideo> list = type.getHomeVideoList();
 		if (list != null)
 			for (HomeVideo hv : list) {
@@ -660,7 +660,7 @@
 
 		List<HomeVideo> homeVideoList = homeTypeService.getVideoByTypes(type, pageIndex, detailSystem);
 
-		List<VideoInfo> list = new ArrayList<VideoInfo>();
+		List<VideoInfo> list = new ArrayList<>();
 		for (int i = 0; i < homeVideoList.size(); i++) {
 			HomeVideo hv = (HomeVideo) homeVideoList.get(i);
 			if (detailSystem.getPackageName().contains("doudou")) {
@@ -716,7 +716,7 @@
 
 		List<RecommendAd> list = adService.getRecommendAdList(detailSystem.getId());
 		if (list == null)
-			list = new ArrayList<RecommendAd>();
+			list = new ArrayList<>();
 		JSONObject object = new JSONObject();
 
 		JSONArray array = new JSONArray();
@@ -772,7 +772,7 @@
 
 		List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(platform, Integer.parseInt(version));
 
-		VideoInfo info = (videoDeailUtil.getVideoInfo(videoId, resourceId, resourceList,
+		VideoInfo info = (videoDeailUtil.getVideoInfo(null,videoId, resourceId, resourceList,
 				CacheUtil.getMD5Long(resourceList)));
 
 		List<VideoType> typeList = classService.getVideoTypeList(info.getId());
@@ -947,7 +947,7 @@
 	}
 
 	public List<HomeVideo> getZhiBoVideoList() throws Exception {
-		List<HomeVideo> list = new ArrayList<HomeVideo>();
+		List<HomeVideo> list = new ArrayList<>();
 		String result = get("http://www.kktv1.com/CDN/output/M/3/I/10002002/P/start-0_offset-6_platform-2/json.js");
 		JSONObject object = JSONObject.fromObject(result);
 		JSONArray array = object.optJSONArray("roomList");

--
Gitblit v1.8.0