From 4389a7a09aef00e1a230bd3406653d375b0113de Mon Sep 17 00:00:00 2001
From: fuyuguang <2858311356@qq.com>
Date: Fri, 18 Nov 2016 18:33:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E7=A7=8D=E6=9D=A1?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/main.xml              | 13 +++++++
 .../java/com/allen/library/SuperTextView.java | 36 ++++++++++++++++++-
 library/src/main/res/values/attrs.xml         |  3 ++
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 2d2b542..773b024 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -78,6 +78,19 @@
                 stv:sLeftTextString="设置中心"
                 stv:sRightIconRes="@drawable/arrow_right_red" />
 
+
+            <com.allen.library.SuperTextView
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                stv:sLeftTextString="客服热线"
+                stv:sRightTextColor="#ff0000"
+                stv:sRightTextSize="12dp"
+                stv:sLeftTextSize="14dip"
+                stv:sRightTextStringRightIconRes="@drawable/arrow_right_red"
+                stv:sRightTextStringRightIconResPadding="8dip"
+                stv:sRightTextString="4006179999"
+                stv:sUseRipple="true" />
+
             <com.allen.library.SuperTextView
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
diff --git a/library/src/main/java/com/allen/library/SuperTextView.java b/library/src/main/java/com/allen/library/SuperTextView.java
index cc51186..c077bf9 100644
--- a/library/src/main/java/com/allen/library/SuperTextView.java
+++ b/library/src/main/java/com/allen/library/SuperTextView.java
@@ -116,6 +116,8 @@ public class SuperTextView extends RelativeLayout {
             leftBottomParams2, rightTextParams, rightImgParams, rightCheckBoxParams;
 
     private OnSuperTextViewClickListener onSuperTextViewClickListener;
+    private Drawable rightTextStringRightIconRes;
+    private int rightTextStringRightIconPadding;
 
 
     public SuperTextView(Context context) {
@@ -151,6 +153,9 @@ private void getAttr(AttributeSet attrs) {
         centerTextString = typedArray.getString(R.styleable.SuperTextView_sCenterTextString);
         rightTextString = typedArray.getString(R.styleable.SuperTextView_sRightTextString);
 
+        rightTextStringRightIconRes = typedArray.getDrawable(R.styleable.SuperTextView_sRightTextStringRightIconRes);
+        rightTextStringRightIconPadding = typedArray.getDimensionPixelSize(R.styleable.SuperTextView_sRightTextStringRightIconResPadding,dip2px(mContext,5));
+
         leftTopTextString = typedArray.getString(R.styleable.SuperTextView_sLeftTopTextString);
         leftBottomTextString = typedArray.getString(R.styleable.SuperTextView_sLeftBottomTextString);
         leftBottomTextString2 = typedArray.getString(R.styleable.SuperTextView_sLeftBottomTextString2);
@@ -227,7 +232,7 @@ private void initLayout() {
         if (rightIconRes != null) {
             initRightIcon();
         }
-        if (rightTextString != null) {
+        if (rightTextString != null || rightTextStringRightIconRes != null) {
             initRightText();
         }
         if (showCheckBox) {
@@ -475,6 +480,7 @@ private void initRightText() {
         rightTV.setText(rightTextString);
         setTextColor(rightTV, rightTVColor);
         setTextSize(rightTV, rightTVSize);
+        setTextViewRightDrawble(rightTV,rightTextStringRightIconRes,rightTextStringRightIconPadding);
         rightTV.setGravity(Gravity.RIGHT);
         setTextViewParams(rightTV, isSingLines, maxLines, maxEms);
         addView(rightTV);
@@ -669,6 +675,26 @@ public SuperTextView setRightString(String rightString) {
         return this;
     }
 
+    /**
+     * 设置右边显示的文字和图片
+     * @param rightString 右边文字
+     * @param drawable   drawable
+     * @param drawablePadding   drawablePadding
+     * @return
+     */
+    public SuperTextView setRightString(String rightString,Drawable drawable,int drawablePadding) {
+        rightTextString = rightString;
+        rightTextStringRightIconRes = drawable;
+        rightTextStringRightIconPadding = drawablePadding;
+        if (rightTV == null) {
+            initRightText();
+        } else {
+            rightTV.setText(rightString);
+        }
+        return this;
+    }
+
+
     /**
      * 设备中间文字
      *
@@ -940,4 +966,12 @@ public int sp2px(Context context, float spValue) {
         final float scale = context.getResources().getDisplayMetrics().scaledDensity;
         return (int) (spValue * scale + 0.5f);
     }
+
+    public static void setTextViewRightDrawble(TextView textView,Drawable drawable,int drawablePadding){
+        if (drawable != null && textView != null) {
+            drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
+            textView.setCompoundDrawables(null, null, drawable, null);
+            textView.setCompoundDrawablePadding(drawablePadding);
+        }
+    }
 }
diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
index 8b47a96..99a582a 100644
--- a/library/src/main/res/values/attrs.xml
+++ b/library/src/main/res/values/attrs.xml
@@ -25,6 +25,9 @@
         <attr name="sLeftBottomTextMarginLeft" format="dimension"/>
         <attr name="sLeftBottomTextMarginLeft2" format="dimension"/>
 
+        <attr name="sRightTextStringRightIconRes" format="reference"/>
+        <attr name="sRightTextStringRightIconResPadding" format="dimension"/>
+
         <attr name="sRightIconMarginRight" format="dimension"/>
         <attr name="sRightTextMarginRight" format="dimension"/>
         <attr name="sRightCheckBoxMarginRight" format="dimension"/>