From 590c1cff46b105d774271f950caa9f65523f05c1 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期五, 29 十二月 2023 20:20:40 +0800
Subject: [PATCH] 1、增加护眼模式主题\n2、修复显示问题

---
 app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 fce4d09..8f64146 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
@@ -26,11 +26,7 @@
 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
@@ -81,7 +77,8 @@
                 mOperatePopupWindow.getContentView().findViewById(R.id.tv_add),
                 mOperatePopupWindow.getContentView().findViewById(R.id.tv_select),
                 mOperatePopupWindow.getContentView().findViewById(R.id.tv_from_new_to_old),
-                mOperatePopupWindow.getContentView().findViewById(R.id.tv_from_old_to_new)
+                mOperatePopupWindow.getContentView().findViewById(R.id.tv_from_old_to_new),
+                mOperatePopupWindow.getContentView().findViewById(R.id.tv_own_top)
         );
         //鐐瑰嚮鏀惧ぇ闀滄寜閽樉绀哄嚭鎼滅储妗�
         binding.ivSearchDefault.setOnClickListener(v -> {
@@ -348,6 +345,9 @@
         } else if (id == R.id.tv_from_old_to_new) {
             viewModel.changeOrder(false);
             mOperatePopupWindow.dismiss();
+        } else if (id == R.id.tv_own_top) {
+            viewModel.ownTop();
+            mOperatePopupWindow.dismiss();
         }
     }
 

--
Gitblit v1.9.1