fanli-server.git

			@@ -31,7 +31,6 @@
			import com.yeshi.fanli.util.VersionUtil;

			import net.sf.json.JSONObject;
			import sun.security.krb5.internal.ccache.CCacheInputStream;

			@Service
			public class SpecialServiceImpl implements SpecialService {
			@@ -335,7 +334,11 @@

			// 首页-5圆形2排区域
			JSONObject arcMap = new JSONObject();
			List<Special> listArc = specialMapper.listByPlaceKey("index_arc");
			String indexArc = "index_arc";
			if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
			indexArc = "index_arc_1.5.6";

			List<Special> listArc = specialMapper.listByPlaceKey(indexArc);
			if (listArc == null) {
			listArc = new ArrayList<Special>();
			} else if (listArc.size() > 0) {
			@@ -347,7 +350,8 @@
			}

			// 处理9.9包邮
			if (listArc != null && VersionUtil.greaterThan_1_5_50(acceptData.getPlatform(), acceptData.getVersion())&&!Constant.IS_TEST)
			if (listArc != null && VersionUtil.greaterThan_1_5_50(acceptData.getPlatform(), acceptData.getVersion())
			&& !Constant.IS_TEST)
			for (Special s : listArc) {
			if (s.getName().contains("9.9")) {// 9块9
			s.setJumpDetail(jumpDetailV2Service.getByTypeCache("common_template"));
			@@ -387,8 +391,12 @@
			activityMap.put("list", JsonUtil.getApiCommonGson().toJson(listActivity));

			// 首页-方形专题（品牌券、母婴...）
			String indexBlock = "index_block";
			if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
			indexBlock = "index_block_1.5.6";

			JSONObject blockJsonMap = new JSONObject();
			List<Special> listBlock = specialMapper.listByPlaceKey("index_block");
			List<Special> listBlock = specialMapper.listByPlaceKey(indexBlock);
			if (listBlock == null) {
			listBlock = new ArrayList<Special>();
			} else if (listBlock.size() > 0) {

			@@ -17,6 +17,14 @@
			else
			return false;
			}

			public static boolean greaterThan_1_5_60(String platform, String versionCode) {
			if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 43))
			\|\| (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 54)))
			return true;
			else
			return false;
			}

			public static boolean smallerThan_1_5_1(String platform, String versionCode) {
			if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) < 36))

	fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史