詹子聪 5 år sedan
förälder
incheckning
4e7b65cd24

+ 7 - 0
app/build.gradle

@@ -94,6 +94,13 @@ dependencies {
 
     // Jsoup解析网页
     //implementation 'org.jsoup:jsoup:1.13.1'
+
+    // 圆角图片
+    //implementation 'de.hdodenhof:circleimageview:3.1.0'
+    //implementation 'com.makeramen:roundedimageview:2.3.0'
+
+    // 文字对齐
+    implementation 'me.codeboy.android:align-text-view:2.3.2'
 }
 repositories {
     mavenCentral()

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

@@ -11,8 +11,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -25,17 +23,20 @@ import com.miekir.common.utils.ToastTool;
 
 import java.util.List;
 
+
 /**
  * @author Miekir
  * @date 2020/7/6 20:08
  * Description: 首页商品适配器
  */
 public class TemplateAdapter extends BaseQuickAdapter<CouponBean, BaseViewHolder> {
-    //private int mRadius = 8;
+    private int mRadius = 8;
+    private Context mContext;
 
     public TemplateAdapter(Context context, @Nullable List<CouponBean> data) {
         super(R.layout.item_template, data);
-        //mRadius = (int) context.getResources().getDimension(R.dimen.margin_s);
+        mRadius = (int) context.getResources().getDimension(R.dimen.margin_s);
+        mContext = context;
     }
 
     @Override
@@ -44,20 +45,27 @@ public class TemplateAdapter extends BaseQuickAdapter<CouponBean, BaseViewHolder
         if (couponBean.isCoverUrlLocal) {
             int resourceId = Integer.parseInt(couponBean.coverUrl);
             iv_template.setImageResource(resourceId);
+            //Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), resourceId);
+            // 圆角
+            //RoundedBitmapDrawable roundDrawable = RoundedBitmapDrawableFactory.create(mContext.getResources(), bitmap);
+            //roundDrawable.setCornerRadius(48);
+            //iv_template.setImageDrawable(roundDrawable);
+            // 这些处理都是把drawable圆角了,如果drawable本身尺寸比较小,就起不到圆角效果
         } else {
             // 圆角
             Glide.with(mContext).load(couponBean.coverUrl)
-                    //.apply(RequestOptions.bitmapTransform(new RoundedCorners(48)))
+                    //.transform(new CenterCrop(), new RoundedCorners(48))
                     //.apply(RequestOptions.bitmapTransform(new RoundedCorners(mRadius)))
-                    .apply(new RequestOptions()
-                            .skipMemoryCache(true)
-                            .diskCacheStrategy(DiskCacheStrategy.NONE))
+                    //.apply(new RequestOptions()
+                    //        .skipMemoryCache(true)
+                    //        .diskCacheStrategy(DiskCacheStrategy.NONE))
+                    //.centerCrop() 千万不要加,加了就没有圆角效果了
                     //先加载原图大小的十分之一
                     .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.setScaleType(ImageView.ScaleType.CENTER_CROP);
                             iv_template.setImageDrawable(resource);
                         }
                     });

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

@@ -14,7 +14,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.SimpleTarget;
@@ -106,9 +105,9 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
         aciv_goods.setTag(R.id.aciv_goods, goodsBean.coverImageUrl);
         Glide.with(mContext).load(goodsBean.coverImageUrl)
                 .apply(RequestOptions.bitmapTransform(new RoundedCorners(mRadius)))
-                .apply(new RequestOptions()
-                        .skipMemoryCache(true)
-                        .diskCacheStrategy(DiskCacheStrategy.NONE))
+                //.apply(new RequestOptions()
+                //        .skipMemoryCache(true)
+                //        .diskCacheStrategy(DiskCacheStrategy.NONE))
                 //先加载原图大小的十分之一
                 .thumbnail(0.1f)
                 .into(new SimpleTarget<Drawable>() {

+ 4 - 1
app/src/main/res/layout/activity_mine.xml

@@ -37,7 +37,9 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingTop="@dimen/margin_ss"
+            android:paddingBottom="@dimen/margin_ss">
 
             <TextView
                 android:id="@+id/tv_amount_rest"
@@ -51,6 +53,7 @@
                 android:id="@+id/tv_cash_account"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/margin_ss"
                 android:textSize="@dimen/text_normal_s"
                 android:textColor="@color/black_text_hint" />
         </LinearLayout>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 2 - 2
app/src/main/res/layout/fragment_about.xml


+ 9 - 4
app/src/main/res/layout/item_template.xml

@@ -3,16 +3,21 @@
     android:id="@+id/rl_template"
     android:layout_width="match_parent"
     android:layout_height="@dimen/height_cover"
-    android:background="@drawable/shape_gray_stroke_solid"
+    android:background="@color/gray_divider_light"
     android:foreground="@drawable/selectable_item_background"
-    android:padding="@dimen/width_stroke">
+    android:padding="@dimen/width_stroke"
+    android:layout_marginStart="@dimen/margin_s"
+    android:layout_marginEnd="@dimen/margin_s"
+    android:layout_marginTop="@dimen/margin_sss">
+
+
 
     <ImageView
         android:id="@+id/iv_template"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        android:src="@mipmap/logo_gray" />
+        android:src="@mipmap/logo_gray"
+        android:scaleType="centerCrop" />
 
     <TextView
         android:id="@+id/tv_template"

+ 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">168dp</dimen>
+    <dimen name="height_cover">192dp</dimen>
     <dimen name="height_tool_bar">52dp</dimen>
 
     <dimen name="width_indicator">25dp</dimen>