admin
2020-05-18 f5444c6b777ba9f1e0825066e9d12fb9ce4f9f72
Merge remote-tracking branch 'origin/div' into div
2个文件已修改
8 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -644,9 +644,9 @@
                        continue;
                    }
                    // 跳转过渡页
                    String jumpLink = configService.get(ConfigKeyEnum.activityDetailLink.getKey()) + "?type=%s&id=%s";
                    jumpLink = String.format(jumpLink, "circle", evaluateNew.getId());
                    evaluateNew.setJumpLink(jumpLink);
                    //String jumpLink = configService.get(ConfigKeyEnum.activityDetailLink.getKey()) + "?type=%s&id=%s";
                    //jumpLink = String.format(jumpLink, "circle", evaluateNew.getId());
                    //evaluateNew.setJumpLink(jumpLink);
                    // 图片数量
                    if (evaluateNew.getImgList() != null && evaluateNew.getImgList().size() > 0) {
fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java
@@ -108,7 +108,7 @@
    
    public static boolean greaterThan_2_1_1(String platform, String versionCode) {
        if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 57))
                || (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 80)))
                || (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 81)))
            return true;
        else
            return false;