Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复若干BUG GH_TEST渠道号自动弄成刷新版

Browse Source
This commit is contained in:
kehaoyuan
2018-07-05 11:19:59 +08:00
parent 4713594c7e
commit 00deba962e
5 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
app/src/main/java/com/gh/common/util/TimestampUtils.java
View File

@ -4,6 +4,7 @@ import android.support.v4.util.ArrayMap;
import android.text.TextUtils;
import com.gh.common.constant.Constants;
import com.halo.assistant.HaloApp;
import java.util.regex.Pattern;
@ -41,39 +42,40 @@ public class TimestampUtils {
*/
public static String addTimestamp(String url) {
// // TODO: 22/12/17 刷新版
// if (TextUtils.isEmpty(url)) {
// return url;
// }
// if (url.contains("?")) {
// String u = url + "&timestamp=" + System.currentTimeMillis();
// return u;
// } else {
// String u = url + "?timestamp=" + System.currentTimeMillis();
// return u;
// }
if (TextUtils.isEmpty(url)) {
return url;
}
int cd = 0;
for (String key : getCdMap().keySet()) {
if (Pattern.matches(key, url)) {
cd = getCdMap().get(key);
break;
if ("GH_TEST".equals(HaloApp.getInstance().getChannel())) {
if (TextUtils.isEmpty(url)) {
return url;
}
if (url.contains("?")) {
String u = url + "&timestamp=" + System.currentTimeMillis();
return u;
} else {
String u = url + "?timestamp=" + System.currentTimeMillis();
return u;
}
}
if (cd == 0) {
return url;
}
if (url.contains("?")) {
String u = url + "&timestamp=" + getTimestamp(url, cd);
// Utils.log("url = " + u);
return u;
} else {
String u = url + "?timestamp=" + getTimestamp(url, cd);
if (TextUtils.isEmpty(url)) {
return url;
}
int cd = 0;
for (String key : getCdMap().keySet()) {
if (Pattern.matches(key, url)) {
cd = getCdMap().get(key);
break;
}
}
if (cd == 0) {
return url;
}
if (url.contains("?")) {
String u = url + "&timestamp=" + getTimestamp(url, cd);
// Utils.log("url = " + u);
return u;
return u;
} else {
String u = url + "?timestamp=" + getTimestamp(url, cd);
// Utils.log("url = " + u);
return u;
}
}
}