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/AnnualHealthStatusActivity.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusActivity.java
index 8cbc7af..1c74f96 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusActivity.java
@@ -37,8 +37,7 @@
private boolean isSearchLayoutVisible;
private PopupWindow mOperatePopupWindow;
@Override
- public int getLayoutId() {
- return R.layout.activity_annual_health_status;
+ public int getLayoutId() {return R.layout.activity_annual_health_status;
}
@Override
@@ -69,12 +68,14 @@
binding.recyclerView.addItemDecoration(itemDecoration);
binding.recyclerView.setAdapter(adapter);
//鍙充笂瑙掓搷浣滃脊绐�
- mOperatePopupWindow = initPopUpWindow(View.inflate(this,R.layout.pop_operate,null));
+ mOperatePopupWindow = initPopUpWindow(View.inflate(this, R.layout.pop_operate_exam_info, null));
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_from_old_to_new),
+ mOperatePopupWindow.getContentView().findViewById(R.id.tv_exam_info),
+ mOperatePopupWindow.getContentView().findViewById(R.id.tv_health_care)
);
//鐐瑰嚮鏀惧ぇ闀滄寜閽樉绀哄嚭鎼滅储妗�
binding.ivSearchDefault.setOnClickListener(v -> {
@@ -235,7 +236,7 @@
if (integer == 0){
binding.ivOperate.setBackgroundResource(R.drawable.ic_operate);
binding.ivOperate.setOnClickListener(v -> {
- mOperatePopupWindow.showAsDropDown(binding.ivOperate,-ScreenSizeUtils.dip2px(this,85) +binding.ivOperate.getWidth(),0);
+ mOperatePopupWindow.showAsDropDown(binding.ivOperate,-ScreenSizeUtils.dip2px(this,118) +binding.ivOperate.getWidth(),0);
});
adapter.setCheckable(false);
}else if (integer == 1){
@@ -311,6 +312,12 @@
} else if (id == R.id.tv_from_old_to_new) {
viewModel.changeOrder(false);
mOperatePopupWindow.dismiss();
+ }else if (id == R.id.tv_health_care){
+ AppManager.getAppManager().startActivity(HealthCareActivity.class);
+ mOperatePopupWindow.dismiss();
+ }else if (id == R.id.tv_exam_info){
+ AppManager.getAppManager().startActivity(ExaminationInfoActivity.class);
+ mOperatePopupWindow.dismiss();
}
}
@@ -336,8 +343,5 @@
return super.dispatchTouchEvent(event);
}
- @Override
- public void onLeftClick(TitleBar titleBar) {
- finish();
- }
+
}
--
Gitblit v1.9.1