修复会议申请的闪退bgg（starttime,endtime字段的划分和修改）

guoshen

2024-07-01 caead5ad019c24b9a7958f01fa663ea8159aee6c

修复会议申请的闪退bgg（starttime,endtime字段的划分和修改）

 .idea/deploymentTargetDropDown.xml

@@ -51,12 +51,12 @@
              <deviceKey>
                <Key>
                  <type value="VIRTUAL_DEVICE_PATH" />
                  <value value="C:\Users\home\.android\avd\Pixel_7_Pro_API_30.avd" />
                  <value value="D:\andro\.android\avd\Resizable_Experimental_API_34.avd" />
                </Key>
              </deviceKey>
            </Target>
          </targetSelectedWithDropDown>
          <timeTargetWasSelectedWithDropDown value="2024-05-07T02:34:49.481997500Z" />
          <timeTargetWasSelectedWithDropDown value="2024-07-01T07:42:38.368337600Z" />
        </State>
      </entry>
    </value>

 .idea/misc.xml

@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="ExternalStorageConfigurationManager" enabled="true" />
  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">

 app/src/main/java/com/application/zhangshi_app_android/bean/MeetingBean.java

@@ -73,15 +73,6 @@
    }

    public void setStartTime(String startTime) {
        if(getDate1()!=null){
            if(getTime1()==null){
                startTime = getDate1().toString()+" 00:00:00";
            }
            if (getTime1()!=null){
                startTime = getDate1().toString() +" "+ getTime1().toString();
            }

        }

        this.startTime = startTime;
    }
@@ -103,14 +94,6 @@
    }

    public void setEndTime(String endTime) {
       if (getDate2()!=null){
           if(getTime2()==null){
               endTime = getDate2() + " 00:00:00";
           }
           if (getTime2()!=null){
               endTime = getDate2() + " " +getTime2();
           }
       }
        this.endTime = endTime;
    }

@@ -298,111 +281,15 @@
            this.url = sb.toString();
        }

        private String date1 ;
        private String time1 ;

        public String getDate1() {
//            date1 = null;
            String data = getStartTime();
            if (data!= null && !data.isEmpty()){
                String[] parts = data.split(" ");
                date1 = parts[0];
            }
            return date1;
        }

        public void setDate1(String date1) {

            this.date1 = date1;
        }

        public String getTime1() {
//            time1 = null;
            String data = getStartTime();
            if (data!= null && !data.isEmpty()){
                String[] parts = data.split(" ");
                String hour = "00";
                String min = "00";
                String second = "00";

                if(parts.length>1){
                    String time = parts[1];

                    String[] parts2 = time.split(":");
                    if(parts2.length>1){
                        hour = parts2[0];
                        min = parts2[1];
                        second = parts2[3];
                        time1 = hour +":" + min+":"+second;
                    }
                }else{
                    time1 ="00:00:00";
                }
            }
            return time1;
        }

        public void setTime1(String time1) {
////            time1 = time1 + ":00";
//            time1 = getTime1();

            this.time1 = time1;
        }


        private String date2;
        private String time2;

    public String getDate2() {
//        date2 = null;
        String data = getEndTime();
        if (data!= null && !data.isEmpty()){
            String[] parts = data.split(" ");
            date2 = parts[0];
        }

        return date2;
    }

    public void setDate2(String date2) {

        this.date2 = date2;
    }

    public String getTime2() {
//        time2 = null;
        String data = getEndTime();
        if (data!= null && !data.isEmpty()){
            String[] parts = data.split(" ");

            String hour = "00";
            String min = "00";
//            String second = "00";

            if(parts.length>1){
                String time = parts[1];

                String[] parts2 = time.split(":");
                if(parts2.length>1){
                    hour = parts2[0];
                    min = parts2[1];

                    time1 = hour +":" + min+":00";
                }else{
                    time1 = parts2[0]+":00:00";
                }

            }

        }

        return time2;
    }

    public void setTime2(String time2) {

        this.time2 = time2;
    }




 app/src/main/java/com/application/zhangshi_app_android/bean/MeetingRequestBean.java

@@ -23,29 +23,12 @@
        this.applyPerson = applyPerson;
    }

    //    private String endTime;
    private String happenStartTime;
        private String endTime;
//    private String happenStartTime;

    public String getHappenStartTime() {
        return happenStartTime;
    }

    public void setHappenStartTime(String happenStartTime) {
        happenStartTime = happenStartTime + " " + "00:00:00";
        this.happenStartTime = happenStartTime;
    }

    public String getHappenEndTime() {
        return happenEndTime;
    }

    public void setHappenEndTime(String happenEndTime) {
        happenEndTime = happenEndTime + " " +"00:00:00";

        this.happenEndTime = happenEndTime;
    }

    private String happenEndTime;
//    private String happenEndTime;

    public String getApplyApart() {
        return applyApart;
@@ -63,13 +46,13 @@
        this.startTime = startTime;
    }

//    public String getEndTime() {
//        return endTime;
//    }
//
//    public void setEndTime(String endTime) {
//        this.endTime = endTime;
//    }
    public String getEndTime() {
        return endTime;
    }

    public void setEndTime(String endTime) {
        this.endTime = endTime;
    }

    public String getPlace() {
        return place;
@@ -87,9 +70,8 @@
        map.put("applyApart", applyApart == null ? "" : applyApart);
        map.put("applyPerson", applyPerson == null ? "" : applyPerson);

        map.put("happenStartTime", happenStartTime == null ? "" : happenStartTime);
        map.put("happenEndTime", happenEndTime == null ? "" : happenEndTime);
//        map.put("endTime", endTime == null ? "" : endTime);

        map.put("endTime", endTime == null ? "" : endTime);
        map.put("startTime", startTime == null ? "" : startTime);
        map.put("pageNum", pageNum);
        map.put("pageSize", pageSize);

 app/src/main/java/com/application/zhangshi_app_android/bean/WebbackBean.java

@@ -59,100 +59,6 @@

    private String endTime;

    private String date1 ;
    private String time1 ;

    public String getDate1() {
        date1 = null;
        String data = getStartTime();
        if (data!= null && !data.isEmpty()){
            String[] parts = data.split(" ");
            date1 = parts[0];
        }
        return date1;
    }

    public void setDate1(String date1) {
        this.date1 = date1;
    }

    public String getTime1() {
        time1 = null;
        String data = getStartTime();
        if (data!= null && !data.isEmpty()){
            String[] parts = data.split(" ");
            String hour = "00";
            String min = "00";
            String second = "00";

            if(parts.length>1){
                String time = parts[1];

                String[] parts2 = time.split(":");
                if(parts2.length>1){
                    hour = parts2[0];
                    min = parts2[1];
                    second = parts2[3];
                    time1 = hour +":" + min+":"+second;
                }
            }else{
                time1 ="00:00:00";
            }
        }
        return time1;
    }

    public void setTime1(String time1) {
        this.time1 = time1;
    }

    private String date2;
    private String time2;

    public String getDate2() {
        date2 = null;
        String data = getEndTime();
        if (data!= null && !data.isEmpty()){
            String[] parts = data.split(" ");
            date2 = parts[0];
        }
        return date2;
    }

    public void setDate2(String date2) {
        this.date2 = date2;
    }

    public String getTime2() {
        time2 = null;
        String data = getEndTime();
        if (data!= null && !data.isEmpty()){
            String[] parts = data.split(" ");
            String hour = "00";
            String min = "00";
            String second = "00";

            if(parts.length>1){
                String time = parts[1];

                String[] parts2 = time.split(":");
                if(parts2.length>1){
                    hour = parts2[0];
                    min = parts2[1];
                    second = parts2[3];
                    time2 = hour +":" + min+":"+second;
                }
            }else{
                time2 ="00:00:00";
            }
        }
        return time2;
    }

    public void setTime2(String time2) {
        this.time2 = time2;
    }

    public String getPageSize() {
        return pageSize;
    }

 app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingDetailActivity.java

@@ -29,19 +29,14 @@
import com.application.zhangshi_app_android.bean.MeetingBean;
import com.application.zhangshi_app_android.databinding.ActivityMeetingDetailBinding;
import com.application.zhangshi_app_android.ui.DLBaseActivity;
import com.github.gzuliyujiang.wheelpicker.DatePicker;
import com.github.gzuliyujiang.wheelpicker.OptionPicker;
import com.github.gzuliyujiang.wheelpicker.TimePicker;
import com.github.gzuliyujiang.wheelpicker.contract.OnDatePickedListener;
import com.github.gzuliyujiang.wheelpicker.contract.OnOptionPickedListener;
import com.github.gzuliyujiang.wheelpicker.contract.OnTimePickedListener;
import com.luck.picture.lib.entity.LocalMedia;
import com.luck.picture.lib.interfaces.OnResultCallbackListener;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;


/**
@@ -172,76 +167,22 @@
        }


        // 显示日期选择器和时间选择器的方法
//        public void showDateTimePicker() {
//            DatePickerDialog pickerDialog = new DatePickerDialog(this, (view, year, monthOfYear, dayOfMonth) -> {
//                TimePickerDialog timePickerDialog = new TimePickerDialog(this, (view1, hourOfDay, minute) -> {
//                    String date = String.format(Locale.CHINA, "%d-%02d-%02d", year, monthOfYear + 1, dayOfMonth);
//                    String time = String.format(Locale.CHINA, "%02d:%02d", hourOfDay, minute);
//                    String starttime = date + " " + time;
//                    binding.etStartTime.setText(starttime);
//                }, 0, 0, true);
//                timePickerDialog.setTitle("选择时间");
//                timePickerDialog.show();
//            }, Calendar.getInstance().get(Calendar.YEAR), Calendar.getInstance().get(Calendar.MONTH), Calendar.getInstance().get(Calendar.DAY_OF_MONTH));
//            pickerDialog.setTitle("选择日期");
//            pickerDialog.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.etDate2.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.etDate2.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();
            }
        });




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




 app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingStaActivity.java

@@ -373,17 +373,7 @@

    }

//    private  static  final String TAG = "Meeting123";
//    @Override
//    protected void onCreate(Bundle savedInstanceState){
//        super.onCreate(savedInstanceState);
//        setContentView(R.layout.activity_meeting);
//        MeetingBean data = new MeetingBean();
//        String b = String.valueOf(data.getDate1());
//        String c = String.valueOf(data.getTime1());
//        String d = String.valueOf(data.getStartTime());
//        Log.d(TAG,b+c+d);
//    }



}

 app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingStaDetailActivity.java

@@ -75,7 +75,7 @@
//                viewModel.getBeanLiveData().setValue(bean);
//            }
//        });
////        binding.rvImage.setAdapter(adapter);
//        binding.rvImage.setAdapter(adapter);
//        if (type == 1){
//            viewModel.getTypeLiveData().setValue(true);
//            binding.titleBar.setTitle("新增家大事记");

 app/src/main/java/com/application/zhangshi_app_android/ui/function/MeetingapproveDetailActivity.java

@@ -186,76 +186,116 @@
        }



        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() {
                picker2.setOnTimePickedListener(new OnTimePickedListener() {
            @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);
                    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();
//            }
//        });





 app/src/main/java/com/application/zhangshi_app_android/ui/function/WebbackActivityViewModel.java

@@ -12,6 +12,7 @@
import com.android.app_base.base.StateViewEnum;
import com.android.app_base.base.viewmodel.BaseViewModel;
import com.android.app_base.http.ResultData;
import com.android.app_base.utils.DateTimeConverter;
import com.android.app_base.utils.RxUtils;
import com.android.app_base.utils.Utils;
import com.application.zhangshi_app_android.bean.PageResponseBean;
@@ -336,8 +337,8 @@
        if (b) {
            // 从新到旧，null排最后
            list.sort((o1, o2) -> {
                String happenTime1 = o1.getDate1();
                String happenTime2 = o2.getDate2();
                String happenTime1 = DateTimeConverter.dateFromString(o1.getStartTime());
                String happenTime2 = DateTimeConverter.dateFromString(o2.getEndTime());
                if (TextUtils.isEmpty(happenTime1) && TextUtils.isEmpty(happenTime2)) {
                    return 0;
                } else if (TextUtils.isEmpty(happenTime1)) {
@@ -356,8 +357,8 @@
        } else  {
            // 从旧到新，null排最前
            list.sort((o1, o2) -> {
                String happenTime1 = o1.getDate1();
                String happenTime2 = o2.getDate2();
                String happenTime1 = DateTimeConverter.dateFromString(o1.getStartTime());
                String happenTime2 = DateTimeConverter.dateFromString(o2.getEndTime());
                if (TextUtils.isEmpty(happenTime1) && TextUtils.isEmpty(happenTime2)) {
                    return 0;
                } else if (TextUtils.isEmpty(happenTime1)) {

 app/src/main/java/com/application/zhangshi_app_android/ui/function/WebbackDetailActivityViewModel.java

@@ -26,284 +26,6 @@
        return DataRepository.getInstance();
    }

    /**
     * 增加家大事记
     */
//    public void add() {
//        if (uploadFileList.size() > 0) {
//            List<Observable<String>> observables = new ArrayList<>();
//            for (String path : uploadFileList) {
//                File file = new File(path);
//                RequestBody requestBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
//                MultipartBody.Part body = MultipartBody.Part.createFormData("uploadFile", file.getName(), requestBody);
//                Observable<String> uploadObservable = model.uploadFile(body)
//                        .flatMap(new Function<ResultData<UploadFileResponseBean>, ObservableSource<String>>() {
//                            @Override
//                            public ObservableSource<String> apply(ResultData<UploadFileResponseBean> resultData) throws Exception {
//                                if (resultData.getCode() == CODE_SUCCESS) {
//                                    WebbackBean bean = getBeanLiveData().getValue();
//                                    if (bean != null) {
//                                        String urls = bean.getUrl();
//                                        //替换图片地址
//                                        urls = urls.replace(path, resultData.getData().getUrl());
//                                        bean.setUrl(urls);
//                                        getBeanLiveData().postValue(bean);
//                                    }
//                                    return Observable.just(path);
//                                } else {
//                                    return Observable.error(new Exception(resultData.getMsg()));
//                                }
//                            }
//                        });
//
//                observables.add(uploadObservable);
//            }
//            Observable.zip(observables, result -> result)
//                    .flatMap(new Function<Object[], Observable<ResultData<String>>>() {
//                        @Override
//                        public Observable<ResultData<String>> apply(Object[] objects) throws Exception {
//                            //移除已经上传的文件
//                            //把objects数组转换成list，然后移除
//                            for (Object object : objects) {
//                                uploadFileList.remove((String) object);
//                            }
//                            return model.addWebback(beanLiveData.getValue());
//                        }
//                    })
//                    .doOnSubscribe(new Consumer<Disposable>() {
//                        @Override
//                        public void accept(Disposable disposable) throws Exception {
//                            changeStateView(StateViewEnum.DIALOG_LOADING);
//                        }
//                    })
//                    .doFinally(new Action() {
//                        @Override
//                        public void run() throws Exception {
//                            changeStateView(StateViewEnum.DIALOG_DISMISS);
//                        }
//                    })
//                    .compose(RxUtils.schedulersTransformer())
//                    .subscribe(new Observer<ResultData<String>>() {
//                        @Override
//                        public void onSubscribe(Disposable d) {
//                            addSubscribe(d);
//                        }
//
//                        @Override
//                        public void onNext(ResultData<String> stringResultData) {
//                            if (stringResultData.getCode() == CODE_SUCCESS) {
//                                AppManager.getAppManager().finishCurrentActivity();
//                                RxBus.getInstance().post(beanLiveData.getValue());
//                                messageLiveData.postValue("添加成功");
//                            } else {
//                                messageLiveData.postValue(stringResultData.getMsg());
//                            }
//                        }
//
//                        @Override
//                        public void onError(Throwable e) {
//                            messageLiveData.postValue(e.getMessage());
//                        }
//
//                        @Override
//                        public void onComplete() {
//
//                        }
//                    });
//        }else {
//            model.addMeeting(beanLiveData.getValue())
//                    .compose(RxUtils.schedulersTransformer())
//                    .subscribe(new Observer<ResultData<String>>() {
//                        @Override
//                        public void onSubscribe(Disposable d) {
//                            addSubscribe(d);
//                        }
//
//                        @Override
//                        public void onNext(ResultData<String> stringResultData) {
//                            if (stringResultData.getCode() == CODE_SUCCESS) {
//                                AppManager.getAppManager().finishCurrentActivity();
//                                RxBus.getInstance().post(beanLiveData.getValue());
//                                messageLiveData.postValue("添加成功");
//                            } else {
//                                messageLiveData.postValue(stringResultData.getMsg());
//                            }
//                        }
//
//                        @Override
//                        public void onError(Throwable e) {
//                            messageLiveData.postValue(e.getMessage());
//                        }
//
//                        @Override
//                        public void onComplete() {
//
//                        }
//                    });
//        }
//    }
    /**
     * 删除家大事记
     */
//    public void delete() {
//        model.deleteMeeting(String.valueOf(beanLiveData.getValue().getId()))
//                .compose(RxUtils.schedulersTransformer())
//                .subscribe(new Observer<ResultData<String>>() {
//                    @Override
//                    public void onSubscribe(Disposable d) {
//                        addSubscribe(d);
//                    }
//
//                    @Override
//                    public void onNext(ResultData<String> stringResultData) {
//                        if (stringResultData.getCode() == CODE_SUCCESS){
//                            AppManager.getAppManager().finishCurrentActivity();
//                            RxBus.getInstance().post(beanLiveData.getValue());
//                            messageLiveData.postValue("删除成功");
//                        }else {
//                            messageLiveData.postValue(stringResultData.getMsg());
//                        }
//                    }
//
//                    @Override
//                    public void onError(Throwable e) {
//                        messageLiveData.postValue(e.getMessage());
//                    }
//
//                    @Override
//                    public void onComplete() {
//
//                    }
//                });
//    }
    /**
     * 编辑家大事记
     */
//    public void update() {
//        if (uploadFileList.size() > 0){
//            List<Observable<String>> observables = new ArrayList<>();
//            for (String path : uploadFileList) {
//                File file = new File(path);
//                RequestBody requestBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
//                MultipartBody.Part body = MultipartBody.Part.createFormData("uploadFile", file.getName(), requestBody);
//                Observable<String> uploadObservable = model.uploadFile(body)
//                        .flatMap(new Function<ResultData<UploadFileResponseBean>, ObservableSource<String>>() {
//                            @Override
//                            public ObservableSource<String> apply(ResultData<UploadFileResponseBean> resultData) throws Exception {
//                                if (resultData.getCode() == CODE_SUCCESS){
//                                    MeetingBean bean = getBeanLiveData().getValue();
//                                    if (bean != null){
//                                        String urls = bean.getUrl();
//                                        //替换图片地址
//                                        urls = urls.replace(path,resultData.getData().getUrl());
//                                        bean.setUrl(urls);
//                                        getBeanLiveData().postValue(bean);
//                                    }
//                                    return Observable.just(path);
//                                }else {
//                                    return Observable.error(new Exception(resultData.getMsg()));
//                                }
//                            }
//                        });
//
//                observables.add(uploadObservable);
//            }
//            Observable.zip(observables,result -> result)
//                    .flatMap(new Function<Object[], Observable<ResultData<String>>>() {
//                        @Override
//                        public Observable<ResultData<String>> apply(Object[] objects) throws Exception {
//                            //移除已经上传的文件
//                            //把objects数组转换成list，然后移除
//                            for (Object object : objects) {
//                                uploadFileList.remove((String) object);
//                            }
//                            return model.updateMeeting(beanLiveData.getValue());
//                        }
//                    })
//                    .doOnSubscribe(new Consumer<Disposable>() {
//                        @Override
//                        public void accept(Disposable disposable) throws Exception {
//                            changeStateView(StateViewEnum.DIALOG_LOADING);
//                        }
//                    })
//                    .doFinally(new Action() {
//                        @Override
//                        public void run() throws Exception {
//                            changeStateView(StateViewEnum.DIALOG_DISMISS);
//                        }
//                    })
//                    .compose(RxUtils.schedulersTransformer())
//                    .subscribe(new Observer<ResultData<String>>() {
//                        @Override
//                        public void onSubscribe(Disposable d) {
//                            addSubscribe(d);
//                        }
//
//                        @Override
//                        public void onNext(ResultData<String> stringResultData) {
//                            if (stringResultData.getCode() == CODE_SUCCESS){
//                                AppManager.getAppManager().finishCurrentActivity();
//                                RxBus.getInstance().post(beanLiveData.getValue());
//                                messageLiveData.postValue("修改成功");
//                            }else {
//                                messageLiveData.postValue(stringResultData.getMsg());
//                            }
//                        }
//
//                        @Override
//                        public void onError(Throwable e) {
//                            messageLiveData.postValue(e.getMessage());
//                        }
//
//                        @Override
//                        public void onComplete() {
//
//                        }
//                    });
//        }else {
//            model.updateMeeting(beanLiveData.getValue())
//                    .compose(RxUtils.schedulersTransformer())
//                    .subscribe(new Observer<ResultData<String>>() {
//                        @Override
//                        public void onSubscribe(Disposable d) {
//                            addSubscribe(d);
//                        }
//
//                        @Override
//                        public void onNext(ResultData<String> stringResultData) {
//                            if (stringResultData.getCode() == CODE_SUCCESS){
//                                AppManager.getAppManager().finishCurrentActivity();
//                                RxBus.getInstance().post(beanLiveData.getValue());
//                                messageLiveData.postValue("修改成功");
//                            }else {
//                                messageLiveData.postValue(stringResultData.getMsg());
//                            }
//                        }
//
//                        @Override
//                        public void onError(Throwable e) {
//
//
//
//
//
//
//
//
//
//
//
//                            messageLiveData.postValue(e.getMessage());
//                        }
//
//                        @Override
//                        public void onComplete() {
//
//                        }
//                    });
//        }
//
//    }

    public MutableLiveData<WebbackBean> getBeanLiveData() {
        if (beanLiveData == null){

 app/src/main/java/com/application/zhangshi_app_android/ui/function/WebcastActivityViewModel.java

@@ -12,6 +12,7 @@
import com.android.app_base.base.StateViewEnum;
import com.android.app_base.base.viewmodel.BaseViewModel;
import com.android.app_base.http.ResultData;
import com.android.app_base.utils.DateTimeConverter;
import com.android.app_base.utils.RxUtils;
import com.android.app_base.utils.Utils;
import com.application.zhangshi_app_android.bean.PageResponseBean;
@@ -336,8 +337,8 @@
        if (b) {
            // 从新到旧，null排最后
            list.sort((o1, o2) -> {
                String happenTime1 = o1.getDate1();
                String happenTime2 = o2.getDate2();
                String happenTime1 = DateTimeConverter.dateFromString(o1.getStartTime());
                String happenTime2 = DateTimeConverter.dateFromString(o2.getEndTime());
                if (TextUtils.isEmpty(happenTime1) && TextUtils.isEmpty(happenTime2)) {
                    return 0;
                } else if (TextUtils.isEmpty(happenTime1)) {
@@ -356,8 +357,8 @@
        } else  {
            // 从旧到新，null排最前
            list.sort((o1, o2) -> {
                String happenTime1 = o1.getDate1();
                String happenTime2 = o2.getDate2();
                String happenTime1 = DateTimeConverter.dateFromString(o1.getStartTime());
                String happenTime2 = DateTimeConverter.dateFromString(o2.getEndTime());
                if (TextUtils.isEmpty(happenTime1) && TextUtils.isEmpty(happenTime2)) {
                    return 0;
                } else if (TextUtils.isEmpty(happenTime1)) {

 app/src/main/java/com/application/zhangshi_app_android/ui/function/WebcastDetailActivity.java

@@ -47,7 +47,7 @@
/**
 * @author Gss
 * @date 2023.03.25. 16:00
 * @desc 家大事记 WebcastDetailActivity
 * @desc 直播申请 WebcastDetailActivity
 */
public class WebcastDetailActivity extends DLBaseActivity<ActivityWebcastDetailBinding, WebcastDetailActivityViewModel> {
    private int type;// 0 查看可修改删除 1 新增 2 直接修改
@@ -152,7 +152,7 @@
        binding.rvImage.setAdapter(adapter);
        if (type == 1){
            viewModel.getTypeLiveData().setValue(true);
            binding.titleBar.setTitle("新增家大事记");
            binding.titleBar.setTitle("新增直播申请");
            binding.ivOperate.setOnClickListener(v -> {
                viewModel.add();
            });

 app/src/main/java/com/application/zhangshi_app_android/ui/function/WebcastDetailActivityViewModel.java

@@ -47,7 +47,7 @@
    }

    /**
     * 增加家大事记
     * 增加直播申请
     */
    public void add() {
        if (uploadFileList.size() > 0) {

 app/src/main/res/layout/activity_meeting.xml

@@ -5,6 +5,7 @@
    >
    <data>
        <import type="android.view.View"/>
        <import type="com.android.app_base.utils.DateTimeConverter"/>
        <variable
            name="viewModel"
            type="com.application.zhangshi_app_android.ui.function.MeetingActivityViewModel"/>
@@ -224,7 +225,7 @@
                            android:layout_height="wrap_content"
                            android:gravity="center"
                            android:layout_marginStart="6dp"
                            android:text="@={viewModel.requestBeanLiveData.happenStartTime}"
                            android:text="@={DateTimeConverter.dateFromString(viewModel.requestBeanLiveData.startTime)}"
                            android:hint="开始时间"
                            android:textColorHint="#61000000"
                            android:textColor="#FF333333"
@@ -247,7 +248,7 @@
                            android:layout_weight="1"
                            android:gravity="center"
                            android:layout_height="wrap_content"
                            android:text="@={viewModel.requestBeanLiveData.happenEndTime}"
                            android:text="@={DateTimeConverter.dateFromString(viewModel.requestBeanLiveData.endTime)}"
                            android:hint="结束时间"
                            android:textColorHint="#61000000"
                            android:textColor="#FF333333"

 app/src/main/res/layout/activity_meeting_approve.xml

@@ -5,6 +5,7 @@
    >
    <data>
        <import type="android.view.View"/>
        <import type="com.android.app_base.utils.DateTimeConverter"/>
        <variable
            name="viewModel"
            type="com.application.zhangshi_app_android.ui.function.MeetingapproveActivityViewModel"/>
@@ -224,7 +225,7 @@
                            android:layout_height="wrap_content"
                            android:gravity="center"
                            android:layout_marginStart="6dp"
                            android:text="@={viewModel.requestBeanLiveData.happenStartTime}"
                            android:text="@={DateTimeConverter.dateFromString(viewModel.requestBeanLiveData.startTime)}"
                            android:hint="开始时间"
                            android:textColorHint="#61000000"
                            android:textColor="#FF333333"
@@ -247,7 +248,7 @@
                            android:layout_weight="1"
                            android:gravity="center"
                            android:layout_height="wrap_content"
                            android:text="@={viewModel.requestBeanLiveData.happenEndTime}"
                            android:text="@={DateTimeConverter.dateFromString(viewModel.requestBeanLiveData.endTime)}"
                            android:hint="结束时间"
                            android:textColorHint="#61000000"
                            android:textColor="#FF333333"

 app/src/main/res/layout/activity_meeting_approve_detail.xml

@@ -187,38 +187,18 @@
                    >

                    <EditText
                        android:id="@+id/et_date1"
                        android:id="@+id/et_start_time"
                        android:layout_width="0dp"
                        android:layout_weight="1"
                        android:layout_height="wrap_content"
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入开始时间的年月日`:``}"
                        android:hint="@{viewModel.typeLiveData?`请输入开始时间`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.date1}"
                        android:text="@={viewModel.beanLiveData.startTime}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"
                        app:isEditable="@{false}" />
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text=" "
                        />
                    <EditText
                        android:id="@+id/et_time1"
                        android:layout_width="0dp"
                        android:layout_weight="1"
                        android:layout_height="wrap_content"
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入开始时间的时分秒`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.time1}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"
                        app:isEditable="@{false}" />


                </LinearLayout>


@@ -239,38 +219,18 @@
                    >

                    <EditText
                        android:id="@+id/et_date2"
                        android:id="@+id/et_end_time"
                        android:layout_width="0dp"
                        android:layout_weight="1"
                        android:layout_height="wrap_content"
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入结束时间的年月日`:``}"
                        android:hint="@{viewModel.typeLiveData?`请输入结束时间`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.date2}"
                        android:text="@={viewModel.beanLiveData.endTime}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"
                        app:isEditable="@{false}" />
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text=" "
                        />
                    <EditText
                        android:id="@+id/et_time2"
                        android:layout_width="0dp"
                        android:layout_weight="1"
                        android:layout_height="wrap_content"
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入结束时间的时分秒`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.time2}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"
                        app:isEditable="@{false}" />


                </LinearLayout>

                <TextView

 app/src/main/res/layout/activity_meeting_detail.xml

@@ -4,6 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools">

    <data>
        <import type="com.android.app_base.utils.DateTimeConverter"/>
        <variable
            name="viewModel"
            type="com.application.zhangshi_app_android.ui.function.MeetingDetailActivityViewModel" />
@@ -185,38 +186,20 @@
                    android:textColor="#DE000000"
                    android:textSize="16sp"
                    >
                    <EditText
                        android:id="@+id/et_start_time"
                        android:layout_width="0dp"
                        android:layout_weight="1"
                        android:layout_height="wrap_content"
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入开始时间`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.startTime}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"
                        app:isEditable="@{false}" />

                    <EditText
                        android:id="@+id/et_date1"
                        android:layout_width="0dp"
                        android:layout_weight="1"
                        android:layout_height="wrap_content"
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入开始时间的年月日`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.date1}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"
                        app:isEditable="@{false}" />
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text=" "
                        />
                    <EditText
                        android:id="@+id/et_time1"
                        android:layout_width="0dp"
                        android:layout_weight="1"
                        android:layout_height="wrap_content"
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入开始时间的时分秒`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.time1}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"
                        app:isEditable="@{false}" />


                </LinearLayout>
@@ -239,38 +222,18 @@
                    >

                    <EditText
                        android:id="@+id/et_date2"
                        android:id="@+id/et_end_time"
                        android:layout_width="0dp"
                        android:layout_weight="1"
                        android:layout_height="wrap_content"
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入结束时间的年月日`:``}"
                        android:hint="@{viewModel.typeLiveData?`请输入结束时间`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.date2}"
                        android:text="@={viewModel.beanLiveData.endTime}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"
                        app:isEditable="@{false}" />
                    <TextView
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:text=" "
                        />
                    <EditText
                        android:id="@+id/et_time2"
                        android:layout_width="0dp"
                        android:layout_weight="1"
                        android:layout_height="wrap_content"
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入结束时间的时分秒`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.time2}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"
                        app:isEditable="@{false}" />


                </LinearLayout>

                <TextView

 app/src/main/res/layout/activity_webback_detail.xml

@@ -4,6 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools">

    <data>
        <import type="com.android.app_base.utils.DateTimeConverter"/>
        <variable
            name="viewModel"
            type="com.application.zhangshi_app_android.ui.function.WebbackDetailActivityViewModel" />
@@ -157,7 +158,7 @@
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入开始时间的年月日`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.date1}"
                        android:text="@={DateTimeConverter.dateFromString(viewModel.beanLiveData.startTime)}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"
@@ -175,7 +176,7 @@
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入开始时间的时分秒`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.time1}"
                        android:text="@={DateTimeConverter.timeFromString(viewModel.beanLiveData.startTime)}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"
@@ -209,7 +210,7 @@
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入结束时间的年月日`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.date2}"
                        android:text="@={DateTimeConverter.dateFromString(viewModel.beanLiveData.endTime)}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"
@@ -227,7 +228,7 @@
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入结束时间的时分秒`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.time2}"
                        android:text="@={DateTimeConverter.timeFromString(viewModel.beanLiveData.endTime)}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"

 app/src/main/res/layout/activity_webcast.xml

@@ -5,6 +5,7 @@
    >
    <data>
        <import type="android.view.View"/>
        <import type="com.android.app_base.utils.DateTimeConverter"/>
        <variable
            name="viewModel"
            type="com.application.zhangshi_app_android.ui.function.WebcastActivityViewModel"/>
@@ -224,7 +225,7 @@
                            android:layout_height="wrap_content"
                            android:gravity="center"
                            android:layout_marginStart="6dp"
                            android:text="@={viewModel.requestBeanLiveData.startTime}"
                            android:text="@={DateTimeConverter.dateFromString(viewModel.requestBeanLiveData.startTime)}"
                            android:hint="开始时间"
                            android:textColorHint="#61000000"
                            android:textColor="#FF333333"
@@ -247,7 +248,7 @@
                            android:layout_weight="1"
                            android:gravity="center"
                            android:layout_height="wrap_content"
                            android:text="@={viewModel.requestBeanLiveData.endTime}"
                            android:text="@={DateTimeConverter.dateFromString(viewModel.requestBeanLiveData.endTime)}"
                            android:hint="结束时间"
                            android:textColorHint="#61000000"
                            android:textColor="#FF333333"

 app/src/main/res/layout/activity_webcast_detail.xml

@@ -4,6 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools">

    <data>
        <import type="com.android.app_base.utils.DateTimeConverter"/>
        <variable
            name="viewModel"
            type="com.application.zhangshi_app_android.ui.function.WebcastDetailActivityViewModel" />
@@ -157,7 +158,7 @@
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入开始时间的年月日`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.date1}"
                        android:text="@={DateTimeConverter.dateFromString(viewModel.beanLiveData.startTime)}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"
@@ -175,7 +176,7 @@
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入开始时间的时分秒`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.time1}"
                        android:text="@={DateTimeConverter.timeFromString(viewModel.beanLiveData.startTime)}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"
@@ -209,7 +210,7 @@
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入结束时间的年月日`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.date2}"
                        android:text="@={DateTimeConverter.dateFromString(viewModel.beanLiveData.endTime)}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"
@@ -227,7 +228,7 @@
                        android:enabled="@{viewModel.typeLiveData}"
                        android:hint="@{viewModel.typeLiveData?`请输入结束时间的时分秒`:``}"
                        android:inputType="text"
                        android:text="@={viewModel.beanLiveData.time2}"
                        android:text="@={DateTimeConverter.timeFromString(viewModel.beanLiveData.endTime)}"
                        android:textColor="#DE000000"
                        android:textColorHint="#6b000000"
                        android:textSize="16sp"