1、新增BasisHelper及BasisViewHelper方便快速创建通用View及资源回收管理

Author: AriesHoo@126.com

app/src/main/java/com/aries/library/fast/demo/helper/CheckVersionHelper.java

@@ -3,6 +3,9 @@
 import android.app.Activity;
 import android.text.TextUtils;
 
+import androidx.appcompat.app.AlertDialog;
+
+import com.aries.library.fast.BasisHelper;
 import com.aries.library.fast.basis.BasisActivity;
 import com.aries.library.fast.demo.R;
 import com.aries.library.fast.demo.entity.UpdateEntity;
@@ -25,7 +28,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import androidx.appcompat.app.AlertDialog;
 import io.reactivex.annotations.NonNull;
 
 /**
@@ -34,29 +36,25 @@
  * Function: 检查版本升级的工具类--该处只做下载演示开发者可根据自己项目情况进行调整
  * Description:
  */
-public class CheckVersionHelper {
+public class CheckVersionHelper extends BasisHelper {
 
     private FastDownloadObserver mDownloadObserver;
-    private SoftReference<BasisActivity> mActivity;
+    private SoftReference<Activity> mActivity;
     private boolean mIsLoading = false;
 
-    private CheckVersionHelper(BasisActivity activity) {
+    public CheckVersionHelper(Activity activity) {
+        super(activity);
         this.mActivity = new SoftReference<>(activity);
     }
 
-    public static CheckVersionHelper with(BasisActivity activity) {
-        return new CheckVersionHelper(activity);
-    }
-
-
     /**
      * Function:开放平台监测版本升级
      *
      * @param
      * @return
      */
     public void checkVersion(boolean loading) {
-        BasisActivity activity = mActivity.get();
+        BasisActivity activity = (BasisActivity) mActivity.get();
         mIsLoading = loading;
         if (activity == null) {
             return;

app/src/main/java/com/aries/library/fast/demo/module/main/HomeFragment.java

@@ -7,13 +7,16 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
+import androidx.appcompat.app.AlertDialog;
+
 import com.aries.library.fast.FastManager;
 import com.aries.library.fast.demo.App;
 import com.aries.library.fast.demo.R;
 import com.aries.library.fast.demo.adapter.WidgetAdapter;
 import com.aries.library.fast.demo.constant.GlobalConstant;
 import com.aries.library.fast.demo.constant.SPConstant;
 import com.aries.library.fast.demo.entity.WidgetEntity;
+import com.aries.library.fast.demo.helper.CheckVersionHelper;
 import com.aries.library.fast.demo.helper.TitleBarViewHelper;
 import com.aries.library.fast.demo.module.WebViewActivity;
 import com.aries.library.fast.demo.module.main.sample.FastViewActivity;
@@ -44,7 +47,6 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import androidx.appcompat.app.AlertDialog;
 import cn.bingoogolapple.bgabanner.BGABanner;
 import cn.bingoogolapple.bgabanner.transformer.TransitionEffect;
 
@@ -141,6 +143,7 @@ public int getContentLayout() {
     @Override
     public void initView(Bundle savedInstanceState) {
         LoggerManager.d(TAG, "initView");
+        new CheckVersionHelper(mContext).checkVersion(false);
         listTransitionEffect.add(TransitionEffect.Default);
         listTransitionEffect.add(TransitionEffect.Alpha);
         listTransitionEffect.add(TransitionEffect.Rotate);

app/src/main/java/com/aries/library/fast/demo/module/main/MainActivity.java

@@ -5,8 +5,9 @@
 import android.os.Bundle;
 import android.text.TextUtils;
 
+import androidx.appcompat.app.AlertDialog;
+
 import com.aries.library.fast.demo.R;
-import com.aries.library.fast.demo.helper.CheckVersionHelper;
 import com.aries.library.fast.demo.module.WebViewActivity;
 import com.aries.library.fast.demo.module.activity.ActivityFragment;
 import com.aries.library.fast.demo.module.mine.MineFragment;
@@ -23,7 +24,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.appcompat.app.AlertDialog;
 import butterknife.BindView;
 
 /**
@@ -85,8 +85,6 @@ public void beforeInitView(Bundle savedInstanceState) {
 
     @Override
     public void initView(Bundle savedInstanceState) {
-        CheckVersionHelper.with(this)
-                .checkVersion(false);
         RxJavaManager.getInstance().setTimer(2000)
                 .compose(bindUntilEvent(ActivityEvent.DESTROY))
                 .subscribe(new FastObserver<Long>() {

app/src/main/java/com/aries/library/fast/demo/module/mine/MineFragment.java

@@ -14,7 +14,6 @@
 import androidx.core.view.ViewCompat;
 
 import com.allen.library.SuperTextView;
-import com.aries.library.fast.basis.BasisActivity;
 import com.aries.library.fast.demo.App;
 import com.aries.library.fast.demo.R;
 import com.aries.library.fast.demo.helper.CheckVersionHelper;
@@ -270,7 +269,7 @@ public void onViewClicked(View view) {
 //                updateEntity.url = "http://gdown.baidu.com/data/wisegame/008c0de8d4355b41/wangzherongyao_35011414.apk";
 //                CheckVersionHelper.with((BasisActivity) mContext)
 //                        .downloadApk(updateEntity, "king_glory.apk", true);
-                CheckVersionHelper.with((BasisActivity) mContext)
+                new CheckVersionHelper(mContext)
                         .checkVersion(true);
 //                new PgyUpdateManager.Builder()
 //                        .setForced(false)                //设置是否强制提示更新

app/src/main/res/values/arrays.xml

@@ -122,7 +122,7 @@
         <item>https://github.com/trello/RxLifecycle</item>
         <item>https://github.com/CymChad/BaseRecyclerViewAdapterHelper</item>
         <item>https://github.com/bingoogolapple/BGASwipeBackLayout-Android</item>
-        <item>https://github.com/AriesHoo/TabLayout</item>
+        <item>https://github.com/AriesHoo/UIWidget</item>
         <item>https://github.com/Bakumon/StatusLayoutManager</item>
         <item>https://github.com/AriesHoo/UIWidget</item>
         <item>https://github.com/scwang90/SmartRefreshLayout</item>

library/build.gradle

@@ -54,7 +54,7 @@ android {
 }
 dependencies {
     compileOnly 'com.google.android.material:material:'.concat(supportVersion)
-    compileOnly 'androidx.appcompat:appcompat:'.concat(supportVersion)
+//    compileOnly 'androidx.appcompat:appcompat:'.concat(supportVersion)
     compileOnly 'androidx.recyclerview:recyclerview:'.concat(supportVersion)
     //万能适配器
     compileOnly 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.45-androidx'
@@ -65,7 +65,9 @@ dependencies {
     //图片加载
     compileOnly 'com.github.bumptech.glide:glide:4.8.0'
     //常用UI控件(TitleBarView、RadiusView等)
-    api 'com.github.AriesHoo.UIWidget:widget-core:3.2.19'
+    api 'com.github.AriesHoo.UIWidget:widget-core:3.2.20'
+    //快速Tab库
+    api 'com.github.AriesHoo.UIWidget:tab-layout:3.2.20'
     //日志打印
     api 'com.orhanobut:logger:2.2.0'
     //注解
@@ -83,8 +85,6 @@ dependencies {
     api 'com.trello.rxlifecycle3:rxlifecycle-components:3.0.0'
     //滑动返回Activity
     api 'cn.bingoogolapple:bga-swipebacklayout:1.2.0@aar'
-    //快速Tab库
-    api 'com.github.AriesHoo:TabLayout:1.0.6'
     //页面事件交互
     api 'org.simple:androideventbus:1.0.5.1'
     //多状态视图切换

library/src/main/java/com/aries/library/fast/BasisHelper.java

@@ -0,0 +1,38 @@
+package com.aries.library.fast;
+
+import android.app.Activity;
+
+import com.aries.library.fast.manager.LoggerManager;
+
+import org.simple.eventbus.EventBus;
+
+import butterknife.Unbinder;
+
+/**
+ * @Author: AriesHoo on 2019/8/7 14:22
+ * @E-Mail: AriesHoo@126.com
+ * @Function: 绑定Activity Helper
+ * @Description:
+ */
+public class BasisHelper {
+    protected Activity mContext;
+    protected Unbinder mUnBinder;
+    protected String mTag = getClass().getSimpleName();
+
+    public BasisHelper(Activity context) {
+        mContext = context;
+        FastDelegateManager.getInstance().putBasisHelper(context, this);
+    }
+
+    /**
+     * Activity 关闭onDestroy调用
+     */
+    public void onDestroy() {
+        LoggerManager.i(mTag, "onDestroy");
+        EventBus.getDefault().unregister(this);
+        if (mUnBinder != null) {
+            mUnBinder.unbind();
+            mUnBinder = null;
+        }
+    }
+}

library/src/main/java/com/aries/library/fast/FastDelegateManager.java

@@ -2,15 +2,17 @@
 
 import android.app.Activity;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
 import com.aries.library.fast.delegate.FastRefreshDelegate;
 import com.aries.library.fast.delegate.FastTitleDelegate;
 import com.aries.library.fast.manager.LoggerManager;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.WeakHashMap;
 
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-
 /**
  * @Author: AriesHoo on 2019/3/25 10:48
  * @E-Mail: AriesHoo@126.com
@@ -41,6 +43,7 @@ public static FastDelegateManager getInstance() {
      */
     private WeakHashMap<Class, FastRefreshDelegate> mFastRefreshDelegateMap = new WeakHashMap<>();
     private WeakHashMap<Class, FastTitleDelegate> mFastTitleDelegateMap = new WeakHashMap<>();
+    private WeakHashMap<Activity, List<BasisHelper>> mBasisHelperMap = new WeakHashMap<>();
 
     public FastRefreshDelegate getFastRefreshDelegate(Class cls) {
         FastRefreshDelegate delegate = null;
@@ -98,4 +101,37 @@ public void removeFastTitleDelegate(Class cls) {
             mFastTitleDelegateMap.remove(cls);
         }
     }
+
+
+    public void putBasisHelper(Activity activity, BasisHelper helper) {
+        if (activity == null) {
+            return;
+        }
+        if (mBasisHelperMap.containsKey(activity)) {
+            mBasisHelperMap.get(activity).add(helper);
+        } else {
+            List<BasisHelper> list = new ArrayList<>();
+            list.add(helper);
+            mBasisHelperMap.put(activity, list);
+        }
+    }
+
+    /**
+     * {@link FastLifecycleCallbacks#onActivityDestroyed(Activity)}
+     *
+     * @param activity
+     */
+    public void removeBasisHelper(Activity activity) {
+        if (mBasisHelperMap.containsKey(activity)) {
+            List<BasisHelper> list = mBasisHelperMap.get(activity);
+            if (list != null) {
+                LoggerManager.i("list:"+list.size());
+                for (BasisHelper item : list) {
+                    item.onDestroy();
+                }
+                list.clear();
+                mBasisHelperMap.remove(activity);
+            }
+        }
+    }
 }

library/src/main/java/com/aries/library/fast/FastLifecycleCallbacks.java

@@ -185,6 +185,8 @@ public void onActivityDestroyed(Activity activity) {
         FastDelegateManager.getInstance().removeFastRefreshDelegate(activity.getClass());
         //清除标题栏代理类FastTitleDelegate
         FastDelegateManager.getInstance().removeFastTitleDelegate(activity.getClass());
+        //清除BasisHelper
+        FastDelegateManager.getInstance().removeBasisHelper(activity);
         //回调给开发者实现自己应用逻辑
         if (mActivityLifecycleCallbacks != null) {
             mActivityLifecycleCallbacks.onActivityDestroyed(activity);

library/src/main/java/com/aries/library/fast/FastManager.java

@@ -4,6 +4,9 @@
 import android.app.Application;
 import android.os.Bundle;
 
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+
 import com.aries.library.fast.delegate.FastRefreshDelegate;
 import com.aries.library.fast.delegate.FastRefreshLoadDelegate;
 import com.aries.library.fast.i.ActivityDispatchEventControl;
@@ -29,8 +32,6 @@
 import com.aries.ui.widget.progress.UIProgressDialog;
 import com.scwang.smartrefresh.layout.api.DefaultRefreshHeaderCreator;
 
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
 import cn.bingoogolapple.swipebacklayout.BGASwipeBackHelper;
 
 /**
@@ -45,7 +46,7 @@ public class FastManager {
     static {
         Application application = FastUtil.getApplication();
         if (application != null) {
-            LoggerManager.i("init0");
+            LoggerManager.i("FastManager", "initSuccess");
             init(application);
         }
     }