詹子聪 před 5 roky
rodič
revize
2bcf329a9b

+ 5 - 0
app/src/main/java/com/itant/shibei/constant/ConstantString.java

@@ -17,4 +17,9 @@ public interface ConstantString {
      * 支付宝收款9.9元
      */
     String UPGRAPE_ZFB = "https://qr.alipay.com/fkx18482hw01dsf3rauxk9b";
+
+    /**
+     * 静态资源主机
+     */
+    String HOST_STATIC_RESOURCE = "http://jianjie.life/";
 }

+ 2 - 2
app/src/main/java/com/itant/shibei/ui/home/coupon/TemplateAdapter.java

@@ -15,9 +15,9 @@ 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 com.itant.shibei.base.ItemLongClickListener;
+import com.itant.shibei.constant.ConstantString;
 import com.itant.shibei.manager.UserInfoManager;
 import com.itant.shibei.ui.TabActivity;
 import com.itant.shibei.ui.home.goods.detail.MeizhiDetailActivity;
@@ -55,7 +55,7 @@ public class TemplateAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
         // 解决图片错乱
         iv_template.setTag(R.id.aciv_goods, url);
 
-        String realUrl = url.startsWith("http") ? url : BuildConfig.BASE_URL+url;
+        String realUrl = url.startsWith("http") ? url : ConstantString.HOST_STATIC_RESOURCE +url;
 
         // 设置默认图片
         setDefaultView(iv_template);

+ 3 - 2
app/src/main/java/com/itant/shibei/ui/home/goods/GoodsAdapter.java

@@ -16,9 +16,9 @@ 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 com.itant.shibei.base.ItemLongClickListener;
+import com.itant.shibei.constant.ConstantString;
 import com.itant.shibei.manager.UserInfoManager;
 import com.itant.shibei.tool.StringTool;
 import com.itant.shibei.ui.TabActivity;
@@ -96,7 +96,7 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
         // 解决图片错乱
         RoundedImageView aciv_goods = holder.getView(R.id.aciv_goods);
         if (!goodsBean.coverImageUrl.startsWith("http")) {
-            goodsBean.coverImageUrl = BuildConfig.BASE_URL + goodsBean.coverImageUrl;
+            goodsBean.coverImageUrl = ConstantString.HOST_STATIC_RESOURCE + goodsBean.coverImageUrl;
         }
         aciv_goods.setTag(R.id.aciv_goods, goodsBean.coverImageUrl);
         Glide.with(mContext).load(goodsBean.coverImageUrl)
@@ -110,6 +110,7 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
                     @Override
                     public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
                         if (resource == null) {
+                            aciv_goods.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
                             aciv_goods.setImageResource(R.mipmap.logo_gray);
                             return;
                         }

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

@@ -14,8 +14,8 @@ 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 com.itant.shibei.constant.ConstantString;
 
 import java.util.List;
 
@@ -36,7 +36,7 @@ public class DetailImgAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
     @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;
+        String realUrl = url.startsWith("http") ? url : ConstantString.HOST_STATIC_RESOURCE+url;
         // 防止图片错乱
         iv_detail_img.setTag(R.id.aciv_goods, url);
         Glide.with(mContext).load(realUrl)

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

@@ -8,8 +8,8 @@ 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.constant.ConstantString;
 import com.itant.shibei.tool.SystemTool;
 import com.itant.shibei.ui.home.goods.MagnetBean;
 import com.miekir.common.utils.ToastTool;
@@ -35,7 +35,7 @@ public class MagnetAdapter extends BaseQuickAdapter<MagnetBean, BaseViewHolder>
         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;
+        String realUrl = magnetBean.url.startsWith("http") ? magnetBean.url : ConstantString.HOST_STATIC_RESOURCE+magnetBean.url;
         tv_detail_magnet.setOnClickListener(v -> {
             SystemTool.copyText(mContext, realUrl);
             ToastTool.showShort("已复制资源链接");

+ 2 - 2
app/src/main/res/layout/item_goods.xml

@@ -27,7 +27,7 @@
                 android:id="@+id/tv_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/margin_ss"
+                android:layout_marginBottom="@dimen/margin_s"
                 android:ellipsize="end"
                 android:maxLines="3"
                 android:textColor="@color/black"
@@ -59,7 +59,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_ss"
+                android:layout_marginTop="@dimen/margin_s"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
                 android:paddingStart="@dimen/margin_ss"