From efafbbf142c81c233c71de636a2d3ce9dc2124f0 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 12 九月 2023 19:20:05 +0800
Subject: [PATCH] 修复bug
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/PropertyDetailActivity.java | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/PropertyDetailActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PropertyDetailActivity.java
index 1e758b8..c2bb77e 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/PropertyDetailActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PropertyDetailActivity.java
@@ -6,27 +6,26 @@
import androidx.recyclerview.widget.GridLayoutManager;
+import com.android.app_base.utils.ScreenSizeUtils;
+import com.android.app_base.utils.Utils;
+import com.android.app_base.widget.LinearItemDecoration;
import com.application.zhangshi_app_android.BR;
import com.application.zhangshi_app_android.R;
-import com.application.zhangshi_app_android.adapter.ImageRvAdapter;
-import com.application.zhangshi_app_android.bean.CleanStorageBean;
+import com.application.zhangshi_app_android.adapter.ElectronicFileAddAdapter;
+import com.application.zhangshi_app_android.adapter.MemoRvAdapter;
import com.application.zhangshi_app_android.bean.PropertyBean;
-import com.application.zhangshi_app_android.databinding.ActivityCleanStorageDetailBinding;
import com.application.zhangshi_app_android.databinding.ActivityPropertyDetailBinding;
import com.application.zhangshi_app_android.ui.DLBaseActivity;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
/**
* @author Ljj
* @date 2023.04.21. 21:02
- * @desc
+ * @desc 涓汉璐骇 璇︽儏 锛堜粎渚涙煡鐪嬶級
*/
public class PropertyDetailActivity extends DLBaseActivity<ActivityPropertyDetailBinding,PropertyDetailActivityViewModel> {
- private ImageRvAdapter adapter;
+ private ElectronicFileAddAdapter adapter;
+ private MemoRvAdapter memoRvAdapter;
@Override
public int getLayoutId() {
@@ -47,35 +46,36 @@
@Override
public void initView() {
- adapter = new ImageRvAdapter(this);
+ adapter = new ElectronicFileAddAdapter(this);
GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 3);
binding.rvImage.setLayoutManager(gridLayoutManager);
binding.rvImage.setNestedScrollingEnabled(false);
+ binding.rvImage.setAdapter(adapter);
+
+ memoRvAdapter = new MemoRvAdapter(this);
+ LinearItemDecoration itemDecoration = new LinearItemDecoration();
+ itemDecoration.setBottomSpace(ScreenSizeUtils.dip2px(this, 15));
+ binding.rvMemo.addItemDecoration(itemDecoration);
+ binding.rvMemo.setAdapter(memoRvAdapter);
+
setIsEdited(false);
}
@Override
public void initData() {
-
+ viewModel.getMemos();
}
@Override
public void initLiveDataObserve() {
viewModel.getBeanLiveData().observe(this,bean -> {
if (bean!=null){
- String url = bean.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(bean.getUrl(),","));
+ }
+ });
+ viewModel.getMemoListLiveData().observe(this, memoBeans -> {
+ if (memoBeans!=null){
+ memoRvAdapter.setData(memoBeans);
}
});
}
@@ -83,6 +83,7 @@
public void setIsEdited(boolean isEdited){
disableAllEditText(getContentView(),isEdited);
adapter.setIsEdited(isEdited);
+ memoRvAdapter.setEdited(isEdited);
}
public void disableAllEditText(ViewGroup viewGroup, boolean isEdited) {
for (int i = 0; i < viewGroup.getChildCount(); i++) {
--
Gitblit v1.9.1