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/CleanStorageRvAdapter.java | 181 +++++++++++++++++++++++++++++--------------- 1 files changed, 119 insertions(+), 62 deletions(-) diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/CleanStorageRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/CleanStorageRvAdapter.java index 574b8e6..3d2b23a 100644 --- a/app/src/main/java/com/application/zhangshi_app_android/adapter/CleanStorageRvAdapter.java +++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/CleanStorageRvAdapter.java @@ -2,26 +2,31 @@ import android.content.Context; import android.content.Intent; +import android.util.TypedValue; import android.view.View; -import android.view.animation.Animation; -import android.view.animation.Transformation; +import android.widget.CompoundButton; import android.widget.FrameLayout; import androidx.recyclerview.widget.GridLayoutManager; +import com.android.app_base.base.BaseConfig; import com.android.app_base.base.adapter.BaseRVAdapter; +import com.android.app_base.base.dialog.BaseDialog; +import com.android.app_base.base.dialog.UIDialog; import com.android.app_base.manager.AppManager; +import com.android.app_base.utils.Utils; import com.application.zhangshi_app_android.R; import com.application.zhangshi_app_android.bean.CleanStorageBean; +import com.application.zhangshi_app_android.bean.TourismBean; import com.application.zhangshi_app_android.databinding.ItemCleanStorageBinding; -import com.application.zhangshi_app_android.databinding.ItemFamilyAssetsBinding; -import com.application.zhangshi_app_android.ui.function.CleanStorageActivity; +import com.application.zhangshi_app_android.ui.function.CleanStorageActivityViewModel; import com.application.zhangshi_app_android.ui.function.CleanStorageDetailActivity; -import com.application.zhangshi_app_android.ui.function.FamilyAssetsDetailActivity; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @author Ljj @@ -29,8 +34,12 @@ * @desc */ public class CleanStorageRvAdapter extends BaseRVAdapter<CleanStorageBean, ItemCleanStorageBinding, CleanStorageRvAdapter.ViewHolder>{ - public CleanStorageRvAdapter(Context context) { + private CleanStorageActivityViewModel viewModel; + private final Map<CleanStorageBean, Boolean> expendMap = new HashMap<>(); + private boolean isCheckable; + public CleanStorageRvAdapter(Context context, CleanStorageActivityViewModel viewModel) { super(context); + this.viewModel = viewModel; } @Override @@ -46,88 +55,136 @@ @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(); + }); + } + if (isCheckable){ + holder.getBinding().ivFlower.setVisibility(View.GONE); + if (mDataList.get(position).getOwnData() == 1){ + holder.getBinding().checkbox.setVisibility(View.VISIBLE); + }else { + holder.getBinding().checkbox.setVisibility(View.GONE); + } + holder.getBinding().checkbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + if (viewModel.getCheckListLiveData().getValue() == null){ + viewModel.getCheckListLiveData().setValue(new ArrayList<>()); + } + List<CleanStorageBean> list = new ArrayList<>(viewModel.getCheckListLiveData().getValue()); + if (isChecked){ + if (!list.contains(mDataList.get(position))){ + list.add(mDataList.get(position)); + } + }else{ + list.remove(mDataList.get(position)); + } + viewModel.getCheckListLiveData().setValue(list); + } + }); + holder.getBinding().checkbox.setChecked(viewModel.getCheckListLiveData().getValue().contains(mDataList.get(position))); + }else{ + holder.getBinding().checkbox.setVisibility(View.GONE); + if (mDataList.get(position).getOwnData() == 1){ + holder.getBinding().ivFlower.setVisibility(View.VISIBLE); + }else { + holder.getBinding().ivFlower.setVisibility(View.GONE); + } } 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); } } }); holder.getBinding().layoutContent.setOnClickListener(v -> { AppManager.getAppManager().startActivity( new Intent(getRecyclerView().getContext(), CleanStorageDetailActivity.class) + .putExtra(BaseConfig.EXTRA_TYPE,0) .putExtra("bean",mDataList.get(position))); }); - ImageRvAdapter adapter = new ImageRvAdapter(mContext); + holder.getBinding().layoutModify.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + AppManager.getAppManager().startActivity( + new Intent(getRecyclerView().getContext(), CleanStorageDetailActivity.class) + .putExtra(BaseConfig.EXTRA_TYPE,2) + .putExtra("bean",mDataList.get(position))); + } + }); + holder.getBinding().layoutDelete.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + new UIDialog.Builder(mContext) + .setTitle("鎮ㄧ‘瀹氳鍒犻櫎璇ラ」鐩悧") + .setContent("椤圭洰鍒犻櫎鍚庡皢鏃犳硶鎭㈠") + .setConfirm("纭畾") + .setCancel("鍙栨秷") + .setListener(new UIDialog.OnListener() { + @Override + public void onConfirm(BaseDialog dialog) { + viewModel.deleteItem(mDataList.get(position)); + } + }) + .show(); + } + }); + + ElectronicFileAdapter adapter = new ElectronicFileAdapter(mContext); holder.getBinding().rvImage.setLayoutManager(new GridLayoutManager(mContext,3)); holder.getBinding().rvImage.setAdapter(adapter); - String url = mDataList.get(position).getUrl(); - if (url == null||url.isEmpty()){ - return; - } - List<String> list; - if (url.contains(",")){ - String[] split = url.split(","); - list = new ArrayList<>(Arrays.asList(split)); - }else { - list = new ArrayList<>(); - list.add(url); - } - adapter.setData(list); + adapter.setData(Utils.splitString2List(mDataList.get(position).getUrl(),",")); + + } + public void setCheckable(boolean b) { + isCheckable = b; + notifyItemRangeChanged(0,getItemCount()); + } public static class ViewHolder extends BaseRVAdapter.BaseViewHolder<ItemCleanStorageBinding> { - private boolean isExpended; - public ViewHolder(ItemCleanStorageBinding binding) { super(binding); } -- Gitblit v1.9.1