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/vo/video/VideoAdminInfoVO.java | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/vo/video/VideoAdminInfoVO.java b/src/main/java/com/yeshi/buwan/vo/video/VideoAdminInfoVO.java
index 99f36d3..cef5cd4 100644
--- a/src/main/java/com/yeshi/buwan/vo/video/VideoAdminInfoVO.java
+++ b/src/main/java/com/yeshi/buwan/vo/video/VideoAdminInfoVO.java
@@ -4,16 +4,27 @@
import com.yeshi.buwan.domain.VideoInfo;
import com.yeshi.buwan.util.StringUtil;
import com.yeshi.buwan.util.TimeUtil;
+import com.yeshi.buwan.util.video.VideoConstant;
public class VideoAdminInfoVO {
private String id;
private String name;
- private String picture;
+ private String hpicture;
+ private String vpicture;
private String updatetime;
private String show;
private String tag;
private Integer freeType;
+ private String area;
+
+ public String getArea() {
+ return area;
+ }
+
+ public void setArea(String area) {
+ this.area = area;
+ }
public Integer getFreeType() {
return freeType;
@@ -43,7 +54,12 @@
VideoAdminInfoVO vo = new VideoAdminInfoVO();
vo.setId(video.getId());
vo.setName(video.getName());
- vo.setPicture(video.getHpicture());
+ if (video.getVideoType() != null && VideoConstant.isMainCategory(video.getVideoType().getId()))
+ vo.setVpicture(video.getVpicture());
+ else
+ vo.setHpicture(video.getHpicture());
+
+
vo.setShow(video.getShow() + "");
vo.setUpdatetime(TimeUtil.getGernalTime(
Long.parseLong(
@@ -58,7 +74,10 @@
VideoAdminInfoVO vo = new VideoAdminInfoVO();
vo.setId(solrVideo.getId());
vo.setName(solrVideo.getName());
- vo.setPicture(solrVideo.getHpicture());
+ if (VideoConstant.isMainCategory(solrVideo.getRootVideoType()))
+ vo.setVpicture(solrVideo.getPicture());
+ else
+ vo.setHpicture(solrVideo.getHpicture());
vo.setShow(solrVideo.getShow() + "");
vo.setUpdatetime(TimeUtil.getGernalTime(
Long.parseLong(
@@ -66,6 +85,7 @@
"yyyy-MM-dd"));
vo.setTag(solrVideo.getTag());
vo.setFreeType(solrVideo.getFreeType());
+ vo.setArea(solrVideo.getArea());
return vo;
}
@@ -85,14 +105,6 @@
this.name = name;
}
- public String getPicture() {
- return picture;
- }
-
- public void setPicture(String picture) {
- this.picture = picture;
- }
-
public String getUpdatetime() {
return updatetime;
}
@@ -101,4 +113,19 @@
this.updatetime = updatetime;
}
+ public String getHpicture() {
+ return hpicture;
+ }
+
+ public void setHpicture(String hpicture) {
+ this.hpicture = hpicture;
+ }
+
+ public String getVpicture() {
+ return vpicture;
+ }
+
+ public void setVpicture(String vpicture) {
+ this.vpicture = vpicture;
+ }
}
--
Gitblit v1.8.0