Selaa lähdekoodia

本地美团图片

詹子聪 5 vuotta sitten
vanhempi
commit
7d3eae0d15

+ 2 - 0
app/src/main/java/com/itant/shibei/bean/CouponBean.java

@@ -52,4 +52,6 @@ public class CouponBean implements Serializable {
      * 更新时间
      */
     public long updateTimeMillis;
+
+    public boolean isCoverUrlLocal;
 }

+ 9 - 3
app/src/main/java/com/itant/shibei/tool/DataTool.java

@@ -1,5 +1,6 @@
 package com.itant.shibei.tool;
 
+import com.itant.shibei.R;
 import com.itant.shibei.bean.CouponBean;
 import com.itant.shibei.bean.GoodsBean;
 import com.itant.shibei.common.ConstantUrl;
@@ -23,20 +24,25 @@ public class DataTool {
         switch (functionTye) {
             case FunctionFragment.TEMPLATE_TYPE_BONUS:
                 CouponBean meituan1 = new CouponBean();
-                meituan1.coverUrl = ConstantUrl.URL_RANDOM_PHOTO_WALLPAPER;
+                //meituan1.coverUrl = ConstantUrl.URL_RANDOM_PHOTO_WALLPAPER;
+                meituan1.coverUrl = String.valueOf(R.mipmap.meituan1);
+                meituan1.isCoverUrlLocal = true;
                 meituan1.couponName = "美团优惠券最多可领48元大礼包";
                 meituan1.jumpUrl = ConstantUrl.URL_MEITUAN_BONUS_1;
                 meituan1.actionEnable = true;
                 meituan1.isLocal = true;
-                couponBeanList.add(meituan1);
 
                 CouponBean meituan2 = new CouponBean();
-                meituan2.coverUrl = ConstantUrl.URL_RANDOM_PHOTO_WALLPAPER;
+                //meituan2.coverUrl = ConstantUrl.URL_RANDOM_PHOTO_WALLPAPER;
+                meituan2.coverUrl = String.valueOf(R.mipmap.meituan2);
+                meituan2.isCoverUrlLocal = true;
                 meituan2.couponName = "美团优惠券至少2元起(新老用户都可领)";
                 meituan2.jumpUrl = ConstantUrl.URL_MEITUAN_BONUS_2;
                 meituan2.actionEnable = true;
                 meituan2.isLocal = true;
+
                 couponBeanList.add(meituan2);
+                couponBeanList.add(meituan1);
                 break;
             case FunctionFragment.TEMPLATE_TYPE_TEMPLATE:
                 CouponBean template = new CouponBean();

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

@@ -42,22 +42,28 @@ public class TemplateAdapter extends BaseQuickAdapter<CouponBean, BaseViewHolder
     @Override
     protected void convert(@NonNull BaseViewHolder holder, CouponBean couponBean) {
         ImageView iv_template = holder.getView(R.id.iv_template);
-        // 圆角
-        Glide.with(mContext).load(couponBean.coverUrl)
-                //.apply(RequestOptions.bitmapTransform(new RoundedCorners(48)))
-                //.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) {
-                        iv_template.setScaleType(ImageView.ScaleType.CENTER_CROP);
-                        iv_template.setImageDrawable(resource);
-                    }
-                });
+        if (couponBean.isCoverUrlLocal) {
+            int resourceId = Integer.parseInt(couponBean.coverUrl);
+            iv_template.setImageResource(resourceId);
+        } else {
+            // 圆角
+            Glide.with(mContext).load(couponBean.coverUrl)
+                    //.apply(RequestOptions.bitmapTransform(new RoundedCorners(48)))
+                    //.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) {
+                            iv_template.setScaleType(ImageView.ScaleType.CENTER_CROP);
+                            iv_template.setImageDrawable(resource);
+                        }
+                    });
+        }
+
 
         holder.setText(R.id.tv_template, couponBean.couponName);
         holder.setOnClickListener(R.id.rl_template, new View.OnClickListener() {

+ 1 - 1
app/src/main/res/drawable/shape_gray_stroke_solid.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/gray_divider_light" />
-    <stroke android:color="@color/black_theme" android:width="@dimen/radius_indicator" />
+    <stroke android:color="@color/black_theme" android:width="@dimen/width_stroke" />
 </shape>

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

@@ -5,13 +5,13 @@
     android:layout_height="@dimen/height_cover"
     android:background="@drawable/shape_gray_stroke_solid"
     android:foreground="@drawable/selectable_item_background"
-    android:padding="@dimen/radius_indicator">
+    android:padding="@dimen/width_stroke">
 
     <ImageView
         android:id="@+id/iv_template"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="center"
+        android:scaleType="centerCrop"
         android:src="@mipmap/logo_gray" />
 
     <TextView

BIN
app/src/main/res/mipmap-xxhdpi/meituan1.png


BIN
app/src/main/res/mipmap-xxhdpi/meituan2.png


+ 2 - 1
app/src/main/res/values/colors.xml

@@ -33,7 +33,7 @@
 
     <color name="black">#000000</color>
     <color name="black_light">#252525</color>
-    <color name="black_light_transparent">#A61B1B1B</color>
+    <color name="black_light_transparent">#851B1B1B</color>
     <color name="black_dark">#1b1b1b</color>
     <color name="black_standard">#333333</color>
     <color name="black_title">#5F6267</color>
@@ -89,6 +89,7 @@
     <color name="blue_droid">#66ABF2</color>
     <color name="blue_droid_bright">#66D6F2</color>
     <color name="yellow_droid">#FFB966</color>
+    <color name="blue_meituan_bg">#579EFD</color>
 
     <color name="green">#5CB85C</color>
     <color name="green_dark">#449D44</color>

+ 1 - 1
app/src/main/res/values/dimens.xml

@@ -66,7 +66,7 @@
     <dimen name="height_sliding_tab">48dp</dimen>
     <dimen name="height_edit_text_s">32dp</dimen>
     <dimen name="height_edit_text_search">36dp</dimen>
-    <dimen name="height_cover">192dp</dimen>
+    <dimen name="height_cover">168dp</dimen>
     <dimen name="height_tool_bar">48dp</dimen>
 
     <dimen name="width_indicator">25dp</dimen>