修改版本更新功能

jingtian · jingtian · commit d203301659e7 · 2017-03-16T18:19:17.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -31,7 +31,7 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile project(':library')
     compile 'org.byteam.superadapter:superadapter:3.6.6'
-    //  compile 'com.github.LuoGuoXin:BaseAndroid:1.0.0'
+   //  compile 'com.github.LuoGuoXin:BaseAndroid:1.0.4'
     compile 'com.android.support:recyclerview-v7:24.2.1'
     compile 'com.malinskiy:superrecyclerview:1.1.4'
 
diff --git a/app/src/main/java/luo/myapplication/MainActivity.java b/app/src/main/java/luo/myapplication/MainActivity.java
@@ -53,6 +53,12 @@ private void newsList(View view) {
         openActivity(NewsListActivity.class);
     }
 
+    @Event(R.id.btn_update)
+    private void update(View view) {
+        BaseAndroid.checkUpdate(MainActivity.this,  2,
+                "http://f5.market.mi-img.com/download/AppStore/0f4a347f5ce5a7e01315dda1ec35944fa56431d44/luo.footprint.apk", "更新了XXX\n修复OOO", true);
+    }
+
     //常用操作
     void init() {
         //设置标题栏标题，记得先在布局上面添加标题栏布局： <include layout="@layout/titleview_layout"/>
@@ -107,7 +113,7 @@ public void onClick(View v) {
         clearSp();
 
         //版本更新
-        BaseAndroid.checkUpdate(MainActivity.this,findViewById(R.id.activity_main), 2, "http://f5.market.mi-img.com/download/AppStore/0f4a347f5ce5a7e01315dda1ec35944fa56431d44/luo.footprint.apk", "更新了XXX\n修复OOO", false);
+        BaseAndroid.checkUpdate(MainActivity.this, 2, "http://f5.market.mi-img.com/download/AppStore/0f4a347f5ce5a7e01315dda1ec35944fa56431d44/luo.footprint.apk", "更新了XXX\n修复OOO", false);
 
     }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -29,4 +29,10 @@
         android:layout_height="wrap_content"
         android:text="网络请求的使用" />
 
+    <Button
+        android:id="@+id/btn_update"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="版本更新的使用" />
+
 </LinearLayout>
diff --git a/library/build.gradle b/library/build.gradle
@@ -24,7 +24,7 @@ android {
 }
 
 dependencies {
-    compile 'org.xutils:xutils:3.3.40'
+    compile 'org.xutils:xutils:3.3.42'
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'com.google.code.gson:gson:2.8.0'
     compile 'com.android.support:support-fragment:24.2.1'
diff --git a/library/src/main/java/luo/library/base/base/BaseAndroid.java b/library/src/main/java/luo/library/base/base/BaseAndroid.java
@@ -1,11 +1,10 @@
 package luo.library.base.base;
 
 import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.view.View;
+import android.os.Environment;
+import android.text.TextUtils;
+
+import java.io.File;
 
 import luo.library.base.utils.UpdateManager;
 
@@ -36,7 +35,7 @@ public static BaseConfig getBaseConfig() {
      * @param updateMessage 更新内容
      * @param isForced      是否强制更新
      */
-    public static void checkUpdate(Context context, View view, int versionCode, String url, String updateMessage, boolean isForced) {
+    public static void checkUpdate(Context context, int versionCode, String url, String updateMessage, boolean isForced) {
         if (versionCode > UpdateManager.getInstance().getVersionCode(context)) {
             int type = 0;//更新方式，0：引导更新，1：安装更新，2：强制更新
             if (UpdateManager.getInstance().isWifi(context)) {
@@ -45,21 +44,25 @@ public static void checkUpdate(Context context, View view, int versionCode, Stri
             if (isForced) {
                 type = 2;
             }
+
+            //检测是否已下载
+            String downLoadPath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/downloads/";
+            File dir = new File(downLoadPath);
+            if (!dir.exists()) {
+                dir.mkdir();
+            }
+            String fileName = url.substring(url.lastIndexOf("/") + 1, url.length());
+            if (fileName == null && TextUtils.isEmpty(fileName) && !fileName.contains(".apk")) {
+                fileName = context.getPackageName() + ".apk";
+            }
+            File file = new File(downLoadPath + fileName);
+
             //设置参数
-            UpdateManager.getInstance().setView(view).setType(type).setUrl(url).setUpdateMessage(updateMessage);
-            switch (type) {
-                case 0:
-                    //非wifi情况下，先弹框后下载
-                    UpdateManager.getInstance().showPop(context);
-                    break;
-                case 1:
-                    //wifi情况下，先下载后弹框
-                    UpdateManager.getInstance().downloadFile(context, false);
-                    break;
-                case 2:
-                    //强制更新情况下，无论是否wifi都应该是先弹框
-                    UpdateManager.getInstance().showPop(context);
-                    break;
+            UpdateManager.getInstance().setType(type).setUrl(url).setUpdateMessage(updateMessage).setFileName(fileName).setIsDownload(file.exists());
+            if (type == 1 && !file.exists()) {
+                UpdateManager.getInstance().downloadFile(context, false);
+            } else {
+                UpdateManager.getInstance().showDialog(context);
             }
         }
 
diff --git a/library/src/main/java/luo/library/base/utils/UpdateManager.java b/library/src/main/java/luo/library/base/utils/UpdateManager.java
@@ -11,14 +11,8 @@
 import android.net.Uri;
 import android.os.Environment;
 import android.text.TextUtils;
-import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.PopupWindow;
-import android.widget.RelativeLayout;
 import android.widget.RemoteViews;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import org.xutils.common.Callback;
@@ -30,21 +24,23 @@
 
 import luo.library.R;
 import luo.library.base.base.BaseAndroid;
+import luo.library.base.widget.BaseDialog;
 
 /**
  * 版本更新
  */
 
 public class UpdateManager {
-    public String DOWNLOAD_PATH = Environment.getExternalStorageDirectory().getAbsolutePath() + "/downloads/";
+    public String downLoadPath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/downloads/";
     public int type = 0;//更新方式，0：引导更新，1：安装更新，2：强制更新
     public String url = "";//apk下载地址
     public String updateMessage = "";//更新内容
-    public View view;//activity根布局的view
     public String fileName = null;//文件名
+    public boolean isDownload = false;//是否下载
     public Notification notification;
     public RemoteViews contentView;
     public NotificationManager notificationManager;
+    public BaseDialog dialog;
 
     public static UpdateManager updateManager;
 
@@ -59,119 +55,63 @@ private UpdateManager() {
 
     }
 
-    public UpdateManager setUrl(String url) {
-        this.url = url;
-        return this;
-    }
-
-
-    public UpdateManager setType(int type) {
-        this.type = type;
-        return this;
-    }
-
-
-    public UpdateManager setUpdateMessage(String updateMessage) {
-        this.updateMessage = updateMessage;
-        return this;
-    }
-
-
-    public UpdateManager setView(View view) {
-        this.view = view;
-        return this;
-    }
-
     /**
      * 弹出版本更新提示框
      */
-    public void showPop(final Context context) {
-        View contentView = LayoutInflater.from(context).inflate(R.layout.base_dialog, null);
-        final PopupWindow popupWindow = new PopupWindow(contentView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, true);
-        final TextView title = (TextView) contentView.findViewById(R.id.tv_title);
-        TextView left = (TextView) contentView.findViewById(R.id.tv_left);
-        TextView right = (TextView) contentView.findViewById(R.id.tv_right);
-        TextView message = (TextView) contentView.findViewById(R.id.tv_message);
-        RelativeLayout relativeLayout = (RelativeLayout) contentView.findViewById(R.id.rl);
-
-        //根据更新方式显示不同的文案
-        if (type == 0) {
-            title.setText("发现新版本");
-            left.setText("立即更新");
+    public void showDialog(final Context context) {
+        String title = "";
+        String left = "";
+        boolean cancelable = true;
+        if (type == 1 | isDownload) {
+            title = "安装新版本";
+            left = "立即安装";
         } else {
-            title.setText("安装新版本");
-            left.setText("立即安装");
+            title = "发现新版本";
+            left = "立即更新";
         }
-        right.setText("取消");
-        message.setText(updateMessage);
-        //升级按钮，根据更新方式来做不同的操作，0和2是下载apk并显示通知栏，1是直接安装apk
-        left.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                popupWindow.dismiss();
-                if (type == 0 | type == 2) {
-                    if (url != null && !TextUtils.isEmpty(url)) {
-                        createNotification(context);
-                        downloadFile(context, true);
-                    } else {
-                        Toast.makeText(context, "下载地址错误", Toast.LENGTH_SHORT).show();
-                    }
-                } else {
-                    installApk(context, new File(DOWNLOAD_PATH, fileName));
-                }
-
-            }
-        });
-        //取消按钮，当更新方式为强制更新时，直接退出
-        right.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                popupWindow.dismiss();
-                if (type == 2) {
-                    System.exit(0);
-                }
-            }
-        });
-        //点击外边区域消失窗口
-        if (type != 2) {
-            relativeLayout.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    popupWindow.dismiss();
-                }
-            });
+        if (type == 2) {
+            cancelable = false;
         }
-        popupWindow.showAtLocation(view, Gravity.CENTER, 0, 0);
+        dialog = new BaseDialog.Builder(context).setTitle(title).setMessage(updateMessage).setCancelable(cancelable)
+                .setLeftClick(left, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        dialog.dismiss();
+                        if (type == 1 | isDownload) {
+                            installApk(context, new File(downLoadPath, fileName));
+                        } else {
+                            if (url != null && !TextUtils.isEmpty(url)) {
+                                createNotification(context);
+                                downloadFile(context, true);
+                            } else {
+                                Toast.makeText(context, "下载地址错误", Toast.LENGTH_SHORT).show();
+                            }
+                        }
+                    }
+                })
+                .setRightClick("取消", new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        dialog.dismiss();
+                        if (type == 2) {
+                            System.exit(0);
+                        }
+                    }
+                })
+                .create();
+        dialog.show();
     }
 
 
     /**
      * 下载apk
+     *
      * @param context
-     * @param installApk 下载完成后是否需要安装
+     * @param installApk 下载完成后是否立即安装
      */
     public void downloadFile(final Context context, final boolean installApk) {
-        File dir = new File(DOWNLOAD_PATH);
-        if (!dir.exists()) {
-            dir.mkdir();
-        }
-        //截取apk的文件名
-        fileName = url.substring(url.lastIndexOf("/") + 1, url.length());
-        if (fileName == null && TextUtils.isEmpty(fileName) && !fileName.contains(".apk")) {
-            fileName = context.getPackageName() + ".apk";
-        }
-        //判断是否存在了这个apk，存在了就不下载了，直接安装或者弹框提示
-        File file = new File(DOWNLOAD_PATH + fileName);
-        if (file.exists()) {
-            if (installApk) {
-                installApk(context, new File(DOWNLOAD_PATH, fileName));
-            } else {
-                showPop(context);
-            }
-            return;
-        }
         RequestParams params = new RequestParams(url);
-        params.setSaveFilePath(DOWNLOAD_PATH + fileName);
+        params.setSaveFilePath(downLoadPath + fileName);
         x.http().request(HttpMethod.GET, params, new Callback.ProgressCallback<File>() {
 
             @Override
@@ -181,7 +121,7 @@ public void onSuccess(File result) {
 
             @Override
             public void onError(Throwable ex, boolean isOnCallback) {
-                Toast.makeText(context, "网络错误", Toast.LENGTH_SHORT).show();
+                Toast.makeText(context, ex.getMessage(), Toast.LENGTH_SHORT).show();
             }
 
             @Override
@@ -211,10 +151,11 @@ public void onLoading(long total, long current, boolean isDownloading) {
                     notifyNotification(current, total);
                 }
                 if (total == current) {
+                    notificationManager.cancelAll();
                     if (installApk) {
-                        installApk(context, new File(DOWNLOAD_PATH, fileName));
+                        installApk(context, new File(downLoadPath, fileName));
                     } else {
-                        showPop(context);
+                        showDialog(context);
                     }
                 }
             }
@@ -236,14 +177,14 @@ public void createNotification(Context context) {
         notification.contentView = contentView;
         notification.flags = Notification.DEFAULT_ALL;
         notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.notify(R.layout.notification_item, notification);
+        notificationManager.notify(0, notification);
     }
 
     public void notifyNotification(long percent, long length) {
         contentView.setTextViewText(R.id.tv_progress, (percent * 100 / length) + "%");
         contentView.setProgressBar(R.id.progress, (int) length, (int) percent, false);
         notification.contentView = contentView;
-        notificationManager.notify(R.layout.notification_item, notification);
+        notificationManager.notify(0, notification);
     }
 
     /**
@@ -282,11 +223,35 @@ public boolean isWifi(Context mContext) {
         ConnectivityManager connectivityManager = (ConnectivityManager) mContext
                 .getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo activeNetInfo = connectivityManager.getActiveNetworkInfo();
-        if (activeNetInfo != null
-                && activeNetInfo.getType() == ConnectivityManager.TYPE_WIFI) {
+        if (activeNetInfo != null && activeNetInfo.getType() == ConnectivityManager.TYPE_WIFI) {
             return true;
         }
         return false;
     }
 
+    public UpdateManager setUrl(String url) {
+        this.url = url;
+        return this;
+    }
+
+    public UpdateManager setType(int type) {
+        this.type = type;
+        return this;
+    }
+
+    public UpdateManager setUpdateMessage(String updateMessage) {
+        this.updateMessage = updateMessage;
+        return this;
+    }
+
+    public UpdateManager setFileName(String fileName) {
+        this.fileName = fileName;
+        return this;
+    }
+
+    public UpdateManager setIsDownload(boolean download) {
+        isDownload = download;
+        return this;
+    }
+
 }
diff --git a/library/src/main/java/luo/library/base/widget/BaseDialog.java b/library/src/main/java/luo/library/base/widget/BaseDialog.java
diff --git a/library/src/main/res/layout/base_dialog.xml b/library/src/main/res/layout/base_dialog.xml
diff --git a/library/src/main/res/values/style.xml b/library/src/main/res/values/style.xml

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ android {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`dependencies {`
`27`		`- compile 'org.xutils:xutils:3.3.40'`
	`27`	`+ compile 'org.xutils:xutils:3.3.42'`
`28`	`28`	`compile 'com.github.bumptech.glide:glide:3.7.0'`
`29`	`29`	`compile 'com.google.code.gson:gson:2.8.0'`
`30`	`30`	`compile 'com.android.support:support-fragment:24.2.1'`