调整下载显示进度样式

Author: 吕发强

library/src/main/java/com/lvfq/library/utils/LvAppManager.java

@@ -52,6 +52,9 @@ public void addActivity(Activity activity) {
      * 获取当前Activity（堆栈中最后一个压入的）
      */
     public Activity currentActivity() {
+        if (activityStack == null) {
+            return null;
+        }
         Activity activity = activityStack.lastElement();
         return activity;
     }
@@ -60,6 +63,9 @@ public Activity currentActivity() {
      * 结束当前Activity（堆栈中最后一个压入的）
      */
     public void finishActivity() {
+        if (activityStack == null) {
+            return;
+        }
         Activity activity = activityStack.lastElement();
         finishActivity(activity);
     }
@@ -68,7 +74,7 @@ public void finishActivity() {
      * 结束指定的Activity
      */
     public void finishActivity(Activity activity) {
-        if (activity != null) {
+        if (activity != null && activityStack != null) {
             activityStack.remove(activity);
             activity.finish();
         }
@@ -78,6 +84,9 @@ public void finishActivity(Activity activity) {
      * 结束指定类名的Activity
      */
     public void finishActivity(Class<?> cls) {
+        if (activityStack == null) {
+            return;
+        }
         for (Activity activity : activityStack) {
             if (activity.getClass().equals(cls)) {
                 finishActivity(activity);
@@ -89,6 +98,9 @@ public void finishActivity(Class<?> cls) {
      * 结束所有Activity
      */
     public void finishAllActivity() {
+        if (activityStack == null) {
+            return;
+        }
         for (int i = 0, size = activityStack.size(); i < size; i++) {
             if (null != activityStack.get(i)) {
                 activityStack.get(i).finish();
@@ -102,12 +114,15 @@ public void finishAllActivity() {
      */
     public void AppExit() {
         try {
-            finishAllActivity();
-//            ActivityManager activityMgr = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-//            activityMgr.restartPackage(context.getPackageName());
+            if (activityStack != null) {
+                finishAllActivity();
+            }
+//            ActivityManager activityMgr = (ActivityManager) LvUtils.getContext().getSystemService(Context.ACTIVITY_SERVICE);
+//            activityMgr.restartPackage( LvUtils.getContext().getPackageName());
             android.os.Process.killProcess(android.os.Process.myPid());
             System.exit(0);
         } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 }

library/src/main/java/com/lvfq/library/utils/LvDownloadDialog.java

@@ -61,7 +61,6 @@ public class LvDownloadDialog extends AlertDialog implements View.OnClickListene
 
     private boolean isMustUpdate = false;   // 是否强制更新
     private boolean cancelUpdate = false;   // 是否取消下载
-    private boolean isDownloading = false;  // 是否正在下载
 
 
     private Context context;
@@ -122,7 +121,7 @@ public void setMustUpdate(boolean mustUpdate) {
      * 初始化
      *
      * @param context
-     * @param downlaodUrl 下载地址
+     * @param downlaodUrl  下载地址
      * @param apkName      安装包名称
      * @param isMustUpdate 是否强制更新
      * @param scale        宽度比
@@ -149,7 +148,7 @@ public LvDownloadDialog(Context context, String downlaodUrl, String apkName, boo
     /**
      * @param context
      * @param downlaodUrl 下载路径
-     * @param apkName      安装包名称
+     * @param apkName     安装包名称
      */
     public LvDownloadDialog(Context context, String downlaodUrl, String apkName) {
         this(context, downlaodUrl, apkName, false, 0);

library/src/main/res/drawable/shape_lv_download_background.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/dp_10" />
+    <solid android:color="@color/color_dd" />
+</shape>

library/src/main/res/drawable/shape_lv_download_progress.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="10dp" />
+    <solid android:color="#ff0000" />
+</shape>

library/src/main/res/drawable/shape_lv_progress_bg_style.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@android:id/progress">
+        <scale
+            android:drawable="@drawable/shape_lv_download_progress"
+            android:scaleWidth="100%" />
+    </item>
+
+</layer-list>

library/src/main/res/drawable/shape_progress_bg_style.xml

@@ -38,9 +38,10 @@
             style="?android:attr/progressBarStyleHorizontal"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_10"
+            android:background="@drawable/shape_lv_download_background"
             android:max="100"
             android:progress="0"
-            android:progressDrawable="@drawable/shape_progress_bg_style"
+            android:progressDrawable="@drawable/shape_lv_progress_bg_style"
             android:visibility="gone" />
     </FrameLayout>