From b7606aff181e01af3f3d4cad2bc183b8d29058aa Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 28 三月 2023 21:38:37 +0800
Subject: [PATCH] 添加删除修改家大事记

---
 app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 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 bfff5ec..56f247e 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,7 @@
 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;
 import android.view.LayoutInflater;
@@ -17,9 +18,11 @@
 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;
 import com.application.zhangshi_app_android.BR;
@@ -71,7 +74,7 @@
 
         mOperatePopupWindow = initPopUpWindow(R.layout.pop_operate);
         mOperatePopupWindow.getContentView().findViewById(R.id.tv_add).setOnClickListener(v -> {
-            //TODO 璺宠浆 鏂板缓
+            AppManager.getAppManager().startActivity(new Intent(this,CreateFamilyProjectActivity.class).putExtra(BaseConfig.EXTRA_TYPE,1));
         });
         mOperatePopupWindow.getContentView().findViewById(R.id.tv_select).setOnClickListener(v -> {
             binding.ivOperate.setBackgroundResource(R.drawable.ic_operate_finish);
@@ -121,9 +124,10 @@
         binding.fabAdd.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
+                AppManager.getAppManager().startActivity(new Intent(getSelfActivity(),CreateFamilyProjectActivity.class).putExtra(BaseConfig.EXTRA_TYPE,1));
             }
         });
+
         setOnClickListener(
                 mSearchPopupWindow.getContentView().findViewById(R.id.tv_global_search),
                 mSearchPopupWindow.getContentView().findViewById(R.id.tv_search_in_family_memorabilia),
@@ -146,12 +150,18 @@
             }
         });
 
+        binding.ivMenu.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                binding.drawerLayout.open();
+            }
+        });
         binding.drawerLayout.setScrimColor(getResources().getColor(R.color.color_shadow));
     }
 
     @Override
     public void initData() {
-        viewModel.getFamilyMemorabilia(0);
+        viewModel.getFamilyMemorabilia(searchType);
     }
 
     @Override
@@ -203,7 +213,8 @@
     @Override
     protected void dataNull() {
         super.dataNull();
-
+        binding.layoutDataNull.setVisibility(View.VISIBLE);
+        binding.recyclerView.setVisibility(View.GONE);
     }
 
     @Override

--
Gitblit v1.9.1