From 676a5da635698f000c5eed5cdde56bbadc193f39 Mon Sep 17 00:00:00 2001
From: cjw <1063165173@qq.com>
Date: Tue, 25 May 2021 10:24:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../icspda/activity/LoginActivity.java        | 19 +++++++----------
 .../icssoft/icspda/entity/VersionData.java    | 21 +++++++++++++++++++
 2 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/java/com/icssoft/icspda/entity/VersionData.java

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<String,String> o = new Gson().fromJson(result, new TypeToken<HashMap<String,String>>(){}.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;
+    }
+
+}