詹子聪 5 anni fa
parent
commit
518594e1c2

+ 2 - 6
app/src/main/java/com/itant/shibei/tool/StringTool.java

@@ -64,15 +64,11 @@ public class StringTool {
 
     public static String getNumberString(long number) {
         if (number > 100000) {
-            return "10w+";
+            return "10+";
         }
 
         if (number > 10000) {
-            return "1w+";
-        }
-
-        if (number > 1000) {
-            return "1k+";
+            return number/10000+"万";
         }
 
         return String.valueOf(number);

+ 5 - 6
app/src/main/java/com/itant/shibei/ui/home/goods/GoodsAdapter.java

@@ -51,12 +51,10 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
     protected void convert(@NonNull BaseViewHolder holder, GoodsBean goodsBean) {
         holder.setText(R.id.tv_title, goodsBean.title);
         holder.setText(R.id.tv_good_comment, StringTool.getPercent(goodsBean.dingNum, goodsBean.dingNum+goodsBean.caiNum));
-        holder.setText(R.id.tv_ding, StringTool.getNumberString(goodsBean.dingNum));
-        holder.setText(R.id.tv_cai, StringTool.getNumberString(goodsBean.caiNum));
-        holder.setText(R.id.tv_see_num, goodsBean.seeNum==null ? "0" : StringTool.getNumberString(goodsBean.seeNum));
+        holder.setText(R.id.tv_fav_num, String.format(GoodsDetailActivity.FORMATTER_FAV_NUM, StringTool.getNumberString(goodsBean.favNum)));
+        holder.setText(R.id.tv_see_num, String.format(GoodsDetailActivity.FORMATTER_SEE_NUM, StringTool.getNumberString(goodsBean.seeNum)));
 
         holder.setOnClickListener(R.id.cv_goods, v -> {
-            // todo
             if (UserInfoManager.getInstance().getBeiUser().isVip) {
                 ToastTool.showShort("请先激活会员");
                 if (mContext instanceof TabActivity) {
@@ -144,7 +142,8 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
             iv_video_play.setVisibility(View.GONE);
         }
 
-        if (UserInfoManager.getInstance().isLogin() &&
+        // 暂时不需要长按弹出操作
+        /*if (UserInfoManager.getInstance().isLogin() &&
                 TextUtils.equals("[email protected]", UserInfoManager.getInstance().getBeiUser().email)) {
             View view = holder.getView(R.id.cv_goods);
             view.setOnLongClickListener(v -> {
@@ -153,7 +152,7 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
                 }
                 return false;
             });
-        }
+        }*/
     }
 
     private ItemLongClickListener goodsLongClickListener;

+ 5 - 1
app/src/main/java/com/itant/shibei/ui/home/goods/GoodsBean.java

@@ -100,7 +100,11 @@ public class GoodsBean implements Serializable {
     /**
      * 浏览次数
      */
-    public Long seeNum;
+    public long seeNum;
+    /**
+     * 收藏次数
+     */
+    public long favNum;
 
     public boolean enable;
 }

+ 76 - 0
app/src/main/java/com/itant/shibei/ui/home/goods/detail/DetailImgAdapter.java

@@ -0,0 +1,76 @@
+package com.itant.shibei.ui.home.goods.detail;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.target.SimpleTarget;
+import com.bumptech.glide.request.transition.Transition;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.itant.shibei.BuildConfig;
+import com.itant.shibei.R;
+
+import java.util.List;
+
+/**
+ * Copyright (C), 2019-2020, Miekir
+ *
+ * @author Miekir
+ * @date 2020/9/2 10:15
+ * Description: 详情图片适配器
+ */
+public class DetailImgAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
+    private Context mContext;
+    public DetailImgAdapter(Context context, @Nullable List<String> data) {
+        super(R.layout.item_goods_detail_img, data);
+        mContext = context;
+    }
+
+    @Override
+    protected void convert(@NonNull BaseViewHolder helper, String url) {
+        ImageView iv_detail_img = helper.getView(R.id.iv_detail_img);
+        String realUrl = url.startsWith("http") ? url : BuildConfig.BASE_URL+url;
+        // 防止图片错乱
+        iv_detail_img.setTag(R.id.aciv_goods, url);
+        Glide.with(mContext).load(realUrl)
+                //.apply(RequestOptions.bitmapTransform(new RoundedCorners(mRadius)))
+                //.apply(new RequestOptions()
+                //        .skipMemoryCache(true)
+                //        .diskCacheStrategy(DiskCacheStrategy.NONE))
+                //先加载原图大小的十分之一
+                .thumbnail(0.1f)
+                .into(new SimpleTarget<Drawable>() {
+                    @Override
+                    public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
+                        if (resource == null) {
+                            iv_detail_img.setImageResource(R.mipmap.logo_gray);
+                            return;
+                        }
+
+                        String coverUrl = null;
+                        try {
+                            coverUrl = (String) iv_detail_img.getTag(R.id.aciv_goods);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        if (TextUtils.isEmpty(coverUrl) || !TextUtils.equals(coverUrl, url)) {
+                            iv_detail_img.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+                            iv_detail_img.setImageResource(R.mipmap.logo_gray);
+                        } else {
+                            iv_detail_img.setScaleType(ImageView.ScaleType.CENTER_CROP);
+                            iv_detail_img.setImageDrawable(resource);
+                        }
+                    }
+                });
+
+        iv_detail_img.setOnClickListener(v -> {
+            // todo 跳转查看大图界面
+        });
+    }
+}

+ 56 - 49
app/src/main/java/com/itant/shibei/ui/home/goods/detail/GoodsDetailActivity.java

@@ -1,14 +1,20 @@
 package com.itant.shibei.ui.home.goods.detail;
 
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.itant.shibei.R;
 import com.itant.shibei.base.BaseBeiActivity;
-import com.itant.shibei.tool.StringTool;
 import com.itant.shibei.ui.home.goods.GoodsBean;
+import com.itant.shibei.ui.home.goods.MagnetBean;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Copyright (C), 2019-2020, Miekir
@@ -18,16 +24,26 @@ import com.itant.shibei.ui.home.goods.GoodsBean;
  * Description: 详情界面
  */
 public class GoodsDetailActivity extends BaseBeiActivity implements View.OnClickListener {
+    public static final String FORMATTER_SEE_NUM = "浏览%s次";
+    public static final String FORMATTER_FAV_NUM = "收藏%s次";
+
     public static final String KEY_GOODS = "goods";
     private TextView tv_title;
-    private TextView tv_good_comment;
-    private TextView tv_ding;
-    private TextView tv_cai;
+    private TextView tv_desc;
     private TextView tv_see_num;
-    private ImageView iv_fav;
+    private TextView tv_fav_num;
+
+    private RecyclerView rv_detail;
+    private List<String> mPhotoUrlList = new ArrayList<>();
+    private DetailImgAdapter mPhotoAdapter;
+
+    private RecyclerView rv_magnet;
+    private List<MagnetBean> mMagnetList = new ArrayList<>();
+    private MagnetAdapter mMagnetAdapter;
 
     private GoodsBean mGoodsBean;
 
+
     @Override
     public int getLayoutID() {
         return R.layout.activity_goods_detail;
@@ -42,58 +58,49 @@ public class GoodsDetailActivity extends BaseBeiActivity implements View.OnClick
         }
 
         tv_title = findViewById(R.id.tv_title);
-        tv_good_comment = findViewById(R.id.tv_good_comment);
-        tv_ding = findViewById(R.id.tv_ding);
-        tv_cai = findViewById(R.id.tv_cai);
+        tv_desc = findViewById(R.id.tv_desc);
         tv_see_num = findViewById(R.id.tv_see_num);
+        tv_fav_num = findViewById(R.id.tv_fav_num);
 
-        tv_title.setText(mGoodsBean.title);
-        tv_good_comment.setText(StringTool.getPercent(mGoodsBean.dingNum, mGoodsBean.dingNum + mGoodsBean.caiNum));
-        tv_ding.setText(StringTool.getNumberString(mGoodsBean.dingNum));
-        tv_cai.setText(StringTool.getNumberString(mGoodsBean.caiNum));
-        tv_see_num.setText(mGoodsBean.seeNum == null ? "0" : StringTool.getNumberString(mGoodsBean.seeNum));
-
-        // 图片
-        /*RoundedImageView aciv_goods = findViewById(R.id.aciv_goods);
-        if (!mGoodsBean.coverImageUrl.startsWith("http")) {
-            mGoodsBean.coverImageUrl = BuildConfig.BASE_URL + mGoodsBean.coverImageUrl;
-        }
-        Glide.with(this).load(mGoodsBean.coverImageUrl)
-                .thumbnail(0.1f)
-                .into(new SimpleTarget<Drawable>() {
-                    @Override
-                    public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
-                        if (resource == null) {
-                            aciv_goods.setImageResource(R.mipmap.logo_gray);
-                            return;
-                        }
-
-                        aciv_goods.setScaleType(ImageView.ScaleType.CENTER_CROP);
-                        aciv_goods.setImageDrawable(resource);
-                    }
-                });*/
+        rv_detail = findViewById(R.id.rv_detail);
+        rv_detail.setLayoutManager(new LinearLayoutManager(this));
+        mPhotoAdapter = new DetailImgAdapter(this, mPhotoUrlList);
+        mPhotoUrlList.addAll(mGoodsBean.contentImageUrlList);
+        rv_detail.setAdapter(mPhotoAdapter);
 
-        iv_fav = findViewById(R.id.iv_fav);
-        iv_fav.setOnClickListener(this);
-        findViewById(R.id.iv_ding).setOnClickListener(this);
-        findViewById(R.id.iv_cai).setOnClickListener(this);
+        rv_magnet = findViewById(R.id.rv_magnet);
+        rv_magnet.setLayoutManager(new LinearLayoutManager(this));
+        mMagnetAdapter = new MagnetAdapter(this, mMagnetList);
+        mMagnetList.addAll(mGoodsBean.magnetBeanList);
+        rv_magnet.setAdapter(mMagnetAdapter);
 
-        // todo 多图与磁力、描述
+        tv_title.setText(mGoodsBean.title);
+        // 详情
+        String desc = mGoodsBean.description;
+        if (!TextUtils.isEmpty(desc) && desc.contains("【")) {
+            StringBuilder builder = new StringBuilder();
+            String[] descArray = desc.split("【");
+            if (descArray.length > 0) {
+                for (String item : descArray) {
+                    if (TextUtils.isEmpty(item)) {
+                        continue;
+                    }
+                    builder.append(item).append("\n");
+                }
+                if (builder.length() > 0) {
+                    builder.deleteCharAt(builder.length()-1);
+                }
+                desc = builder.toString().replaceAll("】", "");
+            }
+        }
+        tv_desc.setText(desc);
+        tv_see_num.setText(String.format(FORMATTER_SEE_NUM, mGoodsBean.seeNum));
+        tv_fav_num.setText(String.format(FORMATTER_FAV_NUM, mGoodsBean.favNum));
     }
 
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
-            case R.id.iv_ding:
-                // todo 顶
-                break;
-            case R.id.iv_cai:
-                // todo 踩
-                break;
-            case R.id.iv_fav:
-                // todo 收藏
-                iv_fav.setImageResource(R.mipmap.fav_yes);
-                break;
             default:
                 break;
         }

+ 44 - 0
app/src/main/java/com/itant/shibei/ui/home/goods/detail/MagnetAdapter.java

@@ -0,0 +1,44 @@
+package com.itant.shibei.ui.home.goods.detail;
+
+import android.content.Context;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.itant.shibei.BuildConfig;
+import com.itant.shibei.R;
+import com.itant.shibei.tool.SystemTool;
+import com.itant.shibei.ui.home.goods.MagnetBean;
+import com.miekir.common.utils.ToastTool;
+
+import java.util.List;
+
+/**
+ * Copyright (C), 2019-2020, Miekir
+ *
+ * @author Miekir
+ * @date 2020/9/2 10:15
+ * Description: 详情图片适配器
+ */
+public class MagnetAdapter extends BaseQuickAdapter<MagnetBean, BaseViewHolder> {
+    private Context mContext;
+    public MagnetAdapter(Context context, @Nullable List<MagnetBean> data) {
+        super(R.layout.item_goods_detail_magnet, data);
+        mContext = context;
+    }
+
+    @Override
+    protected void convert(@NonNull BaseViewHolder helper, MagnetBean magnetBean) {
+        TextView tv_detail_magnet = helper.getView(R.id.tv_detail_magnet);
+        tv_detail_magnet.setText(magnetBean.text);
+
+        String realUrl = magnetBean.url.startsWith("http") ? magnetBean.url : BuildConfig.BASE_URL+magnetBean.url;
+        tv_detail_magnet.setOnClickListener(v -> {
+            SystemTool.copyText(mContext, realUrl);
+            ToastTool.showShort("已复制资源链接");
+        });
+    }
+}

+ 28 - 99
app/src/main/res/layout/activity_goods_detail.xml

@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:background="@color/white">
 
     <include layout="@layout/view_toolbar" />
 
@@ -26,135 +27,63 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_default"
-                android:layout_marginBottom="@dimen/margin_default"
-                android:ellipsize="end"
-                android:maxLines="3"
                 android:textColor="@color/black"
                 android:textSize="@dimen/text_sub_title" />
 
-            <!--todo 详情 字号小一点-->
+            <!--资源信息-->
+            <TextView
+                android:id="@+id/tv_desc"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="@color/black_text_comfortable"
+                android:paddingTop="@dimen/margin_s"
+                android:paddingBottom="@dimen/margin_s"
+                android:textIsSelectable="true"/>
 
-            <include layout="@layout/view_divider_slight" />
-            <!--好评-->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_s"
-                android:layout_marginBottom="@dimen/margin_s"
+                android:orientation="horizontal"
                 android:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/iv_ding"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:rotation="180"
-                    android:src="@mipmap/ding"
-                    android:tint="@color/red_droid" />
-
+                android:layout_marginBottom="@dimen/margin_default">
                 <TextView
-                    android:id="@+id/tv_ding"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_sss"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:textColor="@color/gray_text_s"
-                    android:textSize="@dimen/text_shop_name" />
-
-                <ImageView
-                    android:id="@+id/iv_cai"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_marginStart="@dimen/margin_default"
-                    android:src="@mipmap/ding"
-                    android:tint="@color/green_logo" />
-
-                <TextView
-                    android:id="@+id/tv_cai"
+                    android:id="@+id/tv_see_num"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_sss"
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:textColor="@color/gray_text_s"
-                    android:textSize="@dimen/text_shop_name" />
-
-                <ImageView
-                    android:layout_width="14dp"
-                    android:layout_height="14dp"
-                    android:layout_marginStart="@dimen/margin_default"
-                    android:src="@mipmap/see"
-                    android:tint="@color/black_text_comfortable"
-                    android:visibility="gone" />
+                    android:textSize="@dimen/text_s" />
 
                 <TextView
-                    android:id="@+id/tv_see_num"
+                    android:id="@+id/tv_fav_num"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/margin_ss"
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:textColor="@color/gray_text_s"
-                    android:textSize="@dimen/text_shop_name"
-                    android:visibility="gone" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_default"
-                    android:background="@drawable/shape_purple_tag_gradient"
-                    android:paddingStart="@dimen/margin_tag"
-                    android:paddingTop="@dimen/padding_tag"
-                    android:paddingEnd="@dimen/margin_tag"
-                    android:paddingBottom="@dimen/padding_tag"
-                    android:text=" 好评 "
-                    android:textColor="@color/white_slight"
-                    android:textSize="@dimen/text_sss" />
-
-                <TextView
-                    android:id="@+id/tv_good_comment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/shape_purple_stroke_right"
-                    android:ellipsize="end"
-                    android:paddingStart="@dimen/margin_tag"
-                    android:paddingTop="@dimen/padding_tag"
-                    android:paddingEnd="@dimen/margin_tag"
-                    android:paddingBottom="@dimen/padding_tag"
-                    android:singleLine="true"
-                    android:text="100%"
-                    android:textColor="@color/black_text"
-                    android:textSize="@dimen/text_sss"
-                    android:textStyle="bold" />
-
-
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1" />
-
-                <ImageView
-                    android:id="@+id/iv_fav"
-                    android:layout_width="22dp"
-                    android:layout_height="22dp"
-                    android:layout_marginStart="@dimen/margin_default"
-                    android:src="@mipmap/fav_no" />
-
-
+                    android:textSize="@dimen/text_s" />
             </LinearLayout>
 
-            <include layout="@layout/view_divider_slight" />
+            <include layout="@layout/view_divider_slight"/>
 
-            <!--todo 图片-->
+            <!--图片-->
             <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_detail"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:nestedScrollingEnabled="false"/>
 
+            <include layout="@layout/view_divider_slight"/>
 
-
-
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_magnet"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:nestedScrollingEnabled="false"
+                android:layout_marginTop="@dimen/margin_ss"
+                android:layout_marginBottom="@dimen/margin_ss"/>
         </LinearLayout>
     </ScrollView>
 </LinearLayout>

+ 28 - 37
app/src/main/res/layout/item_goods.xml

@@ -65,41 +65,22 @@
                 android:paddingStart="@dimen/margin_ss"
                 android:paddingEnd="@dimen/margin_ss">
 
+
                 <ImageView
                     android:layout_width="22dp"
                     android:layout_height="22dp"
                     android:rotation="180"
                     android:src="@mipmap/ding"
-                    android:tint="@color/red_droid" />
-
-                <TextView
-                    android:id="@+id/tv_ding"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:textColor="@color/gray_text_s"
-                    android:textSize="@dimen/text_shop_name"
-                    android:layout_marginStart="@dimen/margin_sss"/>
+                    android:tint="@color/red_droid"
+                    android:visibility="gone"/>
 
                 <ImageView
                     android:layout_width="22dp"
                     android:layout_height="22dp"
                     android:layout_marginStart="@dimen/margin_default"
                     android:src="@mipmap/ding"
-                    android:tint="@color/green_logo" />
-
-                <TextView
-                    android:id="@+id/tv_cai"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:textColor="@color/gray_text_s"
-                    android:textSize="@dimen/text_shop_name"
-                    android:layout_marginStart="@dimen/margin_sss"/>
-
-
+                    android:tint="@color/green_logo"
+                    android:visibility="gone"/>
 
 
                 <Space
@@ -115,17 +96,6 @@
                     android:tint="@color/black_text_comfortable"
                     android:visibility="gone"/>
 
-                <TextView
-                    android:id="@+id/tv_see_num"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/margin_ss"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:textColor="@color/gray_text_s"
-                    android:textSize="@dimen/text_shop_name"
-                    android:visibility="gone"/>
-
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -136,7 +106,8 @@
                     android:paddingBottom="@dimen/padding_tag"
                     android:text=" 好评 "
                     android:textColor="@color/white_slight"
-                    android:textSize="@dimen/text_sss" />
+                    android:textSize="@dimen/text_sss"
+                    android:visibility="gone"/>
 
                 <TextView
                     android:id="@+id/tv_good_comment"
@@ -152,7 +123,27 @@
                     android:text="100%"
                     android:textColor="@color/black_text"
                     android:textSize="@dimen/text_sss"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    android:visibility="gone"/>
+
+                <TextView
+                    android:id="@+id/tv_see_num"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:textColor="@color/gray_text_s"
+                    android:textSize="@dimen/text_rebate_tips"/>
+
+                <TextView
+                    android:id="@+id/tv_fav_num"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/margin_ss"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:textColor="@color/gray_text_s"
+                    android:textSize="@dimen/text_rebate_tips" />
             </LinearLayout>
         </LinearLayout>
     </androidx.cardview.widget.CardView>

+ 12 - 0
app/src/main/res/layout/item_goods_detail_img.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/iv_detail_img"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/margin_sss"
+        android:src="@mipmap/logo_gray"/>
+</FrameLayout>

+ 13 - 0
app/src/main/res/layout/item_goods_detail_magnet.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/tv_detail_magnet"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/margin_ss"
+        android:paddingBottom="@dimen/margin_ss"
+        android:textColor="@color/blue_alipay"/>
+</FrameLayout>