From f7b2baec57a19039ca85880bbba4e17fe27f0511 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 三月 2021 18:21:13 +0800
Subject: [PATCH] 删除冗余代码,初步优化首页的推荐专题,3.8.7之后在我的里面添加VIP分类

---
 src/main/java/com/yeshi/buwan/iqiyi/IqiYiNewAPI.java |   82 +++++++++++++++++++++++++++++++++--------
 1 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/iqiyi/IqiYiNewAPI.java b/src/main/java/com/yeshi/buwan/iqiyi/IqiYiNewAPI.java
index 5ceec05..356f176 100644
--- a/src/main/java/com/yeshi/buwan/iqiyi/IqiYiNewAPI.java
+++ b/src/main/java/com/yeshi/buwan/iqiyi/IqiYiNewAPI.java
@@ -17,10 +17,10 @@
 
 public class IqiYiNewAPI {
 
-    public static int TYPE_DIANYING = 1;
-    public static int TYPE_DIANSHIJU = 2;//鐢佃鍓�
-    public static int TYPE_ZONGYI = 6;//缁艰壓
-    public static int TYPE_DONGMAN = 4;//鍔ㄦ极
+    public final static int TYPE_DIANYING = 1;
+    public final static int TYPE_DIANSHIJU = 2;//鐢佃鍓�
+    public final static int TYPE_ZONGYI = 6;//缁艰壓
+    public final static int TYPE_DONGMAN = 4;//鍔ㄦ极
 
     public static int TYPE_YULE = 7;//濞变箰
     public static int TYPE_KEJI = 30;//绉戞妧
@@ -187,6 +187,16 @@
         return null;
     }
 
+    public static IqiyiAlbum2 getAlbumOrVideoDetail(Long id) {
+        List<Long> ids = new ArrayList<>();
+        ids.add(id);
+        List<IqiyiAlbum2> list = getAlbumOrVideoDetail(ids);
+
+        if (list != null && list.size() > 0)
+            return list.get(0);
+        return null;
+    }
+
     /**
      * 鑾峰彇鏇存柊鐨勪笓杈�
      *
@@ -313,22 +323,62 @@
     }
 
 
+    public static String getIdByUrl(String url) {
+        Map<String, String> params = new HashMap<>();
+        params.put("playurl", url);
+        params.put("rec", "0");
+        String result = baseRquest("http://expand.video.iqiyi.com/c/fb", params);
+        System.out.println(result);
+        if (!StringUtil.isNullOrEmpty(result)) {
+            JSONObject object = JSONObject.fromObject(result);
+            if (object != null) {
+                if ("A00000".equalsIgnoreCase(object.optString("code"))) {// 鎴愬姛
+                    List<IqiyiAlbum2> albumList = new ArrayList<>();
+                    JSONObject obj = object.optJSONObject("data");
+                    return obj.optString("qipuId");
+                }
+            }
+        }
+        return null;
+    }
+
+    public static String getAidByUrl(String url) {
+        Map<String, String> params = new HashMap<>();
+        params.put("playurl", url);
+        params.put("rec", "0");
+        String result = baseRquest("http://expand.video.iqiyi.com/c/fb", params);
+        System.out.println(result);
+        if (!StringUtil.isNullOrEmpty(result)) {
+            JSONObject object = JSONObject.fromObject(result);
+            if (object != null) {
+                if ("A00000".equalsIgnoreCase(object.optString("code"))) {// 鎴愬姛
+                    List<IqiyiAlbum2> albumList = new ArrayList<>();
+                    JSONObject obj = object.optJSONObject("data");
+                    return obj.optString("albumQipuId");
+                }
+            }
+        }
+        return null;
+    }
+
+
     private static Gson gson = null;
+
+    static class DoubleTypeAdapter implements JsonDeserializer<Double> {
+
+        @Override
+        public Double deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            if (json == null || json.getAsString().equalsIgnoreCase("")) {
+                return 0.0;
+            } else
+                return Double.parseDouble(json.getAsString());
+        }
+    }
 
     private static Gson getGson() {
         if (gson == null)
             gson = new GsonBuilder()
-                    .registerTypeAdapter(double.class, new JsonDeserializer<Double>() {
-
-                        @Override
-                        public Double deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-
-                            if (json == null || json.getAsString().equalsIgnoreCase("")) {
-                                return 0.0;
-                            } else
-                                return Double.parseDouble(json.getAsString());
-                        }
-                    })
+                    .registerTypeAdapter(double.class, new DoubleTypeAdapter())
                     .registerTypeAdapter(int.class, new JsonDeserializer<Integer>() {
                         @Override
                         public Integer deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
@@ -350,7 +400,7 @@
                             if (data == null || data.equalsIgnoreCase("")) {
                                 return null;
                             } else
-                                return new Gson().fromJson(data, IqiyiAlbum2.StatisticsBean.class);
+                                return new GsonBuilder().registerTypeAdapter(double.class, new DoubleTypeAdapter()).create().fromJson(data, IqiyiAlbum2.StatisticsBean.class);
                         }
                     })
                     .registerTypeAdapter(IqiyiAlbum2.VideoBean.class, new JsonDeserializer<IqiyiAlbum2.VideoBean>() {

--
Gitblit v1.8.0