From fcdddf8b9b34f9930bec454b5fffe41c0e33ba3c Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期一, 24 四月 2023 21:17:05 +0800
Subject: [PATCH] 功能模块大部分

---
 app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyAssetsActivity.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyAssetsActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyAssetsActivity.java
index 18ea31e..4e82550 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyAssetsActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyAssetsActivity.java
@@ -6,18 +6,13 @@
 import android.widget.PopupWindow;
 
 import androidx.databinding.library.baseAdapters.BR;
-import androidx.lifecycle.Observer;
 
 import com.android.app_base.utils.ScreenSizeUtils;
 import com.android.app_base.widget.LinearItemDecoration;
 import com.application.zhangshi_app_android.R;
 import com.application.zhangshi_app_android.adapter.FamilyAssetsRvAdapter;
-import com.application.zhangshi_app_android.adapter.FamilyMemorabiliaRvAdapter;
-import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
 import com.application.zhangshi_app_android.databinding.ActivityFamilyAssetsBinding;
 import com.application.zhangshi_app_android.ui.DLBaseActivity;
-
-import java.util.List;
 
 /**
  * @author Ljj
@@ -48,6 +43,13 @@
 
     @Override
     public void initView() {
+        binding.refreshLayout.setEnableRefresh(false);
+        binding.refreshLayout.setEnableLoadMore(true);
+        binding.refreshLayout.setEnableOverScrollDrag(true);
+        binding.refreshLayout.setOnLoadMoreListener(refreshLayout -> {
+//            viewModel.getMoreFamilyMemorabilia();
+        });
+
         adapter = new FamilyAssetsRvAdapter(this);
         LinearItemDecoration itemDecoration = new LinearItemDecoration();
         itemDecoration.setBottomSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_12));
@@ -93,7 +95,7 @@
         // 璁剧疆pop閫忔槑鏁堟灉
         popupWindow.setBackgroundDrawable(new ColorDrawable(0x0000));
         // 璁剧疆pop鍑哄叆鍔ㄧ敾
-        popupWindow.setAnimationStyle(com.android.app_base.R.style.pop_add);
+        popupWindow.setAnimationStyle(com.android.app_base.R.style.pop_operate);
         // 璁剧疆pop鑾峰彇鐒︾偣锛屽鏋滀负false鐐瑰嚮杩斿洖鎸夐挳浼氶��鍑哄綋鍓岮ctivity锛屽鏋減op涓湁Editor鐨勮瘽锛宖ocusable蹇呴』瑕佷负true
         popupWindow.setFocusable(true);
         // 璁剧疆pop鍙偣鍑伙紝涓篺alse鐐瑰嚮浜嬩欢鏃犳晥锛岄粯璁や负true

--
Gitblit v1.9.1