From 1d28c69a351ae108f4116a10f19f615c89a660a2 Mon Sep 17 00:00:00 2001 From: admin <2780501319@qq.com> Date: 星期四, 01 四月 2021 01:58:43 +0800 Subject: [PATCH] 首页数据修改 --- src/main/java/com/yeshi/buwan/controller/parser/UserParser.java | 41 +++++++++++++++++++++++++++++++++++------ 1 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java index e4abe35..6ec01ea 100644 --- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java +++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java @@ -431,14 +431,42 @@ vt.setId(0); vt.setName("鍏ㄩ儴"); typeList.add(vt); - Set<Long> set = new HashSet<>(); - for (VideoInfo videoInfo : list) { - if (videoInfo.getShowType() == 1 && videoInfo.getVideoType() != null) - set.add(videoInfo.getVideoType().getId()); + List<Long> set = new ArrayList<>(); + //灏嗚棰戝唴瀹瑰垎绫诲苟鎺掑簭 + Map<Long, List<VideoInfo>> videoMap = new HashMap<>(); + for (int i = 0; i < list.size(); i++) { + VideoInfo videoInfo = list.get(i); + if (videoInfo.getShowType() == 1 && videoInfo.getVideoType() != null) { + if (videoMap.get(videoInfo.getVideoType().getId()) == null) + videoMap.put(videoInfo.getVideoType().getId(), new ArrayList<>()); + videoMap.get(videoInfo.getVideoType().getId()).add(videoInfo); + if (!set.contains(videoInfo.getVideoType().getId())) + set.add(videoInfo.getVideoType().getId()); + + if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion()) && (StringUtil.isNullOrEmpty(type) || type.equalsIgnoreCase("0"))) { + list.remove(i); + i--; + } + } } - for (Iterator<Long> its = set.iterator(); its.hasNext(); ) { - Long typeId = its.next(); + //閲嶆柊缁勭粐鏁版嵁 + if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion()) && (StringUtil.isNullOrEmpty(type) || type.equalsIgnoreCase("0"))) { + List<VideoInfo> albumVideoList = new ArrayList<>(); + for (int i = 0; i < set.size(); i++) { + Long typeId = set.get(i); + String typeName = VideoConstant.getMainCategoryName(typeId); + if (!StringUtil.isNullOrEmpty(typeName)) { + videoMap.get(typeId).get(0).setAlbumMoreInfo(new VideoInfo.VideoAlbumMoreInfo(typeName, i + 1)); + albumVideoList.addAll(videoMap.get(typeId)); + } + } + list.addAll(0, albumVideoList); + } + + + for (int i = 0; i < set.size(); i++) { + Long typeId = set.get(i); String typeName = VideoConstant.getMainCategoryName(typeId); if (!StringUtil.isNullOrEmpty(typeName)) { vt = new VideoType(); @@ -448,6 +476,7 @@ } } + vt = new VideoType(); vt.setId(Constant.SEARCH_RESULT_TYPE_HIGH_DEFINITION); vt.setName("楂樻竻"); -- Gitblit v1.8.0