1、升级部分三方库

AriesHoo@126.com · AriesHoo@126.com · commit 9468ca417448 · 2019-09-06T17:44:41.000+08:00
2、修改已知bug
diff --git a/README.md b/README.md
@@ -158,7 +158,7 @@ allprojects {
 
 ```
 dependencies {
-      implementation 'com.github.AriesHoo:FastLib:2.2.13'
+      implementation 'com.github.AriesHoo:FastLib:2.3.0'
 }
 ```
 
@@ -177,7 +177,7 @@ dependencies {
 	<dependency>
 	    <groupId>com.github.AriesHoo</groupId>
 	    <artifactId>FastLib</artifactId>
-	    <version>2.2.13</version>
+	    <version>2.3.0</version>
 	</dependency>
 ```
 
diff --git a/apk/sample.apk b/apk/sample.apk
diff --git a/apk/update b/apk/update
@@ -1,8 +1,8 @@
 {
-	"versionCode": 243,
-	"versionName": "2.2.13_beta13",
+	"versionCode": 244,
+	"versionName": "2.3.0",
 	"url": "https://raw.githubusercontent.com/AriesHoo/FastLib/dev/apk/sample.apk",
-	"force": true,
-	"size": "3.75M",
-	"message": "1、升级部分三方库增强稳定性"
+	"force": false,
+	"size": "3.74M",
+	"message": "1、升级部分三方库增强稳定性\n2、修改部分BUG"
 }
diff --git a/app/build.gradle b/app/build.gradle
@@ -77,7 +77,7 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':library')
-    //    implementation 'com.github.AriesHoo:FastLib:2.2.13_beta12'
+    //    implementation 'com.github.AriesHoo:FastLib:2.3.0'
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3'
     releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
     testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3'
@@ -117,4 +117,7 @@ dependencies {
     implementation 'androidx.multidex:multidex:2.0.0'
     //蒲公英
     implementation 'com.pgyersdk:sdk:3.0.5'
+//
+//    //保活组件
+//    implementation 'com.fanjun:keeplive:1.1.18'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
+
         android:theme="@style/AppTheme">
         <!-- 配置APP渠道号 -->
         <meta-data
diff --git a/app/src/main/java/com/aries/library/fast/demo/helper/CheckVersionHelper.java b/app/src/main/java/com/aries/library/fast/demo/helper/CheckVersionHelper.java
@@ -10,23 +10,16 @@
 import com.aries.library.fast.demo.R;
 import com.aries.library.fast.demo.entity.UpdateEntity;
 import com.aries.library.fast.demo.retrofit.repository.ApiRepository;
-import com.aries.library.fast.demo.widget.ProgressDialog;
 import com.aries.library.fast.manager.LoggerManager;
 import com.aries.library.fast.retrofit.FastDownloadObserver;
 import com.aries.library.fast.retrofit.FastLoadingObserver;
 import com.aries.library.fast.retrofit.FastObserver;
-import com.aries.library.fast.retrofit.FastRetrofit;
-import com.aries.library.fast.util.FastFileUtil;
-import com.aries.library.fast.util.FastFormatUtil;
 import com.aries.library.fast.util.FastStackUtil;
 import com.aries.library.fast.util.ToastUtil;
+import com.download.library.DownloadImpl;
 import com.trello.rxlifecycle3.android.ActivityEvent;
-import com.trello.rxlifecycle3.components.support.RxAppCompatActivity;
 
-import java.io.File;
 import java.lang.ref.SoftReference;
-import java.util.HashMap;
-import java.util.Map;
 
 import io.reactivex.annotations.NonNull;
 
@@ -161,74 +154,15 @@ public void downloadApk(UpdateEntity entity, String fileName, boolean isRangeEna
         if (activity == null || activity.isFinishing()) {
             return;
         }
-
-        ProgressDialog mProgressDialog = new ProgressDialog(activity);
-        mProgressDialog.setTitle(entity.getTitle());
-        mProgressDialog.setIndeterminate(false);
-        mProgressDialog.setMessage(entity.getMessage());
-        mProgressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
-        mProgressDialog.setCancelable(!entity.force);
-        mProgressDialog.setProgressNumberFormat("");
-        mProgressDialog.setCanceledOnTouchOutside(!entity.force);
-
-        //暂停下载-慎用;建议使用 Disposable.dispose();
-//        mProgressDialog.setButton(DialogInterface.BUTTON_NEGATIVE, "暂停", new DialogInterface.OnClickListener() {
-//            @Override
-//            public void onClick(DialogInterface dialog, int which) {
-//                if (mDownloadObserver != null) {
-//                    mDownloadObserver.pause();
-//                }
-//            }
-//        });
-
-        File mLocal = new File(FastFileUtil.getCacheDir(), fileName);
-        Map<String, Object> header = null;
-        long length = mLocal.length();
-        if (isRangeEnable) {
-            header = new HashMap<>(1);
-            header.put("range", "bytes=" + length + "-");
-            LoggerManager.i("downloadApk", "length:" + length);
-        }
-        //不同url不能使用相同的本地绝对路径不然很可能将B的后半部分下载追加到A的后面--最终也是错误的
-        ProgressDialog finalMProgressDialog = mProgressDialog;
-        mDownloadObserver = new FastDownloadObserver(fileName, finalMProgressDialog, isRangeEnable) {
-            @Override
-            public void onSuccess(File file) {
-                FastFileUtil.installApk(file);
-            }
-
-            @Override
-            public void onFail(Throwable e) {
-                LoggerManager.e("downloadApk", e.getMessage());
-                //HTTP 416 Range Not Satisfiable 出现该错误--很大可能性是文件已下载完成传递的
-                boolean satisfiable = e != null && e.getMessage().contains("416") && e.getMessage().toLowerCase().contains("range");
-                if (satisfiable) {
-                    onSuccess(mLocal);
-                    return;
-                }
-                boolean isPause = e != null && e.getMessage().equals(FastDownloadObserver.DOWNLOAD_PAUSE);
-                if (isPause) {
-                    ToastUtil.show("暂停下载");
-                    return;
-                }
-                ToastUtil.show("下载失败:" + e.getMessage());
-            }
-
-            @Override
-            public void onProgress(float progress, long current, long total) {
-                LoggerManager.i("downloadApk", "current:" + current + ";total:" + total);
-                if (!finalMProgressDialog.isShowing()) {
-                    return;
-                }
-                finalMProgressDialog.setProgressNumberFormat(FastFormatUtil.formatDataSize(current) + "/" + FastFormatUtil.formatDataSize(total));
-                finalMProgressDialog.setMax((int) total);
-                finalMProgressDialog.setProgress((int) current);
-            }
-        };
-        FastRetrofit.getInstance().downloadFile(entity.url, header)
-                .compose(((RxAppCompatActivity) activity).bindUntilEvent(ActivityEvent.DESTROY))
-                //可自定义保存路径默认//storage/emulated/0/Android/data/<package-name>/cache/xxx/
-                .subscribe(mDownloadObserver);
+        DownloadImpl.getInstance()
+                .with(mContext)
+                .url(entity.url)
+                .quickProgress()
+                .setEnableIndicator(true)
+                .autoOpenIgnoreMD5()
+                .setRetry(5)
+                .setBlockMaxTime(100000L)
+                .enqueue();
     }
 
 }
diff --git a/app/src/main/java/com/aries/library/fast/demo/module/main/MainActivity.java b/app/src/main/java/com/aries/library/fast/demo/module/main/MainActivity.java
@@ -4,6 +4,8 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
 
 import androidx.appcompat.app.AlertDialog;
 
@@ -17,6 +19,7 @@
 import com.aries.library.fast.manager.RxJavaManager;
 import com.aries.library.fast.module.activity.FastMainActivity;
 import com.aries.library.fast.retrofit.FastObserver;
+import com.aries.library.fast.util.SizeUtil;
 import com.aries.ui.view.tab.CommonTabLayout;
 import com.didichuxing.doraemonkit.util.PermissionUtil;
 import com.trello.rxlifecycle3.android.ActivityEvent;
@@ -35,6 +38,7 @@
 public class MainActivity extends FastMainActivity {
 
     @BindView(R.id.tabLayout_commonFastLib) CommonTabLayout mTabLayout;
+    private ArrayList<FastTabEntity> mTabEntities;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -48,12 +52,12 @@ public boolean isSwipeEnable() {
 
     @Override
     public List<FastTabEntity> getTabList() {
-        ArrayList<FastTabEntity> tabEntities = new ArrayList<>();
-        tabEntities.add(new FastTabEntity(R.string.home, R.drawable.ic_home_normal, R.drawable.ic_home_selected, HomeFragment.newInstance()));
-        tabEntities.add(new FastTabEntity(R.string.web_app, R.drawable.ic_app_normal, R.drawable.ic_app_selected, WebAppFragment.newInstance()));
-        tabEntities.add(new FastTabEntity(R.string.activity, R.drawable.ic_activity_normal, R.drawable.ic_activity_selected, ActivityFragment.newInstance()));
-        tabEntities.add(new FastTabEntity(R.string.mine, R.drawable.ic_mine_normal, R.drawable.ic_mine_selected, MineFragment.newInstance()));
-        return tabEntities;
+        mTabEntities = new ArrayList<>();
+        mTabEntities.add(new FastTabEntity(R.string.home, R.drawable.ic_home_normal, R.drawable.ic_home_selected, HomeFragment.newInstance()));
+        mTabEntities.add(new FastTabEntity(R.string.web_app, R.drawable.ic_app_normal, R.drawable.ic_app_selected, WebAppFragment.newInstance()));
+        mTabEntities.add(new FastTabEntity(R.string.activity, R.drawable.ic_activity_normal, R.drawable.ic_activity_selected, ActivityFragment.newInstance()));
+        mTabEntities.add(new FastTabEntity(R.string.mine, R.drawable.ic_mine_normal, R.drawable.ic_mine_selected, MineFragment.newInstance()));
+        return mTabEntities;
     }
 
     @Override
@@ -76,6 +80,14 @@ protected void onNewIntent(Intent intent) {
 
     @Override
     public void setTabLayout(CommonTabLayout tabLayout) {
+        ImageView imageView = new ImageView(mContext);
+        imageView.setImageResource(R.drawable.ic_github);
+        tabLayout.setCenterView(imageView, SizeUtil.dp2px(42), SizeUtil.dp2px(42), new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                WebViewActivity.start(mContext, "https://github.com/AriesHoo/FastLib/blob/master/README.md");
+            }
+        });
     }
 
     @Override
diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml
@@ -101,6 +101,7 @@
                 app:sDividerLineType="both"
                 app:sLeftIconHeight="22dp"
                 app:sLeftIconMarginLeft="13dp"
+                android:visibility="gone"
                 app:sLeftIconRes="@drawable/ic_update"
                 app:sLeftIconWidth="22dp"
                 app:sLeftTextString="@string/upload_file"/>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name">FastLib</string>
     <string name="home">主页</string>
-    <string name="web_app">WebApp</string>
+    <string name="web_app">网页</string>
     <string name="activity">活动</string>
     <string name="mine">我的</string>
     <string name="home_list_content">点击查看示例</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name">FastLib</string>
     <string name="home">主页</string>
-    <string name="web_app">WebApp</string>
+    <string name="web_app">网页</string>
     <string name="activity">活动</string>
     <string name="mine">我的</string>
     <string name="home_list_content">点击查看示例</string>
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
@@ -31,6 +31,6 @@ ext{
     minLibSdkVersion = 15
     targetSdkVersion = 28
     supportVersion = "1.0.0"
-    versionCode = 243
-    versionName = "2.2.13_beta13"
+    versionCode = 244
+    versionName = "2.3.0"
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 06 09:11:06 CST 2019
+#Wed Aug 28 08:42:21 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -58,9 +58,9 @@ dependencies {
     //图片加载
     compileOnly 'com.github.bumptech.glide:glide:4.8.0'
     //常用UI控件(TitleBarView、RadiusView等)
-    api 'com.github.AriesHoo.UIWidget:widget-core:3.2.21'
+    api 'com.github.AriesHoo.UIWidget:widget-core:3.2.23'
     //快速Tab库
-    api 'com.github.AriesHoo.UIWidget:tab-layout:3.2.21'
+    api 'com.github.AriesHoo.UIWidget:tab-layout:3.2.23'
     //日志打印
     api 'com.orhanobut:logger:2.2.0'
     //注解
diff --git a/library/src/main/java/com/aries/library/fast/basis/BasisViewHelper.java b/library/src/main/java/com/aries/library/fast/basis/BasisViewHelper.java
@@ -5,6 +5,7 @@
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.util.TypedValue;
 import android.view.View;
 import android.widget.Checkable;
 import android.widget.CompoundButton;
@@ -41,7 +42,8 @@ public BasisViewHelper(Activity context) {
      *
      * @return
      */
-    public abstract @LayoutRes int getContentLayout();
+    public abstract @LayoutRes
+    int getContentLayout();
 
     public View getContentView() {
         if (mContentView == null) {
@@ -92,6 +94,22 @@ public T setEnabled(int id, boolean enabled) {
         return back();
     }
 
+    public T setFakeBoldText(int id, boolean fakeBoldText) {
+        TextView textView = getContentView().findViewById(id);
+        textView.getPaint().setFakeBoldText(fakeBoldText);
+        return back();
+    }
+
+    public T setTextSize(int id, float dp) {
+        return setTextSize(id, TypedValue.COMPLEX_UNIT_DIP, dp);
+    }
+
+    public T setTextSize(int id, int unit, float dp) {
+        TextView textView = getContentView().findViewById(id);
+        textView.setTextSize(unit, dp);
+        return back();
+    }
+
     public T setText(int id, int resId) {
         return setText(id, mContext.getText(resId));
     }
diff --git a/library/src/main/java/com/aries/library/fast/module/activity/FastWebActivity.java b/library/src/main/java/com/aries/library/fast/module/activity/FastWebActivity.java

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`		`- "versionCode": 243,`
`3`		`- "versionName": "2.2.13_beta13",`
	`2`	`+ "versionCode": 244,`
	`3`	`+ "versionName": "2.3.0",`
`4`	`4`	`"url": "https://raw.githubusercontent.com/AriesHoo/FastLib/dev/apk/sample.apk",`
`5`		`- "force": true,`
`6`		`- "size": "3.75M",`
`7`		`- "message": "1、升级部分三方库增强稳定性"`
	`5`	`+ "force": false,`
	`6`	`+ "size": "3.74M",`
	`7`	`+ "message": "1、升级部分三方库增强稳定性\n2、修改部分BUG"`
`8`	`8`	`}`