'完善'

admin

2020-07-14 41b23417cd62af3cd77b695a2b03446243431fc1

 MDShopping/src/main/java/com/yeshi/ec/rebate/myapplication/ui/BrandRebate/BrandInfoActivity.java

@@ -46,6 +46,7 @@
import com.yeshi.ec.rebate.myapplication.util.GlideCircleTransform;
import com.yeshi.ec.rebate.myapplication.util.ToolUtil;
import com.yeshi.ec.rebate.myapplication.util.TopStatusSettings;
import com.yeshi.ec.rebate.myapplication.util.ui.ColorUtil;
import com.yeshi.ec.rebate.myapplication.util.umengCustomEvent.BrandRebateEvent;

import org.apache.http.Header;
@@ -319,7 +320,7 @@
                            setTopimg(BrandInfoActivity.this, mshop.optString("shopIcon"), braninfo_top_img);
                            String show[] = showImageFace(mshop.optInt("userType"));
                            setShape(4, show[0], show[0], show[1], braninfo_top_userType);
                            setShape(100, "#E5005C", "#E5005C", "进店", braninfo_top_store);
                            setShape(100,ColorUtil.getHexString(getResources().getColor(R.color.theme)),  ColorUtil.getHexString(getResources().getColor(R.color.theme)), "进店", braninfo_top_store);
                            shopLink = mshop.getString("shopLink");
                        }
                        if (shop.length() >= 2) {//店铺二
@@ -329,7 +330,7 @@
                            setTopimg(BrandInfoActivity.this, mshop.optString("shopIcon"), braninfo_top_img2);
                            String show[] = showImageFace(mshop.optInt("userType"));
                            setShape(4, show[0], show[0], show[1], braninfo_top_userType2);
                            setShape(100, "#E5005C", "#E5005C", "进店", braninfo_top_store2);
                            setShape(100, ColorUtil.getHexString(getResources().getColor(R.color.theme)), ColorUtil.getHexString(getResources().getColor(R.color.theme)), "进店", braninfo_top_store2);
                            shopLink2 = mshop.getString("shopLink");
                        }
                        if (shop.length() == 3) {//店铺三
@@ -339,7 +340,7 @@
                            setTopimg(BrandInfoActivity.this, mshop.optString("shopIcon"), braninfo_top_img3);
                            String show[] = showImageFace(mshop.optInt("userType"));
                            setShape(4, show[0], show[0], show[1], braninfo_top_userType3);
                            setShape(100, "#E5005C", "#E5005C", "进店", braninfo_top_store3);
                            setShape(100, ColorUtil.getHexString(getResources().getColor(R.color.theme)), ColorUtil.getHexString(getResources().getColor(R.color.theme)), "进店", braninfo_top_store3);
                            shopLink3 = mshop.getString("shopLink");
                        }
                    } else {
@@ -365,7 +366,7 @@
                        bottom.setVisibility(View.VISIBLE);
                        iv_loading.setVisibility(View.GONE);
                        ll_go_scan.setVisibility(View.GONE);
                        tv_loading.setText("-到底了*^_^*-");
                        tv_loading.setText(getResources().getString(R.string.list_no_more));
                    } else {
                        if (jsonObject.optJSONObject("data").optJSONArray("picList").toString().equals("[]") &&
                                jsonObject.optJSONObject("data").optJSONArray("shopList").toString().equals("[]") &&