From 590c1cff46b105d774271f950caa9f65523f05c1 Mon Sep 17 00:00:00 2001 From: Linjiajia <319408893@qq.com> Date: 星期五, 29 十二月 2023 20:20:40 +0800 Subject: [PATCH] 1、增加护眼模式主题\n2、修复显示问题 --- app/src/main/java/com/application/zhangshi_app_android/adapter/HomeMemberAdapter.java | 86 ++++++++++++++++++++++--------------------- 1 files changed, 44 insertions(+), 42 deletions(-) diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/HomeMemberAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/HomeMemberAdapter.java index 9e42148..a96f1c4 100644 --- a/app/src/main/java/com/application/zhangshi_app_android/adapter/HomeMemberAdapter.java +++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/HomeMemberAdapter.java @@ -2,15 +2,21 @@ import android.content.Context; +import android.util.TypedValue; import android.view.View; import android.view.animation.Animation; import android.view.animation.Transformation; import android.widget.FrameLayout; import com.android.app_base.base.adapter.BaseRVAdapter; +import com.android.app_base.utils.Utils; import com.application.zhangshi_app_android.R; +import com.application.zhangshi_app_android.bean.CertificateOfHonorBean; import com.application.zhangshi_app_android.bean.HomeMemberBean; import com.application.zhangshi_app_android.databinding.ItemHomeMemberListBinding; + +import java.util.HashMap; +import java.util.Map; /** * @author Ljj @@ -18,6 +24,8 @@ * @desc */ public class HomeMemberAdapter extends BaseRVAdapter<HomeMemberBean, ItemHomeMemberListBinding, HomeMemberAdapter.ViewHolder> { + + private final Map<HomeMemberBean, Boolean> expendMap = new HashMap<>(); public HomeMemberAdapter(Context context) { super(context); @@ -31,58 +39,54 @@ @Override protected void onBind(ViewHolder holder, int position) { holder.getBinding().setBean(mDataList.get(position)); + //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗$墖鑳屾櫙鑹� + TypedValue typedValue1 = new TypedValue(); + mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true); + TypedValue typedValue2 = new TypedValue(); + mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true); if (position % 2 != 0){ - holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue)); + holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data); }else { - holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink)); + holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data); + } + if (!expendMap.containsKey(getItem(position))){ + expendMap.put(getItem(position),false); + } + //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣 + TypedValue unfoldIcon = new TypedValue(); + mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true); + TypedValue foldIcon = new TypedValue(); + mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true); + if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){ + holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId); + holder.getBinding().cardView.post(() -> { + holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT; + holder.getBinding().cardView.requestLayout(); + }); + + }else{ + holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId); + holder.getBinding().cardView.post(() -> { + holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight(); + holder.getBinding().cardView.requestLayout(); + }); } holder.getBinding().layoutTitle.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if (holder.isExpended){ + if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){ int initialHeight = holder.getBinding().cardView.getMeasuredHeight(); int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight(); - int distanceToCollapse = (int) (initialHeight - collapsedHeight); - - Animation a = new Animation() { - @Override - protected void applyTransformation(float interpolatedTime, Transformation t) { - if (interpolatedTime == 1){ - } - holder.getBinding().cardView.getLayoutParams().height = (int) (initialHeight - (distanceToCollapse * interpolatedTime)); - holder.getBinding().cardView.requestLayout(); - } - - @Override - public boolean willChangeBounds() { - return true; - } - }; - a.setDuration(500); - holder.getBinding().cardView.startAnimation(a); - holder.isExpended = false; + Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight); + holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId); + expendMap.put(getItem(position),false); }else{ final int initialHeight = holder.getBinding().cardView.getMeasuredHeight(); holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT); int targetHeight = holder.getBinding().cardView.getMeasuredHeight(); - int distanceToExpand = targetHeight - initialHeight; - Animation a = new Animation() { - @Override - protected void applyTransformation(float interpolatedTime, Transformation t) { - if (interpolatedTime == 1){ - } - holder.getBinding().cardView.getLayoutParams().height = (int) (initialHeight + (distanceToExpand * interpolatedTime)); - holder.getBinding().cardView.requestLayout(); - } - - @Override - public boolean willChangeBounds() { - return true; - } - }; - a.setDuration(500); - holder.getBinding().cardView.startAnimation(a); - holder.isExpended = true; + Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight); + holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId); + expendMap.put(getItem(position),true); } } }); @@ -94,8 +98,6 @@ } public static class ViewHolder extends BaseViewHolder<ItemHomeMemberListBinding>{ - private boolean isExpended; - public ViewHolder(ItemHomeMemberListBinding binding) { super(binding); } -- Gitblit v1.9.1