Merge remote-tracking branch 'origin/div' into div
| | |
| | | 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) { |
| | |
| | |
|
| | | 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;
|