From 41b23417cd62af3cd77b695a2b03446243431fc1 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 14 七月 2020 14:11:54 +0800 Subject: [PATCH] '完善' --- MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/SearchResultHyperMarketFragment.java | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/SearchResultHyperMarketFragment.java b/MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/SearchResultHyperMarketFragment.java index 642f558..29f41bc 100644 --- a/MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/SearchResultHyperMarketFragment.java +++ b/MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/recommend/SearchResultHyperMarketFragment.java @@ -267,7 +267,7 @@ fl_search_bar_common.setVisibility(View.GONE); fl_search_bar_vip.setVisibility(View.VISIBLE); order = 0; - tv_default.setTextColor(order == 0 ? getResources().getColor(R.color.main_text_color) : getResources().getColor(R.color.black)); + tv_default.setTextColor(order == 0 ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black)); } else { fl_search_bar_common.setVisibility(View.VISIBLE); fl_search_bar_vip.setVisibility(View.GONE); @@ -569,7 +569,7 @@ if (wList.size() >= count) { bottom.setVisibility(View.VISIBLE); iv_loading.setVisibility(View.GONE); - tv_loading.setText("-鍒板簳浜�*^_^*-"); + tv_loading.setText(getResources().getString(R.string.list_no_more)); } if (wList.size() == 0) { iv_footermark.setVisibility(View.GONE); @@ -632,7 +632,7 @@ iv_has_coupon.setImageResource(R.drawable.shape_has_coupon_unselected); } else { filter.setCoupon(true); - tv_has_coupon.setTextColor(getResources().getColor(R.color.main_text_color)); + tv_has_coupon.setTextColor(getResources().getColor(R.color.theme)); iv_has_coupon.setImageResource(R.drawable.shape_has_coupon_selected); } hidePwFilter(); @@ -717,7 +717,7 @@ pw_filter.showAsDropDown(ll_has_coupon); iv_filter.setImageResource(R.drawable.ic_multiple_open); } - tv_filter.setTextColor(getResources().getColor(R.color.main_text_color)); + tv_filter.setTextColor(getResources().getColor(R.color.theme)); SearchCustomEvent.searchResultZhonghe(getActivity()); break; case R.id.fl_rebate_scale://杩斿埄姣� @@ -775,16 +775,16 @@ page = 1; hidePwFilter(); iv_price.setImageResource(order == 2 ? R.mipmap.ic_grade_down : order == 3 ? R.mipmap.ic_sort_ascending : R.mipmap.ic_sort_no_selected); - tv_rebate_scale.setTextColor(order == 4 ? getResources().getColor(R.color.main_text_color) : getResources().getColor(R.color.black)); - tv_price.setTextColor((order == 2 || order == 3) ? getResources().getColor(R.color.main_text_color) : getResources().getColor(R.color.black)); - tv_price_vip.setTextColor((order == 2 || order == 3) ? getResources().getColor(R.color.main_text_color) : getResources().getColor(R.color.black)); + tv_rebate_scale.setTextColor(order == 4 ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black)); + tv_price.setTextColor((order == 2 || order == 3) ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black)); + tv_price_vip.setTextColor((order == 2 || order == 3) ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black)); if (goodsType != Constant.GOODS_TYPE_SUNING) { - tv_sale_num.setTextColor(order == 1 ? getResources().getColor(R.color.main_text_color) : getResources().getColor(R.color.black)); + tv_sale_num.setTextColor(order == 1 ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black)); } else - tv_sale_num.setTextColor(order == 0 ? getResources().getColor(R.color.main_text_color) : getResources().getColor(R.color.black)); + tv_sale_num.setTextColor(order == 0 ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black)); - tv_default.setTextColor(order == 0 ? getResources().getColor(R.color.main_text_color) : getResources().getColor(R.color.black)); - tv_discount.setTextColor(order == 5 ? getResources().getColor(R.color.main_text_color) : getResources().getColor(R.color.black)); + tv_default.setTextColor(order == 0 ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black)); + tv_discount.setTextColor(order == 5 ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black)); iv_price_vip.setImageResource(order == 2 ? R.mipmap.ic_grade_down : order == 3 ? R.mipmap.ic_sort_ascending : R.mipmap.ic_sort_no_selected); rl_search.setRefreshing(true); setData(page); @@ -795,19 +795,19 @@ */ private void fillterColor() { if (goodsType == Constant.GOODS_TYPE_TB) { - tv_filter.setTextColor(filter.isTmall() ? getResources().getColor(R.color.main_text_color) + tv_filter.setTextColor(filter.isTmall() ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black)); iv_filter.setImageResource(filter.isTmall() ? R.drawable.ic_multiple_close : R.drawable.ic_multiple_unselected); } else if (goodsType == Constant.GOODS_TYPE_JD) { - tv_filter.setTextColor(filter.isZy() ? getResources().getColor(R.color.main_text_color) + tv_filter.setTextColor(filter.isZy() ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black)); iv_filter.setImageResource(filter.isZy() ? R.drawable.ic_multiple_close : R.drawable.ic_multiple_unselected); } else if (goodsType == Constant.GOODS_TYPE_PDD) { - tv_filter.setTextColor(filter.isBrand() ? getResources().getColor(R.color.main_text_color) + tv_filter.setTextColor(filter.isBrand() ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black)); iv_filter.setImageResource(filter.isBrand() ? R.drawable.ic_multiple_close : R.drawable.ic_multiple_unselected); } else if (goodsType == Constant.GOODS_TYPE_SUNING) { - tv_filter.setTextColor(mulAdapter.getSelectCount() > 0 ? getResources().getColor(R.color.main_text_color) + tv_filter.setTextColor(mulAdapter.getSelectCount() > 0 ? getResources().getColor(R.color.theme) : getResources().getColor(R.color.black)); iv_filter.setImageResource(mulAdapter.getSelectCount() > 0 ? R.drawable.ic_multiple_close : R.drawable.ic_multiple_unselected); } -- Gitblit v1.8.0