From b37275dba6b782bf3bb3817c4504f6cdef1bef7c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 18 三月 2021 18:38:51 +0800
Subject: [PATCH] APP首页顶部标签兼容

---
 src/main/java/com/yeshi/buwan/pptv/PPTVUtil.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/pptv/PPTVUtil.java b/src/main/java/com/yeshi/buwan/pptv/PPTVUtil.java
index d23efa9..c017227 100644
--- a/src/main/java/com/yeshi/buwan/pptv/PPTVUtil.java
+++ b/src/main/java/com/yeshi/buwan/pptv/PPTVUtil.java
@@ -39,6 +39,7 @@
                 videoType = VideoConstant.VIDEO_CATEGORY_DONGMAN;
                 break;
             default:
+                return null;
         }
 
         return (long) videoType;
@@ -61,14 +62,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() + "闆�";
@@ -148,7 +153,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 +168,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 +194,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);
     }
 
 

--
Gitblit v1.8.0