bug修复

admin

2021-04-19 eb7f3343af839a7c71f16e8ada2b25d5e2201c08

 src/main/java/com/yeshi/buwan/pptv/PPTVUtil.java

@@ -9,6 +9,9 @@
import com.yeshi.buwan.util.video.VideoConstant;
import com.yeshi.buwan.vo.AcceptData;

import java.util.HashSet;
import java.util.Set;

public class PPTVUtil {

    public final static int RESOURCE_ID = 25;
@@ -38,7 +41,11 @@
            case "动漫":
                videoType = VideoConstant.VIDEO_CATEGORY_DONGMAN;
                break;
            case "少儿":
                videoType = 312;
                break;
            default:
                return null;
        }

        return (long) videoType;
@@ -61,14 +68,18 @@
        String score = series.getScore();

        String tag = "";
        VideoType videoType = new VideoType(getVideoType(series));
        Long videoTypeId = getVideoType(series);
        if (videoTypeId == null)
            return null;
        VideoType videoType = new VideoType(videoTypeId);


        //电影
        if (videoType.getId() == VideoConstant.VIDEO_CATEGORY_DIANYING) {
            tag = "评分：" + score;
        } else if (videoType.getId() == VideoConstant.VIDEO_CATEGORY_DIANSHIJU || videoType.getId() == VideoConstant.VIDEO_CATEGORY_DONGMAN) {
            //电视剧，动漫
            if (series.getSeriesCount().trim().equalsIgnoreCase(series.getCurrentNum().trim())) {
            if (series.getCurrentNum() != null && series.getSeriesCount().trim().equalsIgnoreCase(series.getCurrentNum().trim())) {
                tag = series.getSeriesCount() + "集全";
            } else {
                tag = "更新至" + series.getCurrentNum() + "集";
@@ -79,6 +90,20 @@
                tag = series.getCurrentNum().replace("期", "");
            } else {
                tag = series.getPublishTime().split(" ")[0];
            }
        } else {
            if ("1".equalsIgnoreCase(series.getSeriesCount())) {
                tag = "评分：" + score;
            } else {
                if (series.getCurrentNum() != null && series.getSeriesCount().trim().equalsIgnoreCase(series.getCurrentNum().trim())) {
                    tag = series.getSeriesCount() + "集全";
                } else {
                    if (series.getCurrentNum() != null)
                        tag = "更新至" + series.getCurrentNum() + "集";
                    else {
                        tag = "更新至" + series.getSeriesCount() + "集";
                    }
                }
            }
        }

@@ -148,7 +173,7 @@
    public static String getPPTVCode(String pptvUid) {
        if (StringUtil.isNullOrEmpty(pptvUid))
            return null;
        return AESUtil.encrypt(pptvUid + "#" + System.currentTimeMillis());
        return AESUtil.encrypt(pptvUid + "#" + System.currentTimeMillis()).replace("/", "_").replace("=", "-");
    }

    public static String getUidFromPPTVUid(String pptvUid) {
@@ -163,6 +188,7 @@
     * @return
     */
    public static PPTVCodeInfo decryptPPTVCode(String code) {
        code = code.replace("_", "/").replace("-", "=");
        String info = AESUtil.decrypt(code);
        if (StringUtil.isNullOrEmpty(info)) {
            return null;
@@ -188,6 +214,7 @@
    public static String getPlayUrl(PPTVSeries series, PPTVProgram program) {
        //programtype 电影-3  其他-2
        return String.format("https://acmd.api.pptv.com/2021/bwysdqmovie_thrid_h5.html?cid=%s&vid=%s&programtype=%s", series.getSeriesCode(), program.getProgramCode(), series.getProgramType().contains("电影") ? 3 : 2);
//        return String.format(" http://vip.pptv.com/activity/2021/pg_bwysdqmovie?cid=%s&vid=%s&programtype=%s", series.getSeriesCode(), program.getProgramCode(), series.getProgramType().contains("电影") ? 3 : 2);
    }


@@ -196,4 +223,15 @@
        public long time;
    }

    public static Set<String> getAvaiableStates() {
        Set<String> stateSets = new HashSet<>();
        stateSets.add("add");
        stateSets.add("update");
        return stateSets;
    }

    public static boolean isVIPVideo(String free) {
        return "1".equalsIgnoreCase((free + "").trim());
    }

}