From 5325e22a184b53aadcc5e9552cb1ec54f9c8ad81 Mon Sep 17 00:00:00 2001
From: guoshen <3129367635@qq.com>
Date: 星期六, 29 六月 2024 16:33:11 +0800
Subject: [PATCH] 加入了直播、会议功能

---
 app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 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 8f64146..9104119 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,9 +1,11 @@
 package com.application.zhangshi_app_android.ui.function;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.PopupWindow;
@@ -22,6 +24,7 @@
 import com.application.zhangshi_app_android.R;
 import com.application.zhangshi_app_android.adapter.FamilyMemorabiliaRvAdapter;
 import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
+import com.application.zhangshi_app_android.bean.MeetingBean;
 import com.application.zhangshi_app_android.databinding.ActivityFamilyMemorabiliaBinding;
 import com.application.zhangshi_app_android.ui.DLBaseActivity;
 import com.github.gzuliyujiang.wheelpicker.DatePicker;
@@ -260,12 +263,12 @@
                 }
             }
         });
-        viewModel.getMoreListLiveData().observe(this, new Observer<List<FamilyMemorabiliaBean>>() {
-            @Override
-            public void onChanged(List<FamilyMemorabiliaBean> familyMemorabiliaBeans) {
-                adapter.addData(familyMemorabiliaBeans);
-            }
-        });
+//        viewModel.getMoreListLiveData().observe(this, new Observer<List<FamilyMemorabiliaBean>>() {
+//            @Override
+//            public void onChanged(List<FamilyMemorabiliaBean> familyMemorabiliaBeans) {
+//                adapter.addData(familyMemorabiliaBeans);
+//            }
+//        });
         viewModel.getOperateTypeLiveData().observe(this, integer -> {
             if (integer == 0){
                 binding.ivOperate.setBackgroundResource(R.drawable.ic_operate);
@@ -359,4 +362,5 @@
         }
     }
 
+
 }
\ No newline at end of file

--
Gitblit v1.9.1