diff --git a/app/src/main/java/com/icssoft/icspda/activity/LoginActivity.java b/app/src/main/java/com/icssoft/icspda/activity/LoginActivity.java index 1650ca8..b686eec 100644 --- a/app/src/main/java/com/icssoft/icspda/activity/LoginActivity.java +++ b/app/src/main/java/com/icssoft/icspda/activity/LoginActivity.java @@ -28,6 +28,7 @@ import com.google.gson.reflect.TypeToken; import com.icssoft.icspda.R; import com.icssoft.icspda.entity.ApplicationModel; import com.icssoft.icspda.entity.UserData; +import com.icssoft.icspda.entity.VersionData; import com.icssoft.icspda.entity.WorkPointData; import com.icssoft.icspda.net.WebServiceUtil; import com.icssoft.icspda.util.HelpUtil; @@ -189,10 +190,6 @@ public class LoginActivity extends AppCompatActivity { // startActivity(intent); // } // }); - - - - } private void UpdateAction() { @@ -228,16 +225,16 @@ public class LoginActivity extends AppCompatActivity { params.put("version",thisVersion+""); try { result = WebServiceUtil.GetWSReturnInfo("GetNewVersion",params); +// System.out.println(result); + if (result!=null&&!result.equals("")){ + VersionData data= new Gson().fromJson(result, VersionData.class); + Version = Integer.parseInt(data.getVersion()); + Url = data.getUrl(); + } + handler.sendEmptyMessage(100); } catch (Exception exception) { exception.printStackTrace(); } - if (result!=null&&!result.equals("")){ - Map o = new Gson().fromJson(result, new TypeToken>(){}.getType()); - Version = Integer.parseInt(o.get("Version")); - Url = o.get("Url"); - } - handler.sendEmptyMessage(100); - } // 获取当前应用的版本号 diff --git a/app/src/main/java/com/icssoft/icspda/entity/VersionData.java b/app/src/main/java/com/icssoft/icspda/entity/VersionData.java new file mode 100644 index 0000000..7e7a7ea --- /dev/null +++ b/app/src/main/java/com/icssoft/icspda/entity/VersionData.java @@ -0,0 +1,21 @@ +package com.icssoft.icspda.entity; + +public class VersionData { + private String Version; + + private String Url; + + public void setVersion(String Version){ + this.Version = Version; + } + public String getVersion(){ + return this.Version; + } + public void setUrl(String Url){ + this.Url = Url; + } + public String getUrl(){ + return this.Url; + } + +}