From 331139c58cdaaf5dedbec15833c8de52e92e74e6 Mon Sep 17 00:00:00 2001
From: hupei <hupei132@qq.com>
Date: Mon, 30 Mar 2020 10:12:09 +0800
Subject: [PATCH] =?UTF-8?q?TextParams=20=E5=A2=9E=E5=8A=A0CharSequence?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 +-
 .../circledialog/sample/MainActivity.java     | 19 ++++++++++++++++++-
 .../circledialog/params/TextParams.java       |  2 ++
 .../circledialog/view/BodyTextView.java       |  6 +++++-
 config.gradle                                 |  2 +-
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 2c2408c..c2e56f5 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 # 引入
 
 ```xml
- compile 'com.mylhyl:circleDialog:2.6.16'
+ compile 'com.mylhyl:circleDialog:2.6.17'
 ```
 
 [下载APK体验](https://fir.im/sbvq)或手机扫描下面二维码
diff --git a/app/src/main/java/com/mylhyl/circledialog/sample/MainActivity.java b/app/src/main/java/com/mylhyl/circledialog/sample/MainActivity.java
index 21633ba..7ff4c10 100644
--- a/app/src/main/java/com/mylhyl/circledialog/sample/MainActivity.java
+++ b/app/src/main/java/com/mylhyl/circledialog/sample/MainActivity.java
@@ -10,7 +10,11 @@
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.text.Html;
+import android.text.SpannableString;
+import android.text.Spanned;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.TextView;
@@ -20,7 +24,9 @@
 import com.chad.library.adapter.base.BaseSectionQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.mylhyl.circledialog.CircleDialog;
+import com.mylhyl.circledialog.callback.ConfigText;
 import com.mylhyl.circledialog.params.ProgressParams;
+import com.mylhyl.circledialog.params.TextParams;
 import com.mylhyl.circledialog.res.drawable.CircleDrawable;
 import com.mylhyl.circledialog.res.values.CircleColor;
 import com.mylhyl.circledialog.res.values.CircleDimen;
@@ -79,7 +85,18 @@ public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
             case 0:
                 new CircleDialog.Builder()
                         .setTitle("标题")
-                        .setText("提示框")
+                        .configText(new ConfigText() {
+                            @Override
+                            public void onConfig(TextParams params) {
+                                SpannableString spannableString = new SpannableString("我是红色");
+                                spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#FF0000")), 2,
+                                        spannableString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                                params.textCharSequence = spannableString;
+//                                String text = "我是<font color='#FF0000'>红色</font>";
+//                                params.textCharSequence = Html.fromHtml(text);
+
+                            }
+                        })
                         .setPositive("确定", null)
                         .setOnShowListener(dialog ->
                                 Toast.makeText(MainActivity.this, "显示了！", Toast.LENGTH_SHORT).show())
diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/params/TextParams.java b/circledialog/src/main/java/com/mylhyl/circledialog/params/TextParams.java
index 33ccc7d..41e00ce 100644
--- a/circledialog/src/main/java/com/mylhyl/circledialog/params/TextParams.java
+++ b/circledialog/src/main/java/com/mylhyl/circledialog/params/TextParams.java
@@ -60,6 +60,8 @@ public TextParams[] newArray(int size) {
      */
     public int styleText = Typeface.NORMAL;
 
+    public CharSequence textCharSequence;
+
     public TextParams() {
     }
 
diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/view/BodyTextView.java b/circledialog/src/main/java/com/mylhyl/circledialog/view/BodyTextView.java
index 9e66e37..728e3d7 100644
--- a/circledialog/src/main/java/com/mylhyl/circledialog/view/BodyTextView.java
+++ b/circledialog/src/main/java/com/mylhyl/circledialog/view/BodyTextView.java
@@ -76,7 +76,11 @@ else if (titleParams == null && negativeParams == null && positiveParams == null
         setMinHeight(textParams.height);
         setTextColor(textParams.textColor);
         setTextSize(textParams.textSize);
-        setText(textParams.text);
+        if (textParams.textCharSequence != null) {
+            setText(textParams.textCharSequence);
+        } else {
+            setText(textParams.text);
+        }
         setTypeface(getTypeface(), textParams.styleText);
 
         int[] padding = textParams.padding;
diff --git a/config.gradle b/config.gradle
index ac1bef3..7e81541 100644
--- a/config.gradle
+++ b/config.gradle
@@ -21,6 +21,6 @@ ext {
     ]
 
     publish = [
-            version: "2.6.16"
+            version: "2.6.17"
     ]
 }
\ No newline at end of file