bug修复

admin

2021-04-19 eb7f3343af839a7c71f16e8ada2b25d5e2201c08

 src/main/java/com/yeshi/buwan/controller/api/VideoPlayController.java

@@ -1,19 +1,26 @@
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.PPTVUtil;
import com.yeshi.buwan.pptv.entity.PPTVProgram;
import com.yeshi.buwan.pptv.entity.PPTVSeries;
import com.yeshi.buwan.pptv.entity.PPTVSeriesProgramMap;
import com.yeshi.buwan.pptv.entity.VideoPPTVMap;
import com.yeshi.buwan.service.inter.juhe.PPTVService;
import com.yeshi.buwan.service.inter.push.PushDeviceTokenService;
import com.yeshi.buwan.service.inter.system.SystemConfigService;
import com.yeshi.buwan.service.inter.video.VideoWatchHistoryService;
import com.yeshi.buwan.util.JsonUtil;
import com.yeshi.buwan.util.ThreadUtil;
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;
@@ -36,6 +43,9 @@

    @Resource
    private VideoWatchHistoryService videoWatchHistoryService;

    @Resource
    private SystemConfigService systemConfigService;


    /**
@@ -90,6 +100,12 @@
        if (pptvSeries == null) {
            try {
                pptvSeries = PPTVApiUtil.getDetail(cid);
                ThreadUtil.run(new Runnable() {
                    @Override
                    public void run() {
                        pptvService.syncSeries(cid);
                    }
                });
            } catch (Exception e) {

            }
@@ -114,6 +130,33 @@
        way.setTextColor("#885E24");
        way.setType("vip");
        wayList.add(way);


        //3.9.2后返回单片购买
        if (VersionUtil.isGraterThan392(acceptData.getPlatform(), acceptData.getVersion())) {
            String buyVideoUrl = systemConfigService.getConfigValueByKeyCache("buyVideoUrl");
            if (buyVideoUrl != null && pptvSeries != null && PPTVUtil.isVIPVideo(pptvSeries.getFree()) && PPTVUtil.getAvaiableStates().contains(pptvSeries.getStatus())) {
                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", buyVideoUrl.replace("{infoId}", pptvSeries.getInfoID()));
                params.put("close", false);
                way.setParams(params.toString().replace("\"", "\\" + "\""));
                wayList.add(way);
            }
        }

        vo.setWayList(wayList);
        return JsonUtil.loadTrueJson(new Gson().toJson(vo));
    }