From 454a84caa83c4ebc1b4c422f10166bddfb0e03ec Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期四, 21 九月 2023 21:53:30 +0800
Subject: [PATCH] 1、修复添加按钮消失问题\n2、修改家族导图\n3、新增便捷添加功能\n4、新增修改头像功能\n5、个人财产增加搜索条件
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeDevicesActivity.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeDevicesActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeDevicesActivity.java
index 0bce664..0ba19ef 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeDevicesActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeDevicesActivity.java
@@ -76,8 +76,7 @@
setOnClickListener(
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_own_top)
);
//鐐瑰嚮鏀惧ぇ闀滄寜閽樉绀哄嚭鎼滅储妗�
binding.ivSearchDefault.setOnClickListener(v -> {
@@ -308,11 +307,8 @@
}else if (id == R.id.tv_select){
viewModel.getOperateTypeLiveData().postValue(1);
mOperatePopupWindow.dismiss();
- }else if (id == R.id.tv_from_new_to_old) {
- viewModel.changeOrder(true);
- mOperatePopupWindow.dismiss();
- } else if (id == R.id.tv_from_old_to_new) {
- viewModel.changeOrder(false);
+ }else if (id == R.id.tv_own_top) {
+ viewModel.ownTop();
mOperatePopupWindow.dismiss();
}
}
--
Gitblit v1.9.1