xt / Flutter-ReserveApp · Commits

Go to a project

Commit a366ea84e480324f06574e74f8943249cf7b8ae1

Authored by weixin_45529955
1 parent fee48158
build: skipped

农历润月暂时转换成非润月保存

Inline Side-by-side
Showing 3 changed files with 83 additions and 38 deletions
... ... @@ -1119,8 +1119,7 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
}
return Padding(
padding:
EdgeInsets.symmetric(vertical: w(10)),
padding: EdgeInsets.only(top: w(12)),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
... ...
... ... @@ -253,9 +253,9 @@ class _FestivalEditPageState extends State<FestivalEditPage> {
title: "",
content: "是否删除该纪念日",
rTitle: "删除", rCallback: () {
if (Navigator.canPop(context)) {
Navigator.pop(context);
}
// if (Navigator.canPop(context)) {
// Navigator.pop(context);
// }
_delGuestInfocDay(model.cday![index].id);
});
}, onTapEdit: () {
... ...
... ... @@ -12006,23 +12006,48 @@ class DialogUtil {
stateSetter(() {
gongli = !gongli;
});
if (dayStr != '') {
List dayList = updateDay(
gongli,
yearStr == '选填'
? DateTime.now().year.toString()
: yearStr,
monthStr == ''
? DateTime.now()
.month
.toString()
: monthStr);
if (!dayList.contains(dayStr)) {
stateSetter(() {
dayStr = '';
});
}
}
// 把农历转换成公历
int mLeapMonth =
LunarCalendarUtil.leapMonth(
int.parse(yearStr!));
List<int?> time =
LunarCalendarUtil.lunarToSolar(
int.parse(yearStr!),
int.parse(monthStr!),
int.parse(dayStr!),
mLeapMonth ==
int.parse(monthStr!));
yearStr = time[0]!.toString();
monthStr = time[1]!.toString();
dayStr = time[2]!.toString();
show = (yearStr ?? '') +
'年' +
(monthStr ?? '') +
'月' +
(dayStr ?? '') +
'日';
stateSetter(() {});
// if (dayStr != '') {
// List dayList = updateDay(
// gongli,
// yearStr == '选填'
// ? DateTime.now().year.toString()
// : yearStr,
// monthStr == ''
// ? DateTime.now()
// .month
// .toString()
// : monthStr);
// if (!dayList.contains(dayStr)) {
// stateSetter(() {
// dayStr = '';
// });
// }
// }
},
child: Container(
padding: EdgeInsets.symmetric(
... ... @@ -12057,21 +12082,42 @@ class DialogUtil {
stateSetter(() {
gongli = !gongli;
});
if (dayStr != '') {
List dayList = updateDay(
gongli,
yearStr == '选填'
? DateTime.now().year.toString()
: yearStr,
monthStr == ''
? DateTime.now().month.toString()
: monthStr);
if (!dayList.contains(dayStr)) {
stateSetter(() {
dayStr = '';
});
}
}
// 获取当前阴历
Lunar currentLunarTime =
Solar.fromDate(now).getLunar();
yearStr =
currentLunarTime.getYear().toString();
monthStr =
currentLunarTime.getMonth().toString();
dayStr =
currentLunarTime.getDay().toString();
//转换成农历
show = (yearStr ?? '') +
'年' +
LunarCalendarUtil.formatLunarDate(
int.parse(monthStr!),
int.parse(dayStr!));
print(show);
stateSetter(() {});
// if (dayStr != '') {
// List dayList = updateDay(
// gongli,
// yearStr == '选填'
// ? DateTime.now().year.toString()
// : yearStr,
// monthStr == ''
// ? DateTime.now().month.toString()
// : monthStr);
// if (!dayList.contains(dayStr)) {
// stateSetter(() {
// dayStr = '';
// });
// }
// }
},
child: Container(
padding: EdgeInsets.symmetric(
... ... @@ -12150,7 +12196,7 @@ class DialogUtil {
.getYear()
.toString();
monthStr = currentLunarTime
.getMonth()
.getMonth().abs()
.toString();
dayStr = currentLunarTime
.getDay()
... ...