Merge remote-tracking branch 'origin/master'

master
eason.qian 7 years ago
commit e1f42e1569

@ -958,10 +958,15 @@ public class RetailAppServiceImp implements RetailAppService {
Boolean isUpdate = PlatformEnvironment.getEnv().isAppUpdate(clientType);
String updateContent = PlatformEnvironment.getEnv().getAppUpdateContent(clientType);
int update_type = 0;// 0:不更新 1更新 2强制更新
if (newAppVersion.compareToIgnoreCase(version) > 0) {
update_type = 1;
if (isUpdate) {
update_type = 2;
String [] versionArr = version.split("\\.");
String [] newVersionArr = newAppVersion.split("\\.");
for (int i = 0; i < newVersionArr.length; i++) {
if(Integer.valueOf(newVersionArr[i])>Integer.valueOf(versionArr[i])){
update_type = 1;
if (isUpdate) {
update_type = 2;
}
i=newVersionArr.length+1;
}
}
JSONObject res = new JSONObject();

Loading…
Cancel
Save