加入版本号的检测（versionCode）

Author: libowei1213

Diff for: .gitignore

@@ -1,8 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
+.idea
 .DS_Store
 /build
 /captures

Diff for: .idea/.name

@@ -9,11 +9,15 @@
 ```javacript
 {
   "ver": "3.333",
+  "verCode":1,
   "url": "http://od4xu3l0l.bkt.clouddn.com/libowei.apk",
   "msg": "测试需要"
 }
 ```
-该json中需包含新版本的版本号、下载地址及更新说明
+该json中需包含新版本的版本号、版本名、下载地址及更新说明
+
+### 检测规则 ###
+**json中的版本号大于本地版本号**且**json中版本名与本地版本名不同**，则进行更新。
 
 ### 添加到程序中 ###
 

Diff for: .idea/gradle.xml

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

Diff for: .idea/inspectionProfiles/Project_Default.xml

@@ -9,6 +9,7 @@ public class Constants {
     public static final String STR_VERSION_NAME = "ver";
     public static final String STR_DOWNLOAD_URL = "url";
     public static final String STR_UPDATE_MSG = "msg";
+    public static final String STR_VERSION_CODE = "verCode";
 
     //msg what
     public static final int MSG_NO_UPDATE = 0x001;

Diff for: .idea/misc.xml

@@ -8,7 +8,15 @@ public class UpdateInfo {
     private String versionName;
     private String downloadUrl;
     private String updateMsg;
+    private Integer versionCode;
 
+    public Integer getVersionCode() {
+        return versionCode;
+    }
+
+    public void setVersionCode(Integer versionCode) {
+        this.versionCode = versionCode;
+    }
 
     public String getUpdateMsg() {
         return updateMsg;

Diff for: .idea/vcs.xml

@@ -1,4 +1,4 @@
-package com.libowei.lib.update;
+package update;
 
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -11,6 +11,9 @@
 import android.os.Message;
 import android.util.Log;
 
+import com.libowei.lib.update.Constants;
+import com.libowei.lib.update.DownUtil;
+import com.libowei.lib.update.UpdateInfo;
 
 import org.apache.commons.io.IOUtils;
 import org.json.JSONException;
@@ -28,12 +31,11 @@
  */
 public class UpdateManager {
 
-
     private Context context;
     private String curVersion = null;
+    private Integer curVersionCode = -1;
     private UpdateHandler handler = null;
 
-
     UpdateInfo updateInfo;
     DownUtil downUtil;
     ProgressDialog progressDialog;
@@ -48,7 +50,6 @@ public UpdateManager(Context context) {
         this.handler = new UpdateHandler();
     }
 
-
     /**
      * 检查更新
      *
@@ -64,31 +65,38 @@ public void run() {
                     HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection();
                     conn.setConnectTimeout(5 * 1000);
                     conn.connect();
-                    //连接成功
+                    // 连接成功
                     if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
 
                         String response = IOUtils.toString(conn.getInputStream());
+
+                        Log.i("updateManager", response);
+
                         updateInfo = parse(response);
                         if (updateInfo == null) {
                             handler.sendEmptyMessage(Constants.MSG_PARSE_ERROR);
                             return;
                         }
-                        //判断版本号
+                        // 判断版本号
                         String currentVersionName = getVersionName();
+                        int currentVersionCode = getVersionCode();
 
-                        if (currentVersionName != null) {
-                            if (currentVersionName.equals(updateInfo.getVersionName())) {
-                                //版本号一致->没有更新
-                                handler.sendEmptyMessage(Constants.MSG_NO_UPDATE);
-                            } else {
-                                //版本号不一致->有更新
+                        if (currentVersionName != null && currentVersionCode != -1) {
+                            if (!currentVersionName.equals(updateInfo.getVersionName())
+                                    && currentVersionCode < updateInfo.getVersionCode()) {
+
+                                // 版本号不一致->有更新
                                 if (updateInfo.getDownloadUrl() == null || "".equals(updateInfo.getDownloadUrl())) {
-                                    //没有下载url
+                                    // 没有下载url
                                     handler.sendEmptyMessage(Constants.MSG_PARSE_ERROR);
                                     return;
                                 }
-                                //有更新, 发送Message
+                                // 有更新, 发送Message
                                 handler.sendEmptyMessage(Constants.MSG_NEW_UPDATE);
+
+                            } else {
+                                handler.sendEmptyMessage(Constants.MSG_NO_UPDATE);
+
                             }
                         }
                     }
@@ -101,7 +109,6 @@ public void run() {
         }.start();
     }
 
-
     /**
      * 当前版本名称
      */
@@ -119,12 +126,25 @@ private String getVersionName() {
         return "";
     }
 
+    private int getVersionCode() {
+
+        if (this.curVersionCode != -1) {
+            return this.curVersionCode;
+        }
+        try {
+            this.curVersionCode = this.context.getPackageManager().getPackageInfo(this.context.getPackageName(), 0).versionCode;
+            return this.curVersionCode;
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return -1;
+    }
+
     /**
      * 显示更新提示框
      */
     private void showUpdateNotice() {
 
-
         String title = "发现新版本：" + updateInfo.getVersionName();
 
         StringBuilder dialogText = new StringBuilder();
@@ -134,16 +154,16 @@ private void showUpdateNotice() {
             dialogText.append(updateMsg);
         }
 
+        new AlertDialog.Builder(context).setTitle(title).setMessage(dialogText)
+                .setPositiveButton("开始更新", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
 
-        new AlertDialog.Builder(context).setTitle(title).setMessage(dialogText).setPositiveButton("开始更新", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-
-                //开始下载
-                downloadApk();
+                        // 开始下载
+                        downloadApk();
 
-            }
-        }).setNegativeButton("下次再说", new DialogInterface.OnClickListener() {
+                    }
+                }).setNegativeButton("下次再说", new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
 
@@ -170,14 +190,12 @@ private void downloadApk() {
         progressDialog.setTitle("更新软件");
         progressDialog.show();
 
-
         new Thread() {
             @Override
             public void run() {
                 try {
                     downUtil.download();
 
-
                     final Timer timer = new Timer();
                     timer.schedule(new TimerTask() {
                         @Override
@@ -198,7 +216,6 @@ public void run() {
                         }
                     }, 0, 100);
 
-
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -208,28 +225,26 @@ public void run() {
 
     }
 
-
     /**
-     * 内部类 UpdateHandler
-     * 用于处理更新中的各种msg
+     * 内部类 UpdateHandler 用于处理更新中的各种msg
      */
     class UpdateHandler extends Handler {
         @Override
         public void handleMessage(Message msg) {
 
             switch (msg.what) {
                 case Constants.MSG_NETWORK_ERROR: {
-                    //网络问题
+                    // 网络问题
                     Log.e("UPDATE", "网络问题");
                     break;
                 }
                 case Constants.MSG_NEW_UPDATE: {
-                    //有更新
+                    // 有更新
                     showUpdateNotice();
                     break;
                 }
                 case Constants.MSG_NO_UPDATE: {
-                    //没有更新
+                    // 没有更新
                     Log.e("UPDATE", "没有更新啊");
                     break;
                 }
@@ -256,7 +271,6 @@ public void handleMessage(Message msg) {
         }
     }
 
-
     /**
      * 解析升级的json数据
      *
@@ -273,18 +287,19 @@ private UpdateInfo parse(String json) {
             String versionName = object.getString(Constants.STR_VERSION_NAME);
             String downloadUrl = object.getString(Constants.STR_DOWNLOAD_URL);
             String updateMsg = object.getString(Constants.STR_UPDATE_MSG);
+            Integer versionCode = object.getInt(Constants.STR_VERSION_CODE);
             updateInfo = new UpdateInfo();
             updateInfo.setDownloadUrl(downloadUrl);
             updateInfo.setVersionName(versionName);
             updateInfo.setUpdateMsg(updateMsg);
+            updateInfo.setVersionCode(versionCode);
 
         } catch (JSONException e) {
             e.printStackTrace();
         }
         return updateInfo;
     }
 
-
     private void openFile(File file) {
         Intent intent = new Intent();
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);