From ed0321dbc15b9454386ee3177624f6e6a01387c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=B3=E6=B9=98=E7=BF=8E?= <670765255@qq.com>
Date: Thu, 3 Sep 2020 16:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B6=E4=B8=8A=E5=9B=BE=E7=89=87=E8=B7=9F?=
 =?UTF-8?q?=E9=9A=8F=E8=BF=9B=E5=BA=A6=E5=8F=98=E5=8C=96=20=E8=80=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=83=8F=E3=80=82=E4=B8=8B=E9=9D=A2=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9D=A1=E7=9A=84=E9=82=A3=E6=A0=B7=E5=AE=9A=E6=AD=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TestHorizontalStageViewActivity.java      |  7 ++--
 .../stageview/HorizontalStageView.java        | 36 ++++++++++---------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/macsags/stageview/TestHorizontalStageViewActivity.java b/app/src/main/java/com/macsags/stageview/TestHorizontalStageViewActivity.java
index 4513257..37dfbf6 100644
--- a/app/src/main/java/com/macsags/stageview/TestHorizontalStageViewActivity.java
+++ b/app/src/main/java/com/macsags/stageview/TestHorizontalStageViewActivity.java
@@ -1,6 +1,7 @@
 package com.macsags.stageview;
 
 import android.annotation.SuppressLint;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
@@ -60,6 +61,8 @@ public void init(int []a) {
         stagesBeanList.add(stageBean5);
         stagesBeanList.add(stageBean6);
         stagesBeanList.add(stageBean7);
+        int[] drawables = new int[]{R.mipmap.shuipingzuo,R.mipmap.shuangyuzuo,R.mipmap.jinniuzuo,R.mipmap.mojiezuo,R.mipmap.tianchengzuo,R.mipmap.chunvzuo,R.mipmap.juxiezuo,R.mipmap.muyangzuo};
+        int[] drawables1 = new int[]{R.mipmap.shuipingzuo1,R.mipmap.shuangyuzuo1,R.mipmap.jinniuzuo1,R.mipmap.mojiezuo1,R.mipmap.tianchengzuo1,R.mipmap.chunvzuo1,R.mipmap.juxiezuo1,R.mipmap.muyangzuo1};
 
         stageView.setStageViewTexts(stagesBeanList)
                 .setTextSize(16)//set textSize
@@ -70,7 +73,7 @@ public void init(int []a) {
                 .setStagesViewIndicatorCompleteIcon(ContextCompat.getDrawable(getBaseContext(), R.drawable.yiwancheng))//设置stagesViewIndicator CompleteIcon
                 .setStagesViewIndicatorDefaultIcon(ContextCompat.getDrawable(getBaseContext(), R.drawable.weiwancheng))//设置stagesViewIndicator DefaultIcon
                 .setStagesViewIndicatorAttentionIcon(ContextCompat.getDrawable(getBaseContext(), R.drawable.jinxingzhong))
-                .setStageViewUnComplectedIv(ContextCompat.getDrawable(getBaseContext(), R.mipmap.tianchengzuo1))
-                .setStageViewComplectedIv(ContextCompat.getDrawable(getBaseContext(), R.mipmap.tianchengzuo));
+                .setStageViewUnComplectedIv(drawables)
+                .setStageViewComplectedIv(drawables1);
     }
 }
\ No newline at end of file
diff --git a/stageview/src/main/java/com/macsags/stageview/HorizontalStageView.java b/stageview/src/main/java/com/macsags/stageview/HorizontalStageView.java
index 8fa0f1b..31700fa 100644
--- a/stageview/src/main/java/com/macsags/stageview/HorizontalStageView.java
+++ b/stageview/src/main/java/com/macsags/stageview/HorizontalStageView.java
@@ -30,8 +30,10 @@ public class HorizontalStageView extends LinearLayout implements HorizontalStage
     private int mComplectingPosition;
     private int mUnComplectedTextColor = ContextCompat.getColor(getContext(), R.color.uncompleted_text_color);//定义默认未完成文字的颜色;
     private int mComplectedTextColor = ContextCompat.getColor(getContext(), android.R.color.white);//定义默认完成文字的颜色;
-    private Drawable mUnComplectedIV ;//定义默认未完成iv背景色颜色;
-    private Drawable mComplectedIV;//定义默认完成iv背景色颜色;
+    //    private Drawable mUnComplectedIV ;//定义默认未完成iv背景色颜色;
+//    private Drawable mComplectedIV;//定义默认完成iv背景色颜色;
+    private int mUnComplectedIvs[];
+    private int mComplectedIvs[];
     private int mTextSize = 14;//default textSize
     private TextView mTextView;
     private ImageView mImageView;
@@ -66,14 +68,14 @@ private void init() {
     public HorizontalStageView setStageViewTexts(List<StageBean> StagesBeanList) {
         mStageBeanList = StagesBeanList;
         mStagesViewIndicator.setStageNum(mStageBeanList);
-        int j =-1;
-        for (int i = 0; i <StagesBeanList.size() ; i++) {
-            if( StagesBeanList.get(i).getState()==1){
+        int j = -1;
+        for (int i = 0; i < StagesBeanList.size(); i++) {
+            if (StagesBeanList.get(i).getState() == 1) {
                 j++;
             }
 
         }
-        mComplectingPosition =j;
+        mComplectingPosition = j;
         return this;
     }
 
@@ -103,23 +105,25 @@ public HorizontalStageView setStageViewComplectedTextColor(int complectedTextCol
     /**
      * 设置上部未完成图片
      *
-     * @param unComplectedIv
+     * @param unComplectedIvs
      * @return
      */
-    public HorizontalStageView setStageViewUnComplectedIv(Drawable unComplectedIv) {
-        mUnComplectedIV = unComplectedIv;
+    public HorizontalStageView setStageViewUnComplectedIv(int[] unComplectedIvs) {
+        mUnComplectedIvs = unComplectedIvs;
         return this;
     }
+
     /**
      * 设置完成图片
      *
-     * @param complectedIv
+     * @param complectedIvs
      * @return
      */
-    public HorizontalStageView setStageViewComplectedIv(Drawable complectedIv) {
-        this.mComplectedIV = complectedIv;
+    public HorizontalStageView setStageViewComplectedIv(int[] complectedIvs) {
+        this.mComplectedIvs = complectedIvs;
         return this;
     }
+
     /**
      * 设置StagesViewIndicator未完成线的颜色
      *
@@ -203,7 +207,7 @@ public void onDrawIndicator() {
                     int measuredWidth = mTextView.getMeasuredWidth();
                     mTextView.setX(complectedXPosition.get(i) - measuredWidth / 2);
                     mTextView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-                    Log.e("TAG", "onDrawIndicator: "+mComplectingPosition+"------i"+i);
+                    Log.e("TAG", "onDrawIndicator: " + mComplectingPosition + "------i" + i);
                     if (i <= mComplectingPosition) {
                         mTextView.setTypeface(null, Typeface.BOLD);
                         mTextView.setTextColor(mComplectedTextColor);
@@ -237,18 +241,16 @@ public void onClick(View view) {
 
                     if (i <= mComplectingPosition) {
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-                            mImageView.setBackground(mComplectedIV);
+                            mImageView.setBackgroundResource(mComplectedIvs[i]);
                         }
                     } else {
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-                            mImageView.setBackground(mUnComplectedIV);
+                            mImageView.setBackgroundResource(mUnComplectedIvs[i]);
                         }
                     }
 //                    mImageView.setBackgroundResource(mStageBeanList.get(i).getStateDrawable());
 
 
-
-
                     mImgContainer.addView(mImageView);
                 }