moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

公会流水日期筛选bugfix

Browse Source
This commit is contained in:
huangjian
2022-07-19 15:38:26 +08:00
parent 3f14871c94
commit 4fc914bad5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimePickerDialog.java
View File

@@ -45,7 +45,8 @@ public class TimePickerDialog extends DialogFragment implements View.OnClickList
private long mDayFirstTime;
private long mDayLastTime;
private boolean selectDayLastTime;
private final String defDayEndText = "结束日期";
/**
* 显示周区间
*/
@@ -125,7 +126,7 @@ public class TimePickerDialog extends DialogFragment implements View.OnClickList
if (mDayFirstTime != mDayLastTime) {
tvWeekLastDay.setText(TimeUtils.getDateTimeString(mDayLastTime, TimeUtils.DATE_FORMAT));
} else {
tvWeekLastDay.setText("结束日期");
tvWeekLastDay.setText(defDayEndText);
}
tvWeekFirstDay.setOnClickListener(v -> {
tvWeekFirstDay.setSelected(true);
@@ -175,7 +176,6 @@ public class TimePickerDialog extends DialogFragment implements View.OnClickList
mDayFirstTime = calendar.getTimeInMillis();
tvWeekFirstDay.setText(TimeUtils.getDateTimeString(mDayFirstTime, TimeUtils.DATE_FORMAT));
} else {
selectDayLastTime = true;
mDayLastTime = calendar.getTimeInMillis();
tvWeekLastDay.setText(TimeUtils.getDateTimeString(mDayLastTime, TimeUtils.DATE_FORMAT));
}
@@ -243,7 +243,7 @@ public class TimePickerDialog extends DialogFragment implements View.OnClickList
if (mTimePickerListener != null) {
if (isDay) {
if (!selectDayLastTime) {
if (defDayEndText.equals(tvWeekLastDay.getText().toString())) {
mDayLastTime = mDayFirstTime;
}
if (mDayFirstTime > mDayLastTime) {