From caead5ad019c24b9a7958f01fa663ea8159aee6c Mon Sep 17 00:00:00 2001
From: guoshen <3129367635@qq.com>
Date: 星期一, 01 七月 2024 16:16:04 +0800
Subject: [PATCH] 修复会议申请的闪退bgg（starttime,endtime字段的划分和修改）
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 7d689e7..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,15 +24,12 @@
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;
import com.github.gzuliyujiang.wheelpicker.contract.OnDatePickedListener;
-
-import java.util.Calendar;
import java.util.List;
-
-import io.reactivex.functions.Consumer;
/**
* @author Ljj
@@ -264,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);
@@ -363,4 +362,5 @@
}
}
+
}
\ No newline at end of file
--
Gitblit v1.9.1