Skip to content

对分钟的影响 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HenryGaoGH wants to merge 2 commits into
base: master
Choose a base branch
from
Open

对分钟的影响 #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d7eb14
append hours & minutes to updated when day is changed
HenryGaoGH May 6, 2024
a73859a
更新 对分钟的影响
HenryGaoGH May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 41 additions & 1 deletion lib/time_picker/route/date_picker_route.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ class _PickerState extends State<_PickerContentView> {
_setMonth();
break;
case DateType.Day:
_setDay();
break;
case DateType.Hour:
_setHour();
Expand Down Expand Up @@ -540,6 +541,40 @@ class _PickerState extends State<_PickerContentView> {
}
}

void _setDay() {
/// 小时的变化
if (_dateItemModel.hour) {
int index = 0;
int begin = 0;
int end = 23;
// 限制区域
if (intNotEmpty(minDate.hour)) {
begin = minDate.hour!;
}
if (intNotEmpty(maxDate.hour) &&
_selectData.year == maxDate.year &&
_selectData.month == maxDate.month &&
_selectData.day == maxDate.day
) {
end = maxDate.hour!;
}

_dateTimeData.hour = TimeUtils.calcHour(begin: begin, end: end);

if (_initSelectData.hour != null) {
index = _dateTimeData.hour.indexOf(_initSelectData.hour);
index = index < 0 ? 0 : index;
}
// setState(() {
// _selectData.hour = _dateTimeData.hour[index];
// scrollCtrl[DateType.Hour] =
// FixedExtentScrollController(initialItem: index);
// });
_setHour();
_setMinute();
}
}

void _setHour() {
// 可能造成 分 秒 list的改变
if (_dateItemModel.minute) {
Expand All @@ -554,7 +589,12 @@ class _PickerState extends State<_PickerContentView> {
if (intNotEmpty(minDate.minute) && _selectData.hour == minDate.hour) {
beginMinute = minDate.minute!;
}
if (intNotEmpty(maxDate.minute) && _selectData.hour == maxDate.hour) {
if (intNotEmpty(maxDate.minute) &&
_selectData.year == maxDate.year &&
_selectData.month == maxDate.month &&
_selectData.day == maxDate.day &&
_selectData.hour == maxDate.hour
) {
endMinute = maxDate.minute!;
}

Expand Down