diff --git a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java index c5bd288..f6d3671 100644 --- a/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java +++ b/app/src/main/java/com/fenghoo/seven/main/find/adapter/holder/ContentViewHolder.java @@ -10,45 +10,29 @@ import android.widget.TextView; import com.fenghoo.seven.R; import com.fenghoo.seven.main.find.entity.markquestions; import com.fenghoo.seven.main.find.mvp.contract.MarKQuestionItemviewOnClickListener; +import com.fenghoo.seven.main.kehu.Bean.fpOrderInfoBean; +import com.fenghoo.seven.widget.ItemProView; public class ContentViewHolder extends TypeAbstractViewHolder { - private TextView tv_question; - private EditText et_remarkquestion; + private ItemProView itemProView; public ContentViewHolder(View itemView) { super(itemView); - tv_question = (TextView) itemView.findViewById(R.id.tv_question); - et_remarkquestion = (EditText) itemView.findViewById(R.id.et_remarkquestion); + itemProView = (ItemProView) itemView.findViewById(R.id.item_my_twitter); } + /** + * 页面逻辑 + * travel：1:已分配，2：已被抢，3：已进店，4：已成交 4种类型的条目 + * + * order_state：0：未成交，1：已成交 + * ygd_state：0：未被抢，1：已被抢 + * type：1：已回收，2：已成交 + */ + public void bindHolder(final fpOrderInfoBean.ResultBean.DataBean dataBean, int position, Context mContext, final MarKQuestionItemviewOnClickListener mviewListener) { - public void bindHolder(final markquestions.ResultBean.DataBean dataBean, int position, Context mContext, final MarKQuestionItemviewOnClickListener mviewListener) { - //1.根据Tag移除掉监听 - if (et_remarkquestion.getTag() instanceof TextWatcher) { - et_remarkquestion.removeTextChangedListener((TextWatcher) et_remarkquestion.getTag()); - } - - final String markname = dataBean.getMarkname(); - final String answer = dataBean.getAnswer(); - String is_must = dataBean.getIs_must(); - if (is_must.equals("1")) { - tv_question.setText(position + "." + markname+" (必填)"); - } else { - tv_question.setText(position + "." + markname); - } - - et_remarkquestion.setText(answer); - - if (et_remarkquestion.getTag() != null && et_remarkquestion.getTag() instanceof TextWatcher) { - et_remarkquestion.removeTextChangedListener((TextWatcher) et_remarkquestion.getTag()); - } - TextWatcher textWatcher = new textwatcher() { - @Override - public void afterTextChanged(Editable s) { - dataBean.setAnswer(s.toString()); - } - }; - - et_remarkquestion.addTextChangedListener(textWatcher); - et_remarkquestion.setTag(textWatcher); + /** + * 三个字段，有六种状态 + */ + itemProView.refresh("2"); } } diff --git a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java index e257faa..8526f01 100644 --- a/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java +++ b/app/src/main/java/com/fenghoo/seven/main/kehu/activity/FpOrderInfoActivity.java @@ -145,3 +145,12 @@ public class FpOrderInfoActivity extends BaseActivity implements View.OnClickLis } } + +/** + * 页面逻辑 + * travel：1:已分配，2：已被抢，3：已进店，4：已成交 4种类型的条目 + * + * order_state：0：未成交，1：已成交 + * ygd_state：0：未被抢，1：已被抢 + * type：1：已回收，2：已成交 + */ diff --git a/app/src/main/java/com/fenghoo/seven/widget/ItemProView.java b/app/src/main/java/com/fenghoo/seven/widget/ItemProView.java index ab616a6..42c2401 100644 --- a/app/src/main/java/com/fenghoo/seven/widget/ItemProView.java +++ b/app/src/main/java/com/fenghoo/seven/widget/ItemProView.java @@ -10,6 +10,8 @@ import android.widget.ImageView; import android.widget.TextView; import com.fenghoo.seven.R; +import com.fenghoo.seven.main.activity.Main2Activity; +import com.fenghoo.seven.main.my.activity.PersonalProfileActivity; import androidx.annotation.AttrRes; import androidx.annotation.NonNull; @@ -24,16 +26,20 @@ import androidx.annotation.Nullable; public class ItemProView extends FrameLayout { - private View mViewbottomline; - private TextView mTvtitle; - private ImageView mIvicon; - private View mViewtopline; - private String mTitle; - private int mIcon; - private boolean show_bottom_line; - private boolean show_top_line; - private int mIv_icon_01; - private ImageView iv_icon_01; + private int mIv_icon_01,mIv_icon_01_h; + private int mIv_icon_02,mIv_icon_02_h; + private int mIv_icon_03,mIv_icon_03_h; + private int mTv_item_pro_01,mTv_item_pro_01_h; + private int mTv_item_pro_02,mTv_item_pro_02_h; + private int mTv_item_pro_03,mTv_item_pro_03_h; + private int mView_line_01,mView_line_01_h; + private int mView_line_02,mView_line_02_h; + private int mView_line_03,mView_line_03_h; + private int mView_line_04,mView_line_04_h; + private ImageView iv_icon_01,iv_icon_02,iv_icon_03; + private TextView tv_item_pro_01,tv_item_pro_02,tv_item_pro_03; + private View view_line_01,view_line_02,view_line_03,view_line_04; + public ItemProView(@NonNull Context context) { super(context, null); @@ -51,20 +57,16 @@ public class ItemProView extends FrameLayout { private void initView(Context context, AttributeSet attrs) { LayoutInflater.from(context).inflate(R.layout.widget_pro_item, this, true); -// mViewbottomline = findViewById(R.id.view_bottom_line); -// mTvtitle = (TextView) findViewById(R.id.tv_title); -// mIvicon = (ImageView) findViewById(R.id.iv_icon); -// mViewtopline = findViewById(R.id.view_top_line); iv_icon_01 = (ImageView)findViewById(R.id.iv_icon_01); - ImageView iv_icon_02 = (ImageView)findViewById(R.id.iv_icon_02); - ImageView iv_icon_03 = (ImageView)findViewById(R.id.iv_icon_03); - TextView tv_item_pro_01 = (TextView)findViewById(R.id.tv_item_pro_01); - TextView tv_item_pro_02 = (TextView)findViewById(R.id.tv_item_pro_02); - TextView tv_item_pro_03 = (TextView)findViewById(R.id.tv_item_pro_03); - View view_bottom_line_01 = (View)findViewById(R.id.view_bottom_line_01); - View view_top_line_02 = (View)findViewById(R.id.view_top_line_02); - View view_bottom_line_03 = (View)findViewById(R.id.view_bottom_line_03); - View view_top_line_04 = (View)findViewById(R.id.view_top_line_04); + iv_icon_02 = (ImageView)findViewById(R.id.iv_icon_02); + iv_icon_03 = (ImageView)findViewById(R.id.iv_icon_03); + tv_item_pro_01 = (TextView)findViewById(R.id.tv_item_pro_01); + tv_item_pro_02 = (TextView)findViewById(R.id.tv_item_pro_02); + tv_item_pro_03 = (TextView)findViewById(R.id.tv_item_pro_03); + view_line_01 = (View)findViewById(R.id.view_line_01); + view_line_02 = (View)findViewById(R.id.view_line_02); + view_line_03 = (View)findViewById(R.id.view_line_03); + view_line_04 = (View)findViewById(R.id.view_line_04); initAttrs(attrs); setUpView(); @@ -78,19 +80,28 @@ public class ItemProView extends FrameLayout { private void initAttrs(AttributeSet attrs) { TypedArray typedArray = getContext().obtainStyledAttributes(attrs, R.styleable.ItemProView); -// mTitle = typedArray.getString(R.styleable.ItemProView_title); -// mIcon = typedArray.getResourceId(R.styleable.ItemProView_icon, R.color.bg_gray); -// show_bottom_line = typedArray.getBoolean(R.styleable.ItemProView_show_bottom_line, false); -// show_top_line = typedArray.getBoolean(R.styleable.ItemProView_show_top_line, false); - - - mIv_icon_01 = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_01, R.color.bg_gray); - - - - + mIv_icon_01 = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_01, R.drawable.shape_pro_yuan); + mIv_icon_01_h = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_01, R.drawable.shape_pro_yuan_hui); + mIv_icon_02 = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_02, R.drawable.shape_pro_yuan); + mIv_icon_02_h = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_02, R.drawable.shape_pro_yuan_hui); + mIv_icon_03 = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_03, R.drawable.shape_pro_yuan); + mIv_icon_03_h = typedArray.getResourceId(R.styleable.ItemProView_iv_icon_03, R.drawable.shape_pro_yuan_hui); + mTv_item_pro_01 = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_01, R.drawable.shape_pro_tv); + mTv_item_pro_01_h = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_01, R.drawable.shape_pro_tv_hui); + mTv_item_pro_02 = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_02, R.drawable.shape_pro_tv); + mTv_item_pro_02_h = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_02, R.drawable.shape_pro_tv_hui); + mTv_item_pro_03 = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_03, R.drawable.shape_pro_tv); + mTv_item_pro_03_h = typedArray.getResourceId(R.styleable.ItemProView_tv_item_pro_03, R.drawable.shape_pro_tv_hui); + mView_line_01 = typedArray.getResourceId(R.styleable.ItemProView_view_line_01, R.color.colortheme); + mView_line_01_h = typedArray.getResourceId(R.styleable.ItemProView_view_line_01, R.color.ffb1b1b1); + mView_line_02 = typedArray.getResourceId(R.styleable.ItemProView_view_line_02, R.color.colortheme); + mView_line_02_h = typedArray.getResourceId(R.styleable.ItemProView_view_line_02, R.color.ffb1b1b1); + mView_line_03 = typedArray.getResourceId(R.styleable.ItemProView_view_line_03, R.color.colortheme); + mView_line_03_h = typedArray.getResourceId(R.styleable.ItemProView_view_line_03, R.color.ffb1b1b1); + mView_line_04 = typedArray.getResourceId(R.styleable.ItemProView_view_line_04, R.color.colortheme); + mView_line_04_h = typedArray.getResourceId(R.styleable.ItemProView_view_line_04, R.color.ffb1b1b1); typedArray.recycle(); } @@ -98,14 +109,129 @@ public class ItemProView extends FrameLayout { * 设置视图状态 */ private void setUpView() { -// mViewtopline.setVisibility(show_top_line ? VISIBLE : GONE); -// mViewbottomline.setVisibility(show_bottom_line ? VISIBLE : GONE); -// mIvicon.setImageResource(mIcon); -// mTvtitle.setText(mTitle); - iv_icon_01.setImageResource(mIv_icon_01); + iv_icon_01.setImageResource(mIv_icon_01_h) ; + iv_icon_02.setImageResource(mIv_icon_01_h) ; + iv_icon_03.setImageResource(mIv_icon_01_h) ; + tv_item_pro_01.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_01.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + tv_item_pro_02.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_02.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + tv_item_pro_03.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_03.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_01.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_02.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_03.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_04.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + } + public void refresh(String stutas){ + + // iv_icon_01.setImageResource(mIv_icon_01); + + switch (stutas) { + case "1"://000三个字段的状态 + iv_icon_01.setImageResource(mIv_icon_01_h) ; + iv_icon_02.setImageResource(mIv_icon_01_h) ; + iv_icon_03.setImageResource(mIv_icon_01_h) ; + tv_item_pro_01.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_01.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + tv_item_pro_02.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_02.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + tv_item_pro_03.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_03.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_01.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_02.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_03.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_04.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + break; + case "2"://010 + iv_icon_01.setImageResource(mIv_icon_01_h) ; + iv_icon_02.setImageResource(mIv_icon_01) ; + iv_icon_03.setImageResource(mIv_icon_01_h) ; + tv_item_pro_01.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_01.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + // tv_item_pro_02.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_02.setBackgroundResource(R.mipmap.icon_pro_ima_cj); + tv_item_pro_02.setText(""); + tv_item_pro_02.setTextColor(getResources().getColor(R.color.colortheme)); + tv_item_pro_03.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_03.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_01.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_02.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_03.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_04.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + break; + case "3"://011 + iv_icon_01.setImageResource(mIv_icon_01_h) ; + iv_icon_02.setImageResource(mIv_icon_01) ; + iv_icon_03.setImageResource(mIv_icon_01) ; + tv_item_pro_01.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_01.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + tv_item_pro_02.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_02.setTextColor(getResources().getColor(R.color.colortheme)); + // tv_item_pro_03.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_03.setBackgroundResource(R.mipmap.icon_pro_ima_cj); + tv_item_pro_03.setText(""); + tv_item_pro_03.setTextColor(getResources().getColor(R.color.colortheme)); + view_line_01.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_02.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_03.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_04.setBackgroundColor(getResources().getColor(R.color.colortheme)); + break; + case "4"://101 + iv_icon_01.setImageResource(mIv_icon_01) ; + iv_icon_02.setImageResource(mIv_icon_01_h) ; + iv_icon_03.setImageResource(mIv_icon_01) ; + tv_item_pro_01.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_01.setTextColor(getResources().getColor(R.color.colortheme)); + tv_item_pro_02.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_02.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + // tv_item_pro_03.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_03.setBackgroundResource(R.mipmap.icon_pro_ima_cj); + tv_item_pro_03.setText(""); + tv_item_pro_03.setTextColor(getResources().getColor(R.color.colortheme)); + view_line_01.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_02.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_03.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_04.setBackgroundColor(getResources().getColor(R.color.colortheme)); + break; + case "5"://110 + iv_icon_01.setImageResource(mIv_icon_01) ; + iv_icon_02.setImageResource(mIv_icon_01) ; + iv_icon_03.setImageResource(mIv_icon_01_h) ; + tv_item_pro_01.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_01.setTextColor(getResources().getColor(R.color.colortheme)); + // tv_item_pro_02.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_02.setBackgroundResource(R.mipmap.icon_pro_ima_cj); + tv_item_pro_02.setText(""); + tv_item_pro_02.setTextColor(getResources().getColor(R.color.colortheme)); + tv_item_pro_03.setBackgroundResource(mTv_item_pro_01_h); + tv_item_pro_03.setTextColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_01.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_02.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_03.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + view_line_04.setBackgroundColor(getResources().getColor(R.color.ffb1b1b1)); + break; + case "6"://111 + iv_icon_01.setImageResource(mIv_icon_01) ; + iv_icon_02.setImageResource(mIv_icon_01) ; + iv_icon_03.setImageResource(mIv_icon_01) ; + tv_item_pro_01.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_01.setTextColor(getResources().getColor(R.color.colortheme)); + tv_item_pro_02.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_02.setTextColor(getResources().getColor(R.color.colortheme)); + // tv_item_pro_03.setBackgroundResource(mTv_item_pro_01); + tv_item_pro_03.setBackgroundResource(R.mipmap.icon_pro_ima_cj); + tv_item_pro_03.setText(""); + tv_item_pro_03.setTextColor(getResources().getColor(R.color.colortheme)); + view_line_01.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_02.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_03.setBackgroundColor(getResources().getColor(R.color.colortheme)); + view_line_04.setBackgroundColor(getResources().getColor(R.color.colortheme)); + break; + } } diff --git a/app/src/main/res/drawable/shape_pro_tv_hui.xml b/app/src/main/res/drawable/shape_pro_tv_hui.xml new file mode 100644 index 0000000..e2e79c4 --- /dev/null +++ b/app/src/main/res/drawable/shape_pro_tv_hui.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/app/src/main/res/layout/dingdan_rv_two.xml b/app/src/main/res/layout/dingdan_rv_two.xml index fd00dcd..daaaf13 100644 --- a/app/src/main/res/layout/dingdan_rv_two.xml +++ b/app/src/main/res/layout/dingdan_rv_two.xml @@ -11,6 +11,9 @@ android:id="@+id/item_my_twitter" android:layout_width="300dp" android:layout_height="wrap_content" - app:iv_icon_01="@drawable/shape_pro_yuan"/> - + app:iv_icon_01="@drawable/shape_pro_yuan" + app:iv_icon_02="@drawable/shape_pro_yuan" + app:iv_icon_03="@drawable/shape_pro_yuan" + /> + diff --git a/app/src/main/res/layout/widget_pro_item.xml b/app/src/main/res/layout/widget_pro_item.xml index a7f08d8..2a58fad 100644 --- a/app/src/main/res/layout/widget_pro_item.xml +++ b/app/src/main/res/layout/widget_pro_item.xml @@ -20,9 +20,9 @@ android:layout_height="20dp" android:gravity="center" android:layout_centerHorizontal="true" - android:background="@drawable/shape_pro_tv" + android:text="已被抢" - android:textColor="#ff2680eb" + android:textSize="12sp" /> + /> @@ -67,9 +67,7 @@ android:layout_height="20dp" android:gravity="center" android:layout_centerHorizontal="true" - android:background="@drawable/shape_pro_tv" android:text="已进店" - android:textColor="#ff2680eb" android:textSize="12sp" /> + /> + + + /> + - @@ -117,9 +117,9 @@ android:layout_height="20dp" android:gravity="center" android:layout_centerHorizontal="true" - android:background="@drawable/shape_pro_tv" + android:text="已成交" - android:textColor="#ff2680eb" + android:textSize="12sp" /> + /> + /> diff --git a/app/src/main/res/mipmap-hdpi/icon_pro_ima_cj.png b/app/src/main/res/mipmap-hdpi/icon_pro_ima_cj.png new file mode 100644 index 0000000..53ed180 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/icon_pro_ima_cj.png differ diff --git a/app/src/main/res/mipmap-mdpi/icon_pro_ima_cj.png b/app/src/main/res/mipmap-mdpi/icon_pro_ima_cj.png new file mode 100644 index 0000000..54ee541 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/icon_pro_ima_cj.png differ diff --git a/app/src/main/res/mipmap-xhdpi/icon_pro_ima_cj.png b/app/src/main/res/mipmap-xhdpi/icon_pro_ima_cj.png new file mode 100644 index 0000000..16a612d Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/icon_pro_ima_cj.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_pro_ima_cj.png b/app/src/main/res/mipmap-xxhdpi/icon_pro_ima_cj.png new file mode 100644 index 0000000..b527565 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_pro_ima_cj.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/icon_pro_ima_cj.png b/app/src/main/res/mipmap-xxxhdpi/icon_pro_ima_cj.png new file mode 100644 index 0000000..5666d97 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/icon_pro_ima_cj.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e012c12..1ca26bd 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -5,6 +5,7 @@ @color/colorWhite @color/colorGreen #3288EE + #ffb1b1b1 #999999 #ffffff #CCCCCC diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 596d5ea..e4389ff 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -117,5 +117,15 @@ + + + + + + + + + +