会议统计接入增加，删除，修改接口

gs

2024-07-08 42ea59771a54d2591df0a6dd3936dda669be99ae

 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);
                });