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

guoshen

2024-07-01 caead5ad019c24b9a7958f01fa663ea8159aee6c

 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)) {