From b2dc509d5530a9af3b48d7dce7db1e7bf66b06d5 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期三, 28 二月 2024 17:26:58 +0800
Subject: [PATCH] 1、修复新增家庭设备时存在备忘录问题\n2、旅游模块新增加“感言”、“其他费用”、“备注”字段
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/HealthCareActivity.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/HealthCareActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/HealthCareActivity.java
index 40c3e98..0e5df68 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/HealthCareActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/HealthCareActivity.java
@@ -26,6 +26,7 @@
import com.github.gzuliyujiang.wheelpicker.OptionPicker;
import com.github.gzuliyujiang.wheelpicker.contract.OnOptionPickedListener;
import com.google.android.material.tabs.TabLayout;
+import com.hjq.bar.TitleBar;
import java.util.Arrays;
import java.util.List;
@@ -39,7 +40,6 @@
public class HealthCareActivity extends DLBaseActivity<ActivityHealthCareBinding,HealthCareActivityViewModel> {
private PopupWindow popupWindow;
- private int popWidth;
@Override
public int getLayoutId() {
return R.layout.activity_health_care;
@@ -59,14 +59,6 @@
public void initView() {
View view = View.inflate(this,R.layout.pop_annual_health_status,null);
popupWindow = initPopUpWindow(view);
-
- view.findViewById(R.id.tv_annual_health_status).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- popupWindow.dismiss();
- AppManager.getAppManager().startActivity(AnnualHealthStatusActivity.class);
- }
- });
view.findViewById(R.id.tv_edit).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -125,7 +117,6 @@
@Override
public void initLiveDataObserve() {
- System.out.println("鎴�"+binding.ivA.isClickable());
viewModel.getIsLifeHabitsExpendedLiveData().observe(this, aBoolean -> {
if (aBoolean){
binding.layoutTitleLifeHabits.setOnClickListener(view -> {
@@ -180,7 +171,7 @@
binding.ivOperate.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- popupWindow.showAsDropDown(binding.ivOperate,-ScreenSizeUtils.dip2px(HealthCareActivity.this,118) +binding.ivOperate.getWidth(),0);
+ popupWindow.showAsDropDown(binding.ivOperate,-ScreenSizeUtils.dip2px(HealthCareActivity.this,85) +binding.ivOperate.getWidth(),0);
}
});
}
@@ -289,4 +280,8 @@
animator.start();
}
+ @Override
+ public void onLeftClick(TitleBar titleBar) {
+ finish();
+ }
}
--
Gitblit v1.9.1