From 0a18a8cb0a7a57bf1f82df425251334c57f8c39a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 一月 2021 15:40:37 +0800
Subject: [PATCH] 新增手机号/qq/微信绑定

---
 src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java |   31 +++++--------------------------
 1 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
index cd763d1..9fbd87b 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
@@ -90,28 +90,6 @@
 
             List<HomeAd> list = homeAdService.getHomeAdList(detailSystem);
 
-            // 娴嬭瘯璺宠浆灏忕▼搴�
-            // JSONObject xcx = new JSONObject();
-            // xcx.put("thumb",
-            // "http://img.zcool.cn/community/0169235af03daea801206aba8664d7.jpeg@260w_195h_1c_1e_1o_100sh.jpg");
-            // xcx.put("title", "娴嬭瘯鏍囬");
-            // xcx.put("desc", "绠�浠�");
-            // xcx.put("path", "pages/index/index");
-            // xcx.put("username", "gh_33b9bea57aff");
-            // xcx.put("url", "http://video.yeshitv.com");
-
-            // 娴嬭瘯鏍囬
-            // HomeAd homeAd = new HomeAd();
-            // homeAd.setClazz("com");
-            // homeAd.setLinkType(5);
-            // homeAd.setOrderby(0);
-            // homeAd.setPicture(
-            // "http://img.zcool.cn/community/0169235af03daea801206aba8664d7.jpeg@260w_195h_1c_1e_1o_100sh.jpg");
-            // homeAd.setVideo(new VideoInfo(1 + ""));
-            // homeAd.setParams(xcx.toString());
-            // homeAd.setTitle("鏍囬");
-            // list.add(homeAd);
-
             if (acceptData.getPlatform().equalsIgnoreCase("ios"))// IOS娴嬭瘯
             {
 
@@ -166,7 +144,6 @@
         } else {
             classParser.getRecommendCategoryVideoBanner(acceptData, request, out);
         }
-
     }
 
     // 棣栭〉绫诲瀷鑾峰彇
@@ -360,9 +337,11 @@
             return;
         }
 
+        DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
+
         List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion());
 
-        VideoInfo info = (videoDeailUtil.getVideoInfo(videoId, resourceId, resourceList,
+        VideoInfo info = (videoDeailUtil.getVideoInfo(detailSystem.getId(), videoId, resourceId, resourceList,
                 CacheUtil.getMD5Long(resourceList)));
 
         List<VideoType> typeList = classService.getVideoTypeList(info.getId());
@@ -385,7 +364,7 @@
         // version));
 
         // 杩囨护鐗堟潈瑙嗛鍏抽敭瀛�
-        DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
+
         // 缁熻娣诲姞
         // statisticsService.addStatistics(detailSystem.getId(), videoId);
 
@@ -515,7 +494,7 @@
 
         DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
 
-        PlayUrl pu = videoDeailUtil.getPlayUrl(acceptData,detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
+        PlayUrl pu = videoDeailUtil.getPlayUrl(acceptData, detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
 
         if (pu != null) {
             if (!StringUtil.isNullOrEmpty(pu.getUrl()))

--
Gitblit v1.8.0