fixbug

caikaidev · Mar 25, 2017 · d764f1c · d764f1c
1 parent d9e7b60
commit d764f1c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ android app update library
 
    ```groovy
    dependencies {
-            compile 'com.github.fccaikai:AppUpdate:2.0.3'
+            compile 'com.github.fccaikai:AppUpdate:2.0.4'
     }
    ```
 

diff --git a/README_zh.md b/README_zh.md
@@ -4,7 +4,7 @@ Android 检查更新库
 
 ### 屏幕截图
 
-![](https://ww3.sinaimg.cn/large/006tNbRwgy1fdhug16dnhj30km0b4glu.jpg) 
+![](https://ww3.sinaimg.cn/large/006tNbRwgy1fdhug16dnhj30km0b4glu.jpg)
 
 
 
@@ -33,7 +33,7 @@ Android 检查更新库
 
   ```groovy
   dependencies {
-           compile 'com.github.fccaikai:AppUpdate:2.0.3'
+           compile 'com.github.fccaikai:AppUpdate:2.0.4'
    }
   ```
 
@@ -86,7 +86,7 @@ updateWrapper.start();
   Activity需要设置为Dialog主题，在```Androidmanifest.xml```中注册Activity中设置主题
 
   ```xml
-  <activity 
+  <activity
             android:name=".CustomsUpdateActivity"
             android:theme="@style/UpdateDialog">
   </activity>
@@ -150,9 +150,9 @@ updateWrapper.start();
  具体使用请查看[demo](https://github.com/fccaikai/AppUpdate/blob/master/app/src/main/java/com/kcode/appupdate/MainActivity.java)
 ### 依赖的库
 
-- v7-support   
+- v7-support
 
-   ```compile 'com.android.support:appcompat-v7:25.2.0'```   
+   ```compile 'com.android.support:appcompat-v7:25.2.0'```
 
 - okhttp
 

diff --git a/app/src/main/java/com/kcode/appupdate/MainActivity.java b/app/src/main/java/com/kcode/appupdate/MainActivity.java
@@ -54,6 +54,11 @@ public void onGrant() {
                                     public void callBack(VersionModel model) {
                                         Log.d(TAG,"new version :" + model.getVersionName());
                                     }
+
+                                    @Override
+                                    public void isLatestVersion() {
+
+                                    }
                                 });
 
                         if (cls != null) {

diff --git a/lib/src/main/java/com/kcode/lib/UpdateWrapper.java b/lib/src/main/java/com/kcode/lib/UpdateWrapper.java
@@ -4,14 +4,12 @@
 import android.content.Intent;
 import android.support.v4.app.FragmentActivity;
 import android.text.TextUtils;
-import android.widget.Toast;
 
 import com.kcode.lib.bean.VersionModel;
 import com.kcode.lib.common.Constant;
 import com.kcode.lib.dialog.UpdateActivity;
 import com.kcode.lib.log.L;
 import com.kcode.lib.net.CheckUpdateTask;
-import com.kcode.lib.utils.PackageUtils;
 import com.kcode.lib.utils.PublicFunctionUtils;
 
 /**
@@ -45,26 +43,17 @@ public void start() {
         new CheckUpdateTask(url, new CheckUpdateTask.Callback() {
             @Override
             public void callBack(VersionModel model) {
-                if (model == null) {
-                    Toast.makeText(mContext, "最新版本", Toast.LENGTH_SHORT).show();
-                    return;
-                }
                 //记录本次更新时间
                 PublicFunctionUtils.setLastCheckTime(mContext, System.currentTimeMillis());
-                callBackIfHasNewVersion(model);
+                mCallback.callBack(model);
                 start2Activity(mContext, model);
             }
-        }).start();
-    }
 
-    private void callBackIfHasNewVersion(VersionModel model) {
-        if (model == null) {
-            return;
-        }
-        if (PackageUtils.getVersionCode(mContext) < model.getVersionCode()
-                && mCallback != null) {
-            mCallback.callBack(model);
-        }
+            @Override
+            public void isLatestVersion() {
+                mCallback.isLatestVersion();
+            }
+        }).start();
     }
 
     private boolean checkUpdateTime(long time) {

diff --git a/lib/src/main/java/com/kcode/lib/net/CheckUpdateTask.java b/lib/src/main/java/com/kcode/lib/net/CheckUpdateTask.java
@@ -38,7 +38,7 @@ public void run() {
         mOkHttpClient.newCall(request).enqueue(new okhttp3.Callback() {
             @Override
             public void onFailure(Call call, IOException e) {
-                mCallBack.callBack(null);
+                mCallBack.isLatestVersion();
             }
 
             @Override
@@ -56,5 +56,7 @@ public void onResponse(Call call, Response response) throws IOException {
 
     public interface Callback {
         void callBack(VersionModel model);
+
+        void isLatestVersion();
     }
 }