From b17b9aa59bae6d03055f14d937821655dfaffa1f Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期一, 29 一月 2024 23:27:08 +0800
Subject: [PATCH] 1、调整成长经历页面\n2、删除婚姻个人信息

---
 app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java |   86 +++++++++++++++++++++----------------------
 1 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java
index a34d30f..6762c39 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java
@@ -1,16 +1,22 @@
 package com.application.zhangshi_app_android.adapter;
 
 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.ContactsBean;
 import com.application.zhangshi_app_android.bean.ContactsDetailBean;
+import com.application.zhangshi_app_android.bean.TourismBean;
 import com.application.zhangshi_app_android.databinding.ItemContactsBinding;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author Gss
@@ -18,7 +24,7 @@
  * @desc 閫氳褰� recyclerView 鐨� adapter
  */
 public class ContactsRvAdapter extends BaseRVAdapter<ContactsBean, ItemContactsBinding, ContactsRvAdapter.ViewHolder> {
-
+    private final Map<ContactsBean, Boolean> expendMap = new HashMap<>();
 
     public ContactsRvAdapter(Context context) {
         super(context);
@@ -40,58 +46,52 @@
         ContactsDetailAdapter adapter = new ContactsDetailAdapter(mContext);
         holder.getBinding().recyclerView.setAdapter(adapter);
         adapter.setData(mDataList.get(position).getContactsDetailBeans());
+        //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗$墖鑳屾櫙鑹�
+        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);
+                    expendMap.put(getItem(position),false);
                 }else{
                     final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
-                    holder.getBinding().cardView.measure(View.MeasureSpec.UNSPECIFIED,View.MeasureSpec.UNSPECIFIED);
+                    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);
+                    expendMap.put(getItem(position),true);
                 }
             }
         });
@@ -100,8 +100,6 @@
 
 
     public static class ViewHolder extends BaseViewHolder<ItemContactsBinding>{
-        private boolean isExpended;
-
         public ViewHolder(ItemContactsBinding binding) {
             super(binding);
         }

--
Gitblit v1.9.1