3.9.0兼容

admin

2021-03-31 431c684f254ba5163cb6256739215e2099b91aaf

3.9.0兼容

 src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java

@@ -35,6 +35,7 @@
import com.yeshi.buwan.util.log.UserActiveLogFactory;
import com.yeshi.buwan.util.log.VideoLogFactory;
import com.yeshi.buwan.vo.AcceptData;
import com.yeshi.buwan.vo.video.VideoDetailVO;
import com.yeshi.buwan.youku.YouKuUtil;
import com.yeshi.buwan.youku.entity.YouKuSearchVideoMap;
import com.yeshi.buwan.youku.entity.YouKuShowDetail;
@@ -416,8 +417,14 @@

        JSONArray array = new JSONArray();
        JSONObject obj = new JSONObject();
        out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
                obj.toString()));

        if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion())) {
            out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), new VideoDetailVO.VideoAdInfo(true,false), null)), array.toString(),
                    obj.toString()));
        } else {
            out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
                    obj.toString()));
        }
    }

    @RequireUid
@@ -531,28 +538,39 @@
            info.setCommentCount((int) count);

        JSONObject obj = new JSONObject();
        VideoDetailVO.AttentionInfo attention = null;
        if (info.getVideoDetailList() != null)
            if (info.getVideoDetailList().size() > 1) {// 多集,可关注
                boolean isAttention = false;
                if (!StringUtil.isNullOrEmpty(loginUid)) {
                    isAttention = attentionService.isAddAttention(loginUid, info.getId());
                }
                attention = new VideoDetailVO.AttentionInfo();
                attention.setName(info.getName());
                attention.setPicture(info.getPicture());
                if (StringUtil.isNullOrEmpty(info.getUpdatetime())) {
                    attention.setUpdateInfo("更新:" + TimeUtil.getCommentTime(info.getCreatetime()));
                } else {
                    attention.setUpdateInfo("更新:" + TimeUtil.getCommentTime(Long.parseLong(info.getUpdatetime())));
                }
                attention.setAttention(isAttention);

                //兼容老版本
                JSONObject attentionInfo = new JSONObject();
                attentionInfo.put("Name", info.getName());
                attentionInfo.put("Picture", info.getPicture());
                if (StringUtil.isNullOrEmpty(info.getUpdatetime()))
                    attentionInfo.put("UpdateInfo", "更新:" + TimeUtil.getCommentTime(info.getCreatetime()));
                else
                    attentionInfo.put("UpdateInfo", "更新:" + TimeUtil.getCommentTime(Long.parseLong(info.getUpdatetime())));
                attentionInfo.put("IsAttention", isAttention);
                attentionInfo.put("Picture", attention.getPicture());
                attentionInfo.put("Name", attention.getName());
                attentionInfo.put("UpdateInfo", attention.getUpdateInfo());
                attentionInfo.put("IsAttention", attention.isAttention());
                obj.put("Attention", attentionInfo);
            }
        UserInfo user = userService.getUserInfo(acceptData.getUid());
        if (Utils.isTest(request, user, detailSystem.getId()))
            out.print(JsonUtil.loadTrueJson(""));
        else
        if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion())) {
            out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), new VideoDetailVO.VideoAdInfo(true,true), attention)), array.toString(),
                    obj.toString()));
        } else {
            out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
                    obj.toString()));
        }
    }



 src/main/java/com/yeshi/buwan/domain/HomeType.java

@@ -60,6 +60,40 @@
    @Expose
    private int number;// 显示多少个

    //刷新的位置  0-无刷新  1-右上角  2-下方
    @Expose
    private int refreshPosition;
    @Expose
    private String moreTag;

    //数据总数
    @Expose
    private int count;

    public int getCount() {
        return count;
    }

    public void setCount(int count) {
        this.count = count;
    }

    public int getRefreshPosition() {
        return refreshPosition;
    }

    public void setRefreshPosition(int refreshPosition) {
        this.refreshPosition = refreshPosition;
    }

    public String getMoreTag() {
        return moreTag;
    }

    public void setMoreTag(String moreTag) {
        this.moreTag = moreTag;
    }

    @Expose
    @Transient
    private HomeTypeAd ad;

 src/main/java/com/yeshi/buwan/util/VersionUtil.java

@@ -21,4 +21,10 @@
            return true;
        return false;
    }

    public static boolean isGraterThan390(String platform, int version) {
        if ("android".equalsIgnoreCase(platform) && version >= 109)
            return true;
        return false;
    }
}

 src/main/java/com/yeshi/buwan/vo/video/VideoDetailVO.java

New file
@@ -0,0 +1,120 @@
package com.yeshi.buwan.vo.video;

import com.google.gson.annotations.Expose;
import com.yeshi.buwan.domain.VideoInfoDetail;

public class VideoDetailVO {
    //视频信息
    @Expose
    private VideoInfoDetail video;
    @Expose
    private VideoAdInfo adInfo;
    @Expose
    private AttentionInfo attention;


    public VideoDetailVO(VideoInfoDetail video, VideoAdInfo adInfo, AttentionInfo attention) {
        this.video = video;
        this.adInfo = adInfo;
        this.attention = attention;
    }

    public VideoInfoDetail getVideo() {
        return video;
    }

    public void setVideo(VideoInfoDetail video) {
        this.video = video;
    }

    public VideoAdInfo getAdInfo() {
        return adInfo;
    }

    public void setAdInfo(VideoAdInfo adInfo) {
        this.adInfo = adInfo;
    }


    public AttentionInfo getAttention() {
        return attention;
    }

    public void setAttention(AttentionInfo attention) {
        this.attention = attention;
    }

    public static class VideoAdInfo {
        //播放前贴广告
        @Expose
        private boolean playVideo;
        //全屏视频广告
        @Expose
        private boolean fullVideo;

        public VideoAdInfo(boolean playVideo, boolean fullVideo) {
            this.playVideo = playVideo;
            this.fullVideo = fullVideo;
        }

        public boolean isPlayVideo() {
            return playVideo;
        }

        public void setPlayVideo(boolean playVideo) {
            this.playVideo = playVideo;
        }

        public boolean isFullVideo() {
            return fullVideo;
        }

        public void setFullVideo(boolean fullVideo) {
            this.fullVideo = fullVideo;
        }
    }

    public static class AttentionInfo {
        @Expose
        private String name;
        @Expose
        private String picture;
        @Expose
        private String updateInfo;
        @Expose
        private boolean attention;

        public String getName() {
            return name;
        }

        public void setName(String name) {
            this.name = name;
        }

        public String getPicture() {
            return picture;
        }

        public void setPicture(String picture) {
            this.picture = picture;
        }

        public String getUpdateInfo() {
            return updateInfo;
        }

        public void setUpdateInfo(String updateInfo) {
            this.updateInfo = updateInfo;
        }

        public boolean isAttention() {
            return attention;
        }

        public void setAttention(boolean attention) {
            this.attention = attention;
        }
    }

}