From 6e365a48a83e628759df3a5f25b3db97009c9f26 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 16 四月 2021 19:49:49 +0800
Subject: [PATCH] 影视豆系统完善
---
src/main/java/com/yeshi/buwan/controller/api/VideoPlayController.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/api/VideoPlayController.java b/src/main/java/com/yeshi/buwan/controller/api/VideoPlayController.java
index 5df9341..ea972f9 100644
--- a/src/main/java/com/yeshi/buwan/controller/api/VideoPlayController.java
+++ b/src/main/java/com/yeshi/buwan/controller/api/VideoPlayController.java
@@ -1,6 +1,8 @@
package com.yeshi.buwan.controller.api;
import com.google.gson.Gson;
+import com.yeshi.buwan.domain.jump.JumpDetail;
+import com.yeshi.buwan.domain.jump.JumpTypeEnum;
import com.yeshi.buwan.domain.video.VideoWatchHistory;
import com.yeshi.buwan.pptv.PPTVApiUtil;
import com.yeshi.buwan.pptv.entity.PPTVProgram;
@@ -11,9 +13,11 @@
import com.yeshi.buwan.service.inter.push.PushDeviceTokenService;
import com.yeshi.buwan.service.inter.video.VideoWatchHistoryService;
import com.yeshi.buwan.util.JsonUtil;
+import com.yeshi.buwan.util.VersionUtil;
import com.yeshi.buwan.vo.AcceptData;
import com.yeshi.buwan.vo.video.PPTVVideoActivityInfoVO;
import com.yeshi.buwan.vo.video.PPTVWatchVIPVideoActivityWay;
+import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
@@ -90,7 +94,7 @@
if (pptvSeries == null) {
try {
pptvSeries = PPTVApiUtil.getDetail(cid);
- }catch(Exception e){
+ } catch (Exception e) {
}
}
@@ -114,9 +118,39 @@
way.setTextColor("#885E24");
way.setType("vip");
wayList.add(way);
+
+ //3.9.2鍚庤繑鍥炲崟鐗囪喘涔�
+ if (VersionUtil.isGraterThan392(acceptData.getPlatform(), acceptData.getVersion())) {
+ way = new PPTVWatchVIPVideoActivityWay();
+ way.setEndBgColor("#DCE8FF");
+ way.setStartBgColor("#DCE8FF");
+// way.setEndPrice(new BigDecimal("77.8"));
+ way.setIcon("http://img.ysdq.yeshitv.com/resource/icon_free_money.png");
+ way.setStartPrice(new BigDecimal("0"));
+ way.setSubTitle("鐣呬韩娴烽噺楂樻竻");
+ way.setTitle("0鍏冪湅鍗曠墖");
+ way.setTextColor("#0052F6");
+ way.setType("video");
+ JumpDetail jumpDetail = new JumpDetail();
+ jumpDetail.setType(JumpTypeEnum.web);
+ way.setJumpDetail(jumpDetail);
+ JSONObject params = new JSONObject();
+ params.put("url", "http://192.168.3.122:8848/BuWanWeb/buyVideo/index.html?infoId=23099");
+ way.setParams(params.toString().replace("\"","\\" + "\""));
+ wayList.add(way);
+ }
+
vo.setWayList(wayList);
return JsonUtil.loadTrueJson(new Gson().toJson(vo));
}
+ @RequestMapping("uploadSession")
+ @ResponseBody
+ public String uploadSession(AcceptData acceptData, String sessionId) {
+
+
+ return JsonUtil.loadTrueJson("");
+ }
+
}
--
Gitblit v1.8.0