From 4397fa6607ac892fa86c9d6e73dc9bbd94d0df7b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 14 五月 2020 18:39:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java
index 863ddaf..8a3de78 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java
@@ -17,7 +17,7 @@
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)))
@@ -25,8 +25,7 @@
else
return false;
}
-
-
+
public static boolean greaterThan_1_5_70(String platform, String versionCode) {
if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 45))
|| (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 56)))
@@ -42,7 +41,7 @@
else
return false;
}
-
+
public static boolean greaterThan_1_6_5(String platform, String versionCode) {
if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 47))
|| (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 65)))
@@ -51,8 +50,6 @@
return false;
}
-
-
public static boolean greaterThan_2_0(String platform, String versionCode) {
if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 48))
|| (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 66)))
@@ -61,7 +58,6 @@
return false;
}
-
public static boolean greaterThan_2_0_1(String platform, String versionCode) {
if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 50))
|| (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 67)))
@@ -69,7 +65,7 @@
else
return false;
}
-
+
public static boolean greaterThan_2_0_2(String platform, String versionCode) {
if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 51))
|| (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 70)))
@@ -77,17 +73,47 @@
else
return false;
}
-
-
- public static boolean greaterThan_2_1(String platform, String versionCode) {
+
+ public static boolean greaterThan_2_0_5(String platform, String versionCode) {
if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 52))
- || (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 75)))
+ || (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 73)))
+ return true;
+ else
+ return false;
+ }
+
+ public static boolean greaterThan_2_0_6(String platform, String versionCode) {
+ if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 54))
+ || (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 74)))
+ return true;
+ else
+ return false;
+ }
+
+ public static boolean greaterThan_2_0_7(String platform, String versionCode) {
+ if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 55))
+ || (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 77)))
return true;
else
return false;
}
-
+ public static boolean greaterThan_2_1(String platform, String versionCode) {
+ if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 56))
+ || (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 78)))
+ return true;
+ else
+ return false;
+ }
+
+ 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)))
+ return true;
+ else
+ return false;
+ }
+
public static boolean smallerThan_1_5_1(String platform, String versionCode) {
if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) < 36))
|| (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) < 44)))
--
Gitblit v1.8.0