From ba061f1623ffe0a0c936e154af7e6f4e8eec435e Mon Sep 17 00:00:00 2001
From: wumeng1 <1yw@Mirko>
Date: Wed, 30 Jun 2021 17:28:38 +0800
Subject: [PATCH] #update webview

---
 .../main/java/com/mirkowu/mvm/MainActivity.kt |  22 ++-
 .../main/res/layout/fragment_databinding.xml  |  15 +-
 build.gradle                                  |   2 +-
 .../lib_webview/CommonWebActivity.java        |  30 +--
 .../lib_webview/CommonWebFragment.java        |  18 +-
 .../mirkowu/lib_webview/CommonWebView.java    |   2 +-
 .../mirkowu/lib_webview/config/WebConfig.java |  19 +-
 .../layout/webview_layout_common_web_view.xml |   4 +-
 .../com/mirkowu/lib_widget/BoldTextView.java  |   8 +
 .../java/com/mirkowu/lib_widget/Toolbar.java  |  89 ++++++++-
 .../lib_widget/adapter/BaseRVHolder.java      | 182 +++++++++++++++++-
 .../res/drawable/widget_ic_close_black.webp   | Bin 0 -> 252 bytes
 .../res/drawable/widget_ic_close_white.webp   | Bin 0 -> 264 bytes
 .../main/res/layout/widget_layout_toolbar.xml |  30 ++-
 lib_widget/src/main/res/values/attrs.xml      |   7 +
 15 files changed, 379 insertions(+), 49 deletions(-)
 create mode 100644 lib_widget/src/main/res/drawable/widget_ic_close_black.webp
 create mode 100644 lib_widget/src/main/res/drawable/widget_ic_close_white.webp

diff --git a/app/src/main/java/com/mirkowu/mvm/MainActivity.kt b/app/src/main/java/com/mirkowu/mvm/MainActivity.kt
index ab7394e..ca10e65 100644
--- a/app/src/main/java/com/mirkowu/mvm/MainActivity.kt
+++ b/app/src/main/java/com/mirkowu/mvm/MainActivity.kt
@@ -50,9 +50,9 @@ class MainActivity : BaseActivity<EmptyMediator>() {
             offscreenPageLimit = pagerAdapter.count
         }
         val PERMISSION_STORAGE = arrayOf(
-                Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                Manifest.permission.READ_EXTERNAL_STORAGE,
-                Manifest.permission.READ_PHONE_STATE
+            Manifest.permission.WRITE_EXTERNAL_STORAGE,
+            Manifest.permission.READ_EXTERNAL_STORAGE,
+            Manifest.permission.READ_PHONE_STATE
         )
 
         BuglyManager.setOnUpgradeListener { upgradeInfo, isManual ->
@@ -64,18 +64,20 @@ class MainActivity : BaseActivity<EmptyMediator>() {
                 ToastUtils.showShort("当前已是最新版本!")
             }
         }
-       // Beta.upgradeStateListener
-       // BuglyManager.checkUpgrade(false,false)
+        // Beta.upgradeStateListener
+        // BuglyManager.checkUpgrade(false,false)
     }
 
-    fun mvcClick(view: View?) {
+    fun webLocalClick(view: View?) {
 //        MVCActivity.start(this)
-//        WebViewActivity.start(context, "ces", "http://www.baidu.com/")
+        WebActivity.start(context, "ces", "file:///android_asset/test.html")
+        Log.d("WebActivity", "start: ")
+    }
+
+    fun webNetClick(view: View?) {
 //        CommonWebActivity.start(context, "ces", "http://www.baid")
 //        WebViewActivity.start(context, "ces", "https://x5.tencent.com/docs/questions.html")
-//        WebViewActivity.start(context, "ces", "file:///android_asset/test.html")
-        WebActivity.start(context, "ces", "file:///android_asset/test.html")
-//        WebActivity.start(context, "ces", "http://www.baidu.com/")
+        WebActivity.start(context, "标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题", "http://www.baidu.com/")
         Log.d("WebActivity", "start: ")
     }
 
diff --git a/app/src/main/res/layout/fragment_databinding.xml b/app/src/main/res/layout/fragment_databinding.xml
index 7b01339..8883e1e 100644
--- a/app/src/main/res/layout/fragment_databinding.xml
+++ b/app/src/main/res/layout/fragment_databinding.xml
@@ -12,8 +12,19 @@
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:onClick="mvcClick"
-        android:text="WebView"
+        android:onClick="webLocalClick"
+        android:text="WebView本地"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.282" />
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:onClick="webNetClick"
+        android:text="WebView网络"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/build.gradle b/build.gradle
index aa9753d..6cd1d93 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@ ext {
     targetSdkVersion = 29
     compileSdkVersion = 29
 
-    mvm_version = '1.0.14'
+    mvm_version = '1.0.17'
     appcompat_version = '1.3.0'
     core_ktx_version = '1.5.0'
     lifecycle_version = '2.3.1'
diff --git a/lib_webview/src/main/java/com/mirkowu/lib_webview/CommonWebActivity.java b/lib_webview/src/main/java/com/mirkowu/lib_webview/CommonWebActivity.java
index b487494..1c8a1bc 100644
--- a/lib_webview/src/main/java/com/mirkowu/lib_webview/CommonWebActivity.java
+++ b/lib_webview/src/main/java/com/mirkowu/lib_webview/CommonWebActivity.java
@@ -88,6 +88,8 @@ protected void initView() {
     protected void configToolbar(String title, @NonNull WebConfig webConfig) {
         mToolbar.setTitle(title);
         mToolbar.setShowBackIcon(webConfig.isShowBack());
+        mToolbar.setCloseIcon(R.drawable.widget_ic_close_black);
+        mToolbar.setShowCloseIcon(false);
         mToolbar.setVisibility(webConfig.isShowToolbar() ? View.VISIBLE : View.GONE);
         mProgressBar.setVisibility(webConfig.isShowProgress() ? View.VISIBLE : View.GONE);
     }
@@ -114,19 +116,22 @@ protected void clearHistory() {
 
     @NonNull
     protected WebConfig getWebConfig() {
+        boolean showClose = true;
         return new WebConfig()
                 .setShowBack(true)
+                .setShowClose(showClose)
                 .setShowToolbar(true)
                 .setShowProgress(true)
 //                .setJsInjectionArrays(new String[]{"android"})
                 .setCallBack(new IWebViewCallBack() {
                     @Override
                     public void pageStarted(CommonWebView webView, String url) {
-
                     }
 
                     @Override
                     public void pageFinished(CommonWebView webView, String url) {
+                        //显示关闭按钮
+                        mToolbar.setShowCloseIcon(webView.canGoBack() && showClose);
                     }
 
                     @Override
@@ -160,26 +165,29 @@ protected void handleWebResult(int requestCode, int resultCode, Intent data) {
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (handleWebBack(keyCode, event)) {
+        if (keyCode == KeyEvent.KEYCODE_BACK && handleWebBack()) {
             return true;
         }
-
         return super.onKeyDown(keyCode, event);
     }
 
+    @Override
+    public void onBackPressed() {
+        if (handleWebBack()) {
+            return;
+        }
+        super.onBackPressed();
+    }
+
     /**
      * 处理返回键
      *
-     * @param keyCode
-     * @param event
      * @return
      */
-    protected boolean handleWebBack(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            if (mWebView != null && mWebView.canGoBack()) {
-                mWebView.goBack();
-                return true;
-            }
+    protected boolean handleWebBack() {
+        if (mWebView != null && mWebView.canGoBack()) {
+            mWebView.goBack();
+            return true;
         }
         return false;
     }
diff --git a/lib_webview/src/main/java/com/mirkowu/lib_webview/CommonWebFragment.java b/lib_webview/src/main/java/com/mirkowu/lib_webview/CommonWebFragment.java
index 6c29302..73c4519 100644
--- a/lib_webview/src/main/java/com/mirkowu/lib_webview/CommonWebFragment.java
+++ b/lib_webview/src/main/java/com/mirkowu/lib_webview/CommonWebFragment.java
@@ -3,7 +3,6 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.view.KeyEvent;
 import android.view.View;
 import android.widget.ProgressBar;
 
@@ -117,19 +116,22 @@ protected void configWebSettings(@NonNull WebConfig webConfig) {
 
     @NonNull
     protected WebConfig getWebConfig() {
+        boolean showClose = true;
         return new WebConfig()
                 .setShowBack(true)
+                .setShowClose(showClose)
                 .setShowToolbar(true)
                 .setShowProgress(true)
 //                .setJsInjectionArrays(new String[]{"android"})
                 .setCallBack(new IWebViewCallBack() {
                     @Override
                     public void pageStarted(CommonWebView webView, String url) {
-
                     }
 
                     @Override
                     public void pageFinished(CommonWebView webView, String url) {
+                        //显示关闭按钮
+                        mToolbar.setShowCloseIcon(webView.canGoBack() && showClose);
                     }
 
                     @Override
@@ -165,16 +167,12 @@ protected void handleWebResult(int requestCode, int resultCode, Intent data) {
     /**
      * 处理返回键
      *
-     * @param keyCode
-     * @param event
      * @return
      */
-    public boolean handleWebBack(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            if (mWebView != null && mWebView.canGoBack()) {
-                mWebView.goBack();
-                return true;
-            }
+    public boolean handleWebBack() {
+        if (mWebView != null && mWebView.canGoBack()) {
+            mWebView.goBack();
+            return true;
         }
         return false;
     }
diff --git a/lib_webview/src/main/java/com/mirkowu/lib_webview/CommonWebView.java b/lib_webview/src/main/java/com/mirkowu/lib_webview/CommonWebView.java
index 672136a..e3687ef 100644
--- a/lib_webview/src/main/java/com/mirkowu/lib_webview/CommonWebView.java
+++ b/lib_webview/src/main/java/com/mirkowu/lib_webview/CommonWebView.java
@@ -189,7 +189,7 @@ public void saveWebArchive(String basename, boolean autoName, ValueCallback<Stri
         super.saveWebArchive(basename, autoName, valueCallback);
     }
 
-    protected boolean onBackHandle() {
+    public boolean onBackHandle() {
         if (canGoBack()) {
             goBack();
             return true;
diff --git a/lib_webview/src/main/java/com/mirkowu/lib_webview/config/WebConfig.java b/lib_webview/src/main/java/com/mirkowu/lib_webview/config/WebConfig.java
index a6bf315..aadd04e 100644
--- a/lib_webview/src/main/java/com/mirkowu/lib_webview/config/WebConfig.java
+++ b/lib_webview/src/main/java/com/mirkowu/lib_webview/config/WebConfig.java
@@ -9,9 +9,10 @@
  * 处理可配置的业务逻辑。但这些逻辑webView有可能用不到。所以是可用可不用的。
  */
 public class WebConfig {
-//    private String mTitleText; //标题文案
+    //    private String mTitleText; //标题文案
     private boolean mShowToolbar; //设置是否需要标题栏，true表示需要，false表示不需要
-    private boolean mShowBack; //设置是否需要标题栏，true表示需要，false表示不需要
+    private boolean mShowBack; //设置是否需要返回键，true表示需要，false表示不需要
+    private boolean mShowClose; //设置是否需要关闭键，true表示需要，false表示不需要
     private boolean mShowProgress; //设置是否需要进度条，true表示需要，false表示不需要
     private IWebViewCallBack mWebViewCallBack; //WebView回调统一处理
     private String mUserAgent;
@@ -35,6 +36,7 @@ public WebConfig setShowToolbar(boolean showToolbar) {
         mShowToolbar = showToolbar;
         return this;
     }
+
     /**
      * @param showBack 左上角是否需要返回键，true表示需要，false表示不需要
      * @return
@@ -44,6 +46,15 @@ public WebConfig setShowBack(boolean showBack) {
         return this;
     }
 
+    /**
+     * @param showClose 左上角是否需要关闭键，true表示需要，false表示不需要
+     * @return
+     */
+    public WebConfig setShowClose(boolean showClose) {
+        mShowClose = showClose;
+        return this;
+    }
+
     /**
      * @param showProgress 是否展示进度条 true表示展示，false表示不展示
      * @return
@@ -104,9 +115,13 @@ public String[] getJsInjectionArrays() {
     public boolean isShowToolbar() {
         return mShowToolbar;
     }
+
     public boolean isShowBack() {
         return mShowBack;
     }
+    public boolean isShowClose() {
+        return mShowClose;
+    }
 
     public boolean isShowProgress() {
         return mShowProgress;
diff --git a/lib_webview/src/main/res/layout/webview_layout_common_web_view.xml b/lib_webview/src/main/res/layout/webview_layout_common_web_view.xml
index 27b65d7..9a31a02 100644
--- a/lib_webview/src/main/res/layout/webview_layout_common_web_view.xml
+++ b/lib_webview/src/main/res/layout/webview_layout_common_web_view.xml
@@ -12,7 +12,9 @@
         android:layout_alignParentTop="true"
         android:background="#FFFFFF"
         android:visibility="gone"
-        app:backIcon="@drawable/widget_ic_back_black" />
+        app:backIcon="@drawable/widget_ic_back_black"
+        app:closeIcon="@drawable/widget_ic_close_black"
+        app:titleEllipsize="marquee" />
 
     <com.mirkowu.lib_webview.CommonWebView
         android:id="@+id/mWebView"
diff --git a/lib_widget/src/main/java/com/mirkowu/lib_widget/BoldTextView.java b/lib_widget/src/main/java/com/mirkowu/lib_widget/BoldTextView.java
index c1e2664..5b5a9a9 100644
--- a/lib_widget/src/main/java/com/mirkowu/lib_widget/BoldTextView.java
+++ b/lib_widget/src/main/java/com/mirkowu/lib_widget/BoldTextView.java
@@ -67,4 +67,12 @@ public void setMediumStyle() {
         setBoldWith(STYLE_MEDIUM);
     }
 
+//    @Override
+//    public boolean isFocused() {
+//        if (getEllipsize() == TextUtils.TruncateAt.MARQUEE) {
+//            return true;
+//        } else {
+//            return super.isFocused();
+//        }
+//    }
 }
diff --git a/lib_widget/src/main/java/com/mirkowu/lib_widget/Toolbar.java b/lib_widget/src/main/java/com/mirkowu/lib_widget/Toolbar.java
index 491feab..a0ee97d 100644
--- a/lib_widget/src/main/java/com/mirkowu/lib_widget/Toolbar.java
+++ b/lib_widget/src/main/java/com/mirkowu/lib_widget/Toolbar.java
@@ -5,17 +5,19 @@
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
 
 import com.mirkowu.lib_util.utilcode.util.SizeUtils;
 
@@ -23,9 +25,11 @@
  * @author: mirko
  * @date: 19-10-15
  */
-public class Toolbar extends FrameLayout {
+public class Toolbar extends RelativeLayout {
+    public static final int ELLIPSIZE_NONE = -1;
     private BoldTextView tvTitle;
     private ImageView ivBack;
+    private ImageView ivClose;
     private TextView tvRight;
     private ImageView ivRight;
     private View vLine;
@@ -33,6 +37,8 @@ public class Toolbar extends FrameLayout {
     private int mTitleColorId;
     private int mRightColorId;
     private Drawable mBackIconDrawable;
+    private Drawable mCloseIconDrawable;
+    private int mTitleEllipsize;
 
     public Toolbar(Context context) {
         this(context, null);
@@ -56,12 +62,15 @@ private void init(Context context, AttributeSet attrs) {
         mTitleColorId = ta.getColor(R.styleable.Toolbar_titleColor, Color.parseColor("#222222"));
         mRightColorId = ta.getColor(R.styleable.Toolbar_rightColor, Color.parseColor("#333333"));
         mBackIconDrawable = ta.getDrawable(R.styleable.Toolbar_backIcon);
+        mCloseIconDrawable = ta.getDrawable(R.styleable.Toolbar_closeIcon);
+        mTitleEllipsize = ta.getInt(R.styleable.Toolbar_titleEllipsize, ELLIPSIZE_NONE);
         mShowLine = ta.getBoolean(R.styleable.Toolbar_showLine, true);
         ta.recycle();
 
         View view = LayoutInflater.from(context).inflate(R.layout.widget_layout_toolbar, this);
         tvTitle = view.findViewById(R.id.btv_title);
         ivBack = view.findViewById(R.id.iv_back);
+        ivClose = view.findViewById(R.id.iv_close);
         tvRight = view.findViewById(R.id.tv_right);
         ivRight = view.findViewById(R.id.iv_right);
         vLine = view.findViewById(R.id.v_line);
@@ -70,9 +79,23 @@ private void init(Context context, AttributeSet attrs) {
         setTitleColor(mTitleColorId);
         setRightTextColor(mRightColorId);
         setBackIcon(mBackIconDrawable);
+        setCloseIcon(mCloseIconDrawable);
         setShowLine(mShowLine);
-
-
+        initTitleEllipsize();
+    }
+
+    private void initTitleEllipsize() {
+        if (mTitleEllipsize > -1) {
+            if (mTitleEllipsize == 0) {
+                setTitleEllipsize(TextUtils.TruncateAt.START);
+            } else if (mTitleEllipsize == 1) {
+                setTitleEllipsize(TextUtils.TruncateAt.MIDDLE);
+            } else if (mTitleEllipsize == 2) {
+                setTitleEllipsize(TextUtils.TruncateAt.END);
+            } else {
+                setTitleEllipsize(TextUtils.TruncateAt.MARQUEE);
+            }
+        }
     }
 
     public Toolbar setTitle(String title) {
@@ -80,6 +103,23 @@ public Toolbar setTitle(String title) {
         return this;
     }
 
+    /**
+     * 设置标题缩略格式 或 跑马灯
+     *
+     * @param where
+     * @return
+     */
+    public Toolbar setTitleEllipsize(TextUtils.TruncateAt where) {
+        tvTitle.setEllipsize(where);
+        if (where == TextUtils.TruncateAt.MARQUEE) {
+            tvTitle.setMarqueeRepeatLimit(-1);
+            tvTitle.setFocusableInTouchMode(true);
+            tvTitle.setFocusable(true);
+            tvTitle.setSelected(true);
+        }
+        return this;
+    }
+
     public Toolbar setTitle(@StringRes int titleResId) {
         tvTitle.setText(titleResId);
         return this;
@@ -96,11 +136,16 @@ public Toolbar setTitleSize(int sizeSp) {
     }
 
     public Toolbar setShowBackIcon(boolean isShow) {
-        return setBackIcon(isShow ? mBackIconDrawable : null);
+        if (isShow) {
+            setBackIcon(mBackIconDrawable);
+        } else {
+            ivBack.setVisibility(GONE);
+        }
+        return this;
     }
 
     public Toolbar setBackIcon(@DrawableRes int resId) {
-        return setBackIcon(getResources().getDrawable(resId));
+        return setBackIcon(ContextCompat.getDrawable(getContext(), resId));
     }
 
     public Toolbar setBackIcon(Drawable drawable) {
@@ -122,6 +167,38 @@ public void onClick(View v) {
         return this;
     }
 
+    public Toolbar setShowCloseIcon(boolean isShow) {
+        if (isShow) {
+            setCloseIcon(mCloseIconDrawable);
+        } else {
+            ivClose.setVisibility(GONE);
+        }
+        return this;
+    }
+
+    public Toolbar setCloseIcon(@DrawableRes int resId) {
+        return setCloseIcon(ContextCompat.getDrawable(getContext(), resId));
+    }
+
+    public Toolbar setCloseIcon(Drawable drawable) {
+        mCloseIconDrawable = drawable;
+        if (drawable == null) {
+            ivClose.setVisibility(GONE);
+        } else {
+            ivClose.setVisibility(VISIBLE);
+            ivClose.setImageDrawable(drawable);
+            ivClose.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (getContext() instanceof Activity) {
+                        ((Activity) getContext()).finish();
+                    }
+                }
+            });
+        }
+        return this;
+    }
+
     public Toolbar setRightIcon(@DrawableRes int resId, OnClickListener clickListener) {
         ivRight.setVisibility(VISIBLE);
         ivRight.setImageResource(resId);
diff --git a/lib_widget/src/main/java/com/mirkowu/lib_widget/adapter/BaseRVHolder.java b/lib_widget/src/main/java/com/mirkowu/lib_widget/adapter/BaseRVHolder.java
index dc699ad..b817c8c 100644
--- a/lib_widget/src/main/java/com/mirkowu/lib_widget/adapter/BaseRVHolder.java
+++ b/lib_widget/src/main/java/com/mirkowu/lib_widget/adapter/BaseRVHolder.java
@@ -1,16 +1,30 @@
 package com.mirkowu.lib_widget.adapter;
 
+import android.graphics.Bitmap;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.text.util.Linkify;
 import android.util.SparseArray;
 import android.view.View;
+import android.view.animation.AlphaAnimation;
+import android.widget.Checkable;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.RatingBar;
+import android.widget.TextView;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.jetbrains.annotations.NotNull;
 
 public class BaseRVHolder extends RecyclerView.ViewHolder {
-    private final SparseArray<View> mViews = new SparseArray();
+    private final SparseArray<View> mViews = new SparseArray<>();
 
     public BaseRVHolder(@NonNull @NotNull View itemView) {
         super(itemView);
@@ -27,4 +41,170 @@ public <T extends View> T getView(@IdRes int viewId) {
     }
 
 
+    public BaseRVHolder setVisible(@IdRes int viewId, boolean visible) {
+        View view = getView(viewId);
+        view.setVisibility(visible ? View.VISIBLE : View.GONE);
+        return this;
+    }
+
+//    public BaseRVHolder setGone(@IdRes int viewId, boolean visible) {
+//        View view = this.getView(viewId);
+//        view.setVisibility(visible ? View.GONE : View.VISIBLE);
+//        return this;
+//    }
+
+
+    public BaseRVHolder setSelected(@IdRes int viewId, boolean selected) {
+        View view = getView(viewId);
+        view.setSelected(selected);
+        return this;
+    }
+
+    public BaseRVHolder setText(@IdRes int viewId, CharSequence value) {
+        TextView view = (TextView) this.getView(viewId);
+        view.setText(value);
+        return this;
+    }
+
+    public BaseRVHolder setText(@IdRes int viewId, @StringRes int strId) {
+        TextView view = (TextView) this.getView(viewId);
+        view.setText(strId);
+        return this;
+    }
+
+    public BaseRVHolder setImageResource(@IdRes int viewId, @DrawableRes int imageResId) {
+        ImageView view = (ImageView) this.getView(viewId);
+        view.setImageResource(imageResId);
+        return this;
+    }
+
+    public BaseRVHolder setBackgroundColor(@IdRes int viewId, @ColorInt int color) {
+        View view = this.getView(viewId);
+        view.setBackgroundColor(color);
+        return this;
+    }
+
+    public BaseRVHolder setBackgroundRes(@IdRes int viewId, @DrawableRes int backgroundRes) {
+        View view = this.getView(viewId);
+        view.setBackgroundResource(backgroundRes);
+        return this;
+    }
+
+    public BaseRVHolder setTextColor(@IdRes int viewId, @ColorInt int textColor) {
+        TextView view = (TextView) this.getView(viewId);
+        view.setTextColor(textColor);
+        return this;
+    }
+
+    public BaseRVHolder setImageDrawable(@IdRes int viewId, Drawable drawable) {
+        ImageView view = (ImageView) this.getView(viewId);
+        view.setImageDrawable(drawable);
+        return this;
+    }
+
+    public BaseRVHolder setImageBitmap(@IdRes int viewId, Bitmap bitmap) {
+        ImageView view = (ImageView) this.getView(viewId);
+        view.setImageBitmap(bitmap);
+        return this;
+    }
+
+    public BaseRVHolder setAlpha(@IdRes int viewId, float value) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+            this.getView(viewId).setAlpha(value);
+        } else {
+            AlphaAnimation alpha = new AlphaAnimation(value, value);
+            alpha.setDuration(0L);
+            alpha.setFillAfter(true);
+            this.getView(viewId).startAnimation(alpha);
+        }
+
+        return this;
+    }
+
+
+    public BaseRVHolder linkify(@IdRes int viewId) {
+        TextView view = (TextView) this.getView(viewId);
+        Linkify.addLinks(view, Linkify.ALL);
+        return this;
+    }
+
+    public BaseRVHolder setTypeface(@IdRes int viewId, Typeface typeface) {
+        TextView view = (TextView) this.getView(viewId);
+        view.setTypeface(typeface);
+        view.setPaintFlags(view.getPaintFlags() | 128);
+        return this;
+    }
+
+    public BaseRVHolder setTypeface(Typeface typeface, int... viewIds) {
+        int[] var3 = viewIds;
+        int var4 = viewIds.length;
+
+        for (int var5 = 0; var5 < var4; ++var5) {
+            int viewId = var3[var5];
+            TextView view = (TextView) this.getView(viewId);
+            view.setTypeface(typeface);
+            view.setPaintFlags(view.getPaintFlags() | 128);
+        }
+
+        return this;
+    }
+
+    public BaseRVHolder setProgress(@IdRes int viewId, int progress) {
+        ProgressBar view = (ProgressBar) this.getView(viewId);
+        view.setProgress(progress);
+        return this;
+    }
+
+    public BaseRVHolder setProgress(@IdRes int viewId, int progress, int max) {
+        ProgressBar view = (ProgressBar) this.getView(viewId);
+        view.setMax(max);
+        view.setProgress(progress);
+        return this;
+    }
+
+    public BaseRVHolder setMax(@IdRes int viewId, int max) {
+        ProgressBar view = (ProgressBar) this.getView(viewId);
+        view.setMax(max);
+        return this;
+    }
+
+    public BaseRVHolder setRating(@IdRes int viewId, float rating) {
+        RatingBar view = (RatingBar) this.getView(viewId);
+        view.setRating(rating);
+        return this;
+    }
+
+    public BaseRVHolder setRating(@IdRes int viewId, float rating, int max) {
+        RatingBar view = (RatingBar) this.getView(viewId);
+        view.setMax(max);
+        view.setRating(rating);
+        return this;
+    }
+
+    public BaseRVHolder setTag(@IdRes int viewId, Object tag) {
+        View view = this.getView(viewId);
+        view.setTag(tag);
+        return this;
+    }
+
+    public BaseRVHolder setTag(@IdRes int viewId, int key, Object tag) {
+        View view = this.getView(viewId);
+        view.setTag(key, tag);
+        return this;
+    }
+
+    public BaseRVHolder setChecked(@IdRes int viewId, boolean checked) {
+        View view = this.getView(viewId);
+        if (view instanceof Checkable) {
+            ((Checkable) view).setChecked(checked);
+        }
+
+        return this;
+    }
+
+    public BaseRVHolder setEnabled(@IdRes int viewId, boolean enable) {
+        View view = this.getView(viewId);
+        view.setEnabled(enable);
+        return this;
+    }
 }
diff --git a/lib_widget/src/main/res/drawable/widget_ic_close_black.webp b/lib_widget/src/main/res/drawable/widget_ic_close_black.webp
new file mode 100644
index 0000000000000000000000000000000000000000..657948879b0709ca98c80381fb801faa39911494
GIT binary patch
literal 252
zcmV<Y00aM0Nk&HW00012MM6+kP&iEJ0000lKfn(V#}E+;BS|t-r?-uOOkI;cE?dzB
z^(a0i8}x@G0c_huj1Kk;=>Knp$dyiTis-*1w~ZWWOikEuTkIq7N7xp|ZBW>7=j#m9
z&TrlZ$X!U%<V=!R$dNW5k&wH1^eUW&=FqDR2q+XF3J?WY5&{XQK+A~&L;<1zdxEtk
zL;<3JKw2Ov7BIAMz|g`0LkoxV_vwtx&Sch^%sPL4qXmeDA*B0jFK}1jPY4tsGFwv5
zDUg{cppcy?ppcy?z>^SYv7M)$J>(vqdY;9@^AA6?;<2*@46XKn@i?tu+Il_=_#FqH
CHEx6e

literal 0
HcmV?d00001

diff --git a/lib_widget/src/main/res/drawable/widget_ic_close_white.webp b/lib_widget/src/main/res/drawable/widget_ic_close_white.webp
new file mode 100644
index 0000000000000000000000000000000000000000..162c833222b0b6c270b27b05c6bc9a8b976638b6
GIT binary patch
literal 264
zcmV+j0r&n=Nk&Eh0RRA3MM6+kP&iEV0000lKfn(V$1wl%KmQ6NNitKXw~YWigV3Qt
z&^U0&un=ezAT$OFJQ5Nt0yI7x31HhMVsx-)K>vR$M6Ps#Q$+tAxozY~V`{>N+hQMq
zKf<;!ZiB*xJ6~s*c7F3VK<+}4CTEhoLXNcgh=kn5qgUZHG>2YoKtQ1YQGh7Gk`PEZ
z1zJuNAPNu#*b}TRAqo%$1kwUYv4Ek41BMn37+N@-zfWgmb|$mVWY+oX8!bRI3?bcL
zdx5(Ge?p)Dk=c@ZPJzrs0fp>D0fp>D0iJ|Fi|su1>>>B?)blJJo`3kE6_1@QU}&`m
OjK^sO)7JB0!0$MPc5SKv

literal 0
HcmV?d00001

diff --git a/lib_widget/src/main/res/layout/widget_layout_toolbar.xml b/lib_widget/src/main/res/layout/widget_layout_toolbar.xml
index 55d0abf..62cad88 100644
--- a/lib_widget/src/main/res/layout/widget_layout_toolbar.xml
+++ b/lib_widget/src/main/res/layout/widget_layout_toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -9,6 +9,7 @@
         android:id="@+id/iv_back"
         android:layout_width="30dp"
         android:layout_height="@dimen/widget_toolbar_height"
+        android:layout_alignParentStart="true"
         android:layout_gravity="start|center_vertical"
         android:layout_marginStart="10dp"
         android:background="?selectableItemBackgroundBorderless"
@@ -18,13 +19,30 @@
         android:src="@drawable/widget_ic_back_black"
         android:visibility="visible" />
 
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="30dp"
+        android:layout_height="@dimen/widget_toolbar_height"
+        android:layout_gravity="start|center_vertical"
+        android:layout_toRightOf="@+id/iv_back"
+        android:background="?selectableItemBackgroundBorderless"
+        android:paddingLeft="5dp"
+        android:paddingRight="5dp"
+        android:scaleType="centerInside"
+        android:visibility="gone" />
+
     <com.mirkowu.lib_widget.BoldTextView
         android:id="@+id/btv_title"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/widget_toolbar_height"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_centerHorizontal="true"
         android:layout_gravity="center"
-        android:layout_marginLeft="60dp"
-        android:layout_marginRight="60dp"
+        android:layout_marginLeft="80dp"
+        android:layout_marginRight="80dp"
         android:ellipsize="middle"
         android:gravity="center"
         android:singleLine="true"
@@ -32,10 +50,12 @@
         android:textSize="16sp"
         tools:text="标题" />
 
+
     <TextView
         android:id="@+id/tv_right"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/widget_toolbar_height"
+        android:layout_alignParentRight="true"
         android:layout_gravity="end|center_vertical"
         android:layout_marginEnd="10dp"
         android:gravity="center"
@@ -49,6 +69,7 @@
         android:id="@+id/iv_right"
         android:layout_width="48dp"
         android:layout_height="@dimen/widget_toolbar_height"
+        android:layout_alignParentRight="true"
         android:layout_gravity="end|center_vertical"
         android:layout_marginEnd="10dp"
         android:paddingVertical="13dp"
@@ -58,6 +79,7 @@
         android:id="@+id/v_line"
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
+        android:layout_alignBottom="@+id/btv_title"
         android:layout_gravity="bottom"
         android:background="#1A000000" />
-</FrameLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/lib_widget/src/main/res/values/attrs.xml b/lib_widget/src/main/res/values/attrs.xml
index 81612d0..b5a3701 100644
--- a/lib_widget/src/main/res/values/attrs.xml
+++ b/lib_widget/src/main/res/values/attrs.xml
@@ -9,9 +9,16 @@
     <declare-styleable name="Toolbar">
         <attr name="title" format="string" />
         <attr name="titleColor" format="color" />
+        <attr name="titleEllipsize" format="enum">
+            <enum name="start" value="0" />
+            <enum name="middle" value="1" />
+            <enum name="end" value="2" />
+            <enum name="marquee" value="3" />
+        </attr>
         <attr name="rightColor" format="color" />
         <attr name="showLine" format="boolean" />
         <attr name="backIcon" format="reference" />
+        <attr name="closeIcon" format="reference" />
         <attr name="showBackIcon" format="boolean" />
     </declare-styleable>
     <declare-styleable name="StateView">