3.9.0bug修改

admin

2021-04-02 2a593ddac16e06f1ff55edca22ea568f07b068ba

3.9.0bug修改

 src/main/java/com/yeshi/buwan/controller/admin/api/ClassController.java

@@ -128,6 +128,7 @@
            hv.setPicture(pictureStr[i]);
            hv.setType(new HomeType(hometypeid + ""));
            hv.setVideo(new VideoInfo(videoStr[i]));
            hv.setBigPicture(false);
        }

        homeTypeService.addHomeTypeVideo(list);

 src/main/java/com/yeshi/buwan/controller/admin/api/HomeTypeController.java

@@ -139,6 +139,7 @@
                }
                hv.setType(new HomeType(ht));
                hv.setVideo(new VideoInfo(vid));
                hv.setBigPicture(false);
                list.add(hv);
            }
        }

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

@@ -106,9 +106,9 @@
        PPTVWatchVIPVideoActivityWay way = new PPTVWatchVIPVideoActivityWay();
        way.setEndBgColor("#E9CE93");
        way.setStartBgColor("#F7EDD7");
        way.setEndPrice(new BigDecimal("99"));
        way.setIcon("http://192.168.3.122:8848/BuWanWeb/icon_test1.png");
        way.setStartPrice(new BigDecimal("6"));
        way.setEndPrice(new BigDecimal("77.8"));
        way.setIcon("https://buwan-1255749512.cos.ap-guangzhou.myqcloud.com/resource/icon_vip.png");
        way.setStartPrice(new BigDecimal("8.8"));
        way.setSubTitle("包月、季、年卡");
        way.setTitle("VIP看高清 免广告");
        way.setTextColor("#885E24");

 src/main/java/com/yeshi/buwan/controller/parser/ClassParser.java

@@ -361,7 +361,10 @@
                vo.setShowTitle(special.getName());
                vo.setDataKey(special.getDataKey());
                vo.setDataType(HomeClassVO.DATA_TYPE_RECOMMEND);
                if (vo.getName().contains("高清"))
                    vo.setColor("#ff6600");
                typelist.add(0, vo);

            }
        }


 src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java

@@ -55,7 +55,7 @@
    public ADConfig getAdShowType(String key, String channel, int version, Map<String, String> map) {
        String splash = map.get(key);
        JSONObject jsonObject = JSONObject.fromObject(splash);
        if (jsonObject == null||jsonObject.isEmpty())
        if (jsonObject == null || jsonObject.isEmpty())
            return null;
        ADConfig adConfig = null;
        channel = channel.toLowerCase();
@@ -223,14 +223,13 @@
        adNew.put("splashHotStart", gson.toJson(adConfig));



        data.put("ad", ad);
        data.put("adNew", adNew);
        //PPTV免广告权益时长,暂时设置为3小时
        data.put("pptvNoAdRewardHour", 3);
        //设置网页加速域名
        data.put("webSpeedUpHost", map.get("web_speed_up_host"));

        data.put("minePageBanner", map.get("mine_page_banner"));

        out.print(JsonUtil.loadTrueJson(data.toString()));
    }

 src/main/java/com/yeshi/buwan/domain/recommend/HomeRecommendSpecial.java

@@ -33,6 +33,7 @@
    private Date createTime;
    private Date updateTime;


    public String getDataKey() {
        return dataKey;
    }

 src/main/java/com/yeshi/buwan/vo/HomeClassVO.java

@@ -18,6 +18,18 @@
    @Expose
    private String dataKey;//关键词

    @Expose
    private String color;//特殊颜色，可为空


    public String getColor() {
        return color;
    }

    public void setColor(String color) {
        this.color = color;
    }

    public String getDataType() {
        return dataType;
    }

 src/main/java/com/yeshi/buwan/vo/ad/BannerVO.java

New file
@@ -0,0 +1,45 @@
package com.yeshi.buwan.vo.ad;

import com.yeshi.buwan.domain.jump.JumpDetail;

import java.math.BigDecimal;

public class BannerVO {
    private String picture;
    private BigDecimal ratio;
    private JumpDetail jumpDetail;
    private String params;


    public String getPicture() {
        return picture;
    }

    public void setPicture(String picture) {
        this.picture = picture;
    }

    public BigDecimal getRatio() {
        return ratio;
    }

    public void setRatio(BigDecimal ratio) {
        this.ratio = ratio;
    }

    public JumpDetail getJumpDetail() {
        return jumpDetail;
    }

    public void setJumpDetail(JumpDetail jumpDetail) {
        this.jumpDetail = jumpDetail;
    }

    public String getParams() {
        return params;
    }

    public void setParams(String params) {
        this.params = params;
    }
}