From caead5ad019c24b9a7958f01fa663ea8159aee6c Mon Sep 17 00:00:00 2001
From: guoshen <3129367635@qq.com>
Date: 星期一, 01 七月 2024 16:16:04 +0800
Subject: [PATCH] 修复会议申请的闪退bgg（starttime,endtime字段的划分和修改）
---
app/src/main/java/com/application/zhangshi_app_android/adapter/LittleDoctorRvAdapter.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/LittleDoctorRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/LittleDoctorRvAdapter.java
index 9a2d6b3..10cc02e 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/LittleDoctorRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/LittleDoctorRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.FrameLayout;
@@ -50,29 +51,44 @@
@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();
});
}
if (isCheckable){
- holder.getBinding().checkbox.setVisibility(View.VISIBLE);
+ 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) {
@@ -93,6 +109,11 @@
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
@@ -101,14 +122,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