修复:修改FastUtil startActivity 方法增加singletag设置方法setActivitySingleFlag(int)

Author: AriesHoo

apk/sample.apk

@@ -1,6 +1,6 @@
 {
-	"versionCode": 235,
-	"versionName": "2.2.10-beta25",
+	"versionCode": 237,
+	"versionName": "2.2.10-beta27",
 	"url": "https://raw.githubusercontent.com/AriesHoo/FastLib/master/apk/sample.apk",
 	"force": true,
 	"size": "3.77M",

apk/update

@@ -70,7 +70,7 @@ public TitleBarViewHelper setRecyclerView(RecyclerView recyclerView) {
             @Override
             public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
                 super.onScrolled(recyclerView, dx, dy);
-                mScrollY += dy;
+                mScrollY = recyclerView.computeVerticalScrollOffset();
                 mAlpha = setChange(mScrollY);
             }
         });

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

@@ -82,14 +82,7 @@ public int getContentLayout() {
     public void setTitleBar(TitleBarView titleBar) {
         titleBar.setBgColor(Color.WHITE)
                 .setTitleMainTextColor(Color.WHITE)
-                .setTitleMainText(R.string.mine)
-                .setLeftTextDrawable(R.drawable.ic_setting)
-                .setOnLeftTextClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        FastUtil.startActivity(mContext, SettingActivity.class);
-                    }
-                });
+                .setTitleMainText(R.string.mine);
         titleBar.getBackground().setAlpha(0);
     }
 

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

@@ -33,6 +33,6 @@ ext{
     minSdkVersion = 21
     targetSdkVersion = 28
     supportVersion = "28.0.0"
-    versionCode = 235
-    versionName = "2.2.10-beta25"
+    versionCode = 237
+    versionName = "2.2.10-beta27"
 }

build.gradle

@@ -5,6 +5,7 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.ColorInt;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
 import android.util.TypedValue;
 import android.view.KeyEvent;
@@ -107,17 +108,17 @@ public void onClick(View v) {
             }
         })
                 .setRightTextDrawable(FastUtil.getTintDrawable(
-                        getResources().getDrawable(R.drawable.fast_ic_more),
-                        getResources().getColor(R.color.colorTitleText)))
+                        ContextCompat.getDrawable(mContext, R.drawable.fast_ic_more),
+                        ContextCompat.getColor(mContext, R.color.colorTitleText)))
                 .setOnRightTextClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         showActionSheet();
                     }
                 })
                 .addLeftAction(titleBar.new ImageAction(
-                        FastUtil.getTintDrawable(getResources().getDrawable(R.drawable.fast_ic_close),
-                                getResources().getColor(R.color.colorTitleText)), new View.OnClickListener() {
+                        FastUtil.getTintDrawable(ContextCompat.getDrawable(mContext, R.drawable.fast_ic_close),
+                                ContextCompat.getColor(mContext, R.color.colorTitleText)), new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         showDialog();
@@ -222,27 +223,33 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
 
     @Override
     public void onBackPressed() {
-        if (mAgentWeb.back()) {
+        if (mAgentWeb != null && mAgentWeb.back()) {
             return;
         }
         super.onBackPressed();
     }
 
     @Override
     protected void onPause() {
-        mAgentWeb.getWebLifeCycle().onPause();
+        if (mAgentWeb != null) {
+            mAgentWeb.getWebLifeCycle().onPause();
+        }
         super.onPause();
     }
 
     @Override
     protected void onResume() {
-        mAgentWeb.getWebLifeCycle().onResume();
+        if (mAgentWeb != null) {
+            mAgentWeb.getWebLifeCycle().onResume();
+        }
         super.onResume();
     }
 
     @Override
     protected void onDestroy() {
-        mAgentWeb.getWebLifeCycle().onDestroy();
+        if (mAgentWeb != null) {
+            mAgentWeb.getWebLifeCycle().onDestroy();
+        }
         super.onDestroy();
     }
 }

library/src/main/java/com/aries/library/fast/module/activity/FastWebActivity.java

@@ -31,9 +31,12 @@
  * Description:
  * 1、将startActivity 参数Activity 改为Context
  * 2、2018-7-23 09:29:55 新增获取App 应用名称方法
+ * 3、2019-2-15 11:28:53 修改startActivity 方法增加single tag设置方法{@link #setActivitySingleFlag(int)}
  */
 public class FastUtil {
 
+    private static int ACTIVITY_SINGLE_FLAG = Intent.FLAG_ACTIVITY_SINGLE_TOP;
+
     /**
      * 获取应用名称
      *
@@ -230,6 +233,17 @@ public static void jumpMarket(Context mContext, String packageName) {
         }
     }
 
+    /**
+     * 设置Activity只启动一个Flag
+     *
+     * @param flag {@link Intent#FLAG_ACTIVITY_SINGLE_TOP}
+     *             {@link Intent#FLAG_ACTIVITY_NEW_TASK}
+     *             {@link Intent#FLAG_ACTIVITY_CLEAR_TOP}
+     */
+    public static void setActivitySingleFlag(int flag) {
+        ACTIVITY_SINGLE_FLAG = flag;
+    }
+
     /**
      * @param context
      * @param activity 跳转Activity
@@ -241,8 +255,7 @@ public static void startActivity(Context context, Class<? extends Activity> acti
             return;
         }
         Intent intent = new Intent(context, activity);
-        intent.setFlags(isSingle ? Intent.FLAG_ACTIVITY_NEW_TASK
-                | Intent.FLAG_ACTIVITY_CLEAR_TOP : Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.setFlags(isSingle ? ACTIVITY_SINGLE_FLAG : Intent.FLAG_ACTIVITY_NEW_TASK);
         if (bundle != null) {
             intent.putExtras(bundle);
         }