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/FamilyMemorabiliaActivity.java | 78 +++++++++++++++++++++++++-------------
1 files changed, 51 insertions(+), 27 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java
index e920c93..ef77b64 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java
@@ -1,6 +1,5 @@
package com.application.zhangshi_app_android.ui.function;
-import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.drawable.ColorDrawable;
import android.view.KeyEvent;
@@ -8,22 +7,15 @@
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
-import android.widget.Button;
import android.widget.PopupWindow;
import android.widget.TextView;
-import androidx.annotation.IdRes;
-import androidx.annotation.LayoutRes;
-import androidx.appcompat.app.AlertDialog;
import androidx.databinding.DataBindingUtil;
-import androidx.databinding.ViewDataBinding;
-import androidx.drawerlayout.widget.DrawerLayout;
import androidx.lifecycle.Observer;
import com.android.app_base.base.BaseConfig;
import com.android.app_base.base.dialog.BaseDialog;
import com.android.app_base.base.dialog.UIDialog;
-import com.android.app_base.base.view.BaseActivity;
import com.android.app_base.manager.AppManager;
import com.android.app_base.utils.ScreenSizeUtils;
import com.android.app_base.widget.LinearItemDecoration;
@@ -34,7 +26,6 @@
import com.application.zhangshi_app_android.databinding.ActivityFamilyMemorabiliaBinding;
import com.application.zhangshi_app_android.databinding.PopSearchBinding;
import com.application.zhangshi_app_android.ui.DLBaseActivity;
-import com.hjq.bar.TitleBar;
import java.util.List;
@@ -67,6 +58,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 FamilyMemorabiliaRvAdapter(this,viewModel);
LinearItemDecoration itemDecoration = new LinearItemDecoration();
itemDecoration.setBottomSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_12));
@@ -87,6 +85,7 @@
});
binding.ivSearchType.setOnClickListener(v -> {
+ hideSoftKeyboard();
mSearchPopupWindow.setWidth(binding.layoutSearch.getMeasuredWidth());
mSearchPopupWindow.showAsDropDown(binding.layoutSearch,0,0);
});
@@ -148,9 +147,9 @@
return;
}
if (familyMemorabiliaBeans.isEmpty()){
- viewModel.getOperateTypeLiveData().postValue(1);
+ viewModel.getOperateTypeLiveData().setValue(1);
}else{
- viewModel.getOperateTypeLiveData().postValue(2);
+ viewModel.getOperateTypeLiveData().setValue(2);
}
}
});
@@ -158,6 +157,12 @@
@Override
public void onChanged(List<FamilyMemorabiliaBean> familyMemorabiliaBeans) {
adapter.setData(familyMemorabiliaBeans);
+ }
+ });
+ viewModel.getMoreListLiveData().observe(this, new Observer<List<FamilyMemorabiliaBean>>() {
+ @Override
+ public void onChanged(List<FamilyMemorabiliaBean> familyMemorabiliaBeans) {
+ adapter.addData(familyMemorabiliaBeans);
}
});
viewModel.getOperateTypeLiveData().observe(this, integer -> {
@@ -175,19 +180,20 @@
adapter.setCheckable(true);
}else if (integer == 2){
binding.ivOperate.setBackgroundResource(R.drawable.ic_delete_white);
- new UIDialog.Builder(this)
- .setTitle("鎮ㄧ‘瀹氳鍒犻櫎椤圭洰鍚�")
- .setContent("椤圭洰鍒犻櫎鍚庡皢鏃犳硶鎭㈠")
- .setConfirm("纭畾")
- .setCancel("鍙栨秷")
- .setListener(new UIDialog.OnListener() {
- @Override
- public void onConfirm(BaseDialog dialog) {
- viewModel.delete();
- }
- })
- .show();
- adapter.setCheckable(true);
+ binding.ivOperate.setOnClickListener(v -> {
+ new UIDialog.Builder(this)
+ .setTitle("鎮ㄧ‘瀹氳鍒犻櫎椤圭洰鍚�")
+ .setContent("椤圭洰鍒犻櫎鍚庡皢鏃犳硶鎭㈠")
+ .setConfirm("纭畾")
+ .setCancel("鍙栨秷")
+ .setListener(new UIDialog.OnListener() {
+ @Override
+ public void onConfirm(BaseDialog dialog) {
+ viewModel.delete();
+ }
+ })
+ .show();
+ });
}
});
}
@@ -203,10 +209,10 @@
// 璁剧疆pop閫忔槑鏁堟灉
popupWindow.setBackgroundDrawable(new ColorDrawable(0x0000));
// 璁剧疆pop鍑哄叆鍔ㄧ敾
- popupWindow.setAnimationStyle(com.android.app_base.R.style.pop_add);
- // 璁剧疆pop鑾峰彇鐒︾偣锛屽鏋滀负false鐐瑰嚮杩斿洖鎸夐挳浼氶��鍑哄綋鍓岮ctivity锛屽鏋減op涓湁Editor鐨勮瘽锛宖ocusable蹇呴』瑕佷负true
+ popupWindow.setAnimationStyle(com.android.app_base.R.style.pop_operate);
+// // 璁剧疆pop鑾峰彇鐒︾偣锛屽鏋滀负false鐐瑰嚮杩斿洖鎸夐挳浼氶��鍑哄綋鍓岮ctivity锛屽鏋減op涓湁Editor鐨勮瘽锛宖ocusable蹇呴』瑕佷负true
popupWindow.setFocusable(true);
- // 璁剧疆pop鍙偣鍑伙紝涓篺alse鐐瑰嚮浜嬩欢鏃犳晥锛岄粯璁や负true
+// // 璁剧疆pop鍙偣鍑伙紝涓篺alse鐐瑰嚮浜嬩欢鏃犳晥锛岄粯璁や负true
popupWindow.setTouchable(true);
// 璁剧疆鐐瑰嚮pop澶栦晶娑堝け锛岄粯璁や负false锛涘湪focusable涓簍rue鏃剁偣鍑诲渚у缁堟秷澶�
popupWindow.setOutsideTouchable(false);
@@ -221,10 +227,17 @@
}
@Override
+ protected void dataFinish() {
+ super.dataFinish();
+ binding.refreshLayout.finishLoadMore();
+ }
+
+ @Override
protected void hide() {
super.hide();
binding.layoutDataNull.setVisibility(View.GONE);
binding.recyclerView.setVisibility(View.VISIBLE);
+ binding.refreshLayout.finishLoadMore();
}
@Override
@@ -243,4 +256,15 @@
mOperatePopupWindow.dismiss();
}
}
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ if (mSearchPopupWindow != null){
+ mSearchPopupWindow.dismiss();
+ }
+ if (mOperatePopupWindow != null){
+ mOperatePopupWindow.dismiss();
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1