From 42ea59771a54d2591df0a6dd3936dda669be99ae Mon Sep 17 00:00:00 2001
From: gs <3129367635@qq.com>
Date: 星期一, 08 七月 2024 12:23:48 +0800
Subject: [PATCH] 会议统计接入增加，删除，修改接口
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveDetailActivity.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveDetailActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveDetailActivity.java
index ccb8c08..a955b66 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveDetailActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveDetailActivity.java
@@ -69,7 +69,7 @@
@Override
public void initParam() {
type = getIntent().getIntExtra(BaseConfig.EXTRA_TYPE,0);
- if (type == 0 || type == 2){
+ if (type == 0 ){
MeetingBean bean = (MeetingBean) getIntent().getSerializableExtra("bean");
if (bean !=null){
viewModel.getBeanLiveData().setValue(bean);
@@ -151,6 +151,7 @@
});
binding.rvImage.setAdapter(adapter);
+ popupWindow = initPopUpWindow(View.inflate(this,R.layout.pop_operate_approve,null));
if (type == 1){
viewModel.getTypeLiveData().setValue(true);
binding.titleBar.setTitle("鏂板瀹跺ぇ浜嬭");
@@ -158,7 +159,7 @@
viewModel.add();
});
}else if (type == 0){
- popupWindow = initPopUpWindow(View.inflate(this,R.layout.pop_operate_approve,null));
+
popupWindow.getContentView().findViewById(R.id.tv_disagree).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -167,8 +168,10 @@
viewModel.getTypeLiveData().postValue(true);
}
});
- viewModel.getTypeLiveData().postValue(true);
+ viewModel.getTypeLiveData().postValue(false);
+ }
+ else if (type == 2){
popupWindow.getContentView().findViewById(R.id.tv_agreed).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -180,8 +183,6 @@
});
viewModel.getTypeLiveData().postValue(false);
- }else if (type == 2){
- viewModel.getTypeLiveData().postValue(true);
}
@@ -366,17 +367,24 @@
});
viewModel.getTypeLiveData().observe(this,operateType -> {
if (operateType){
- if (type == 1) {
+// if (type == 1) {
+// binding.ivOperate.setOnClickListener(v -> {
+// viewModel.add();
+// });
+// }
+ if(type==0) {
binding.ivOperate.setOnClickListener(v -> {
- viewModel.add();
+ viewModel.agree();
});
- }else {
+ }else if(type==2) {
binding.ivOperate.setOnClickListener(v -> {
- viewModel.update();
+ viewModel.disagree();
});
}
- setIsEdited(true);
- }else {
+
+ setIsEdited(false);
+ }
+ else {
binding.ivOperate.setOnClickListener(v -> {
popupWindow.showAsDropDown(binding.ivOperate,-ScreenSizeUtils.dip2px(this,85) +binding.ivOperate.getWidth(),0);
});
--
Gitblit v1.9.1