From 8aa3165449dd2757e016bdc43cfd5d111cd4c7a6 Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期四, 12 九月 2024 14:54:06 +0800
Subject: [PATCH] 修改了家庭资产的显示问题
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveDetailActivity.java | 146 ++++++++++++++++++++++++++++++++----------------
1 files changed, 97 insertions(+), 49 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 0e08dd8..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,82 +183,120 @@
});
viewModel.getTypeLiveData().postValue(false);
- }else if (type == 2){
- viewModel.getTypeLiveData().postValue(true);
}
-
- binding.etDate1.setOnClickListener(new View.OnClickListener() {
+ binding.etStartTime.setOnClickListener(new View.OnClickListener() {
+ private String datee;
+ private String timee;
@Override
public void onClick(View v) {
DatePicker picker = getDatePicker();
- picker.setTitle("閫夋嫨鏃堕棿");
+ TimePicker picker2 = getTimePicker();
+ picker.setTitle("閫夋嫨鏃ユ湡");
+ picker2.setTitle("閫夋嫨鏃堕棿");
picker.setOnDatePickedListener(new OnDatePickedListener() {
@Override
public void onDatePicked(int year, int month, int day) {
String date = String.format(Locale.CHINA, "%d-%02d-%02d", year, month, day);
- binding.etDate1.setText(date);
+ datee = date;
+
+ // 鍦ㄦ棩鏈熼�夋嫨鍚庢樉绀烘椂闂撮�夋嫨鍣�
+ picker2.show();
}
});
picker.show();
+ picker2.setOnTimePickedListener(new OnTimePickedListener() {
+ @Override
+ public void onTimePicked(int hour, int minute, int second) {
+ String time = String.format(Locale.CHINA, "%d:%02d:%02d", hour, minute, second);
+ timee = time;
+ // 鍚堝苟鏃ユ湡鍜屾椂闂村苟璁剧疆鍒扮紪杈戞
+ String starttime = datee + " " + timee;
+ binding.etStartTime.setText(starttime);
+ }
+ });
}
});
- binding.etDate2.setOnClickListener(new View.OnClickListener() {
+
+
+
+
+
+ binding.etEndTime.setOnClickListener(new View.OnClickListener() {
+ private String datee;
+ private String timee;
@Override
public void onClick(View v) {
DatePicker picker = getDatePicker();
- picker.setTitle("閫夋嫨鏃堕棿");
+ TimePicker picker2 = getTimePicker();
+ picker.setTitle("閫夋嫨鏃ユ湡");
+ picker2.setTitle("閫夋嫨鏃堕棿");
picker.setOnDatePickedListener(new OnDatePickedListener() {
@Override
public void onDatePicked(int year, int month, int day) {
String date = String.format(Locale.CHINA, "%d-%02d-%02d", year, month, day);
- binding.etDate2.setText(date);
+ datee = date;
+
+ // 鍦ㄦ棩鏈熼�夋嫨鍚庢樉绀烘椂闂撮�夋嫨鍣�
+ picker2.show();
}
});
picker.show();
- }
- });
-
- binding.etTime1.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- TimePicker picker = getTimePicker();
- picker.setTitle("閫夋嫨鏃堕棿");
- picker.setOnTimePickedListener(new OnTimePickedListener() {
-
+ picker2.setOnTimePickedListener(new OnTimePickedListener() {
@Override
-
- public void onTimePicked(int hour, int Minute,int second) {
-// second = '0';
- String date = String.format(Locale.CHINA, "%d:%02d:%02d",hour,Minute,second);
- binding.etTime1.setText(date);
+ public void onTimePicked(int hour, int minute, int second) {
+ String time = String.format(Locale.CHINA, "%d:%02d:%02d", hour, minute, second);
+ timee = time;
+ // 鍚堝苟鏃ユ湡鍜屾椂闂村苟璁剧疆鍒扮紪杈戞
+ String endtime = datee + " " + timee;
+ binding.etEndTime.setText(endtime);
}
});
- picker.show();
}
});
+// binding.etDate1.setOnClickListener(new View.OnClickListener() {
+// @Override
+// public void onClick(View v) {
+// DatePicker picker = getDatePicker();
+// picker.setTitle("閫夋嫨鏃堕棿");
+// picker.setOnDatePickedListener(new OnDatePickedListener() {
+// @Override
+// public void onDatePicked(int year, int month, int day) {
+// String date = String.format(Locale.CHINA, "%d-%02d-%02d", year, month, day);
+// binding.etDate1.setText(date);
+// }
+// });
+// picker.show();
+// }
+// });
- binding.etTime2.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- TimePicker picker = getTimePicker();
- picker.setTitle("閫夋嫨鏃堕棿");
- picker.setOnTimePickedListener(new OnTimePickedListener() {
- @Override
- public void onTimePicked(int hour, int Minute, int second) {
- String date = String.format(Locale.CHINA, "%d:%02d:%02d",hour,Minute,second );
- binding.etTime2.setText(date);
- }
- });
- picker.show();
- }
- });
+//
+
+// binding.etTime1.setOnClickListener(new View.OnClickListener() {
+// @Override
+// public void onClick(View v) {
+// TimePicker picker = getTimePicker();
+// picker.setTitle("閫夋嫨鏃堕棿");
+// picker.setOnTimePickedListener(new OnTimePickedListener() {
+//
+// @Override
+//
+// public void onTimePicked(int hour, int Minute,int second) {
+//// second = '0';
+// String date = String.format(Locale.CHINA, "%d:%02d:%02d",hour,Minute,second);
+// binding.etTime1.setText(date);
+// }
+// });
+// picker.show();
+// }
+// });
+
@@ -326,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