From b2dc509d5530a9af3b48d7dce7db1e7bf66b06d5 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期三, 28 二月 2024 17:26:58 +0800
Subject: [PATCH] 1、修复新增家庭设备时存在备忘录问题\n2、旅游模块新增加“感言”、“其他费用”、“备注”字段
---
app/src/main/java/com/application/zhangshi_app_android/adapter/AnnualHealthStatusRvAdapter.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/AnnualHealthStatusRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/AnnualHealthStatusRvAdapter.java
index 5b3d298..3c5575e 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/AnnualHealthStatusRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/AnnualHealthStatusRvAdapter.java
@@ -2,9 +2,8 @@
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;
@@ -18,16 +17,11 @@
import com.android.app_base.utils.Utils;
import com.application.zhangshi_app_android.R;
import com.application.zhangshi_app_android.bean.AnnualHealthStatusBean;
-import com.application.zhangshi_app_android.bean.PersonalNotepadBean;
import com.application.zhangshi_app_android.databinding.ItemAnnualHealthStatusBinding;
import com.application.zhangshi_app_android.ui.function.AnnualHealthStatusActivityViewModel;
import com.application.zhangshi_app_android.ui.function.AnnualHealthStatusDetailActivity;
-import com.application.zhangshi_app_android.ui.function.CleanStorageDetailActivity;
-import com.application.zhangshi_app_android.ui.function.PersonalNotepadActivityViewModel;
-import com.application.zhangshi_app_android.ui.function.PersonalNotepadDetailActivity;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -60,22 +54,33 @@
@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(R.drawable.ic_unfold);
+ 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(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -111,14 +116,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ 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();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
--
Gitblit v1.9.1