农历生日时间戳

@@ -132,16 +132,15 @@ class Guest extends Object {
         DateTime.fromMillisecondsSinceEpoch(int.parse(nDaySelf!) * 1000);
         DateTime.fromMillisecondsSinceEpoch(int.parse(nDaySelf!) * 1000);
 
 
     // 获取当前阴历
     // 获取当前阴历
-    Lunar currentLunarTime = Solar.fromDate(time).getLunar();
-    String yearStr = currentLunarTime.getYear().toString();
-    String monthStr = currentLunarTime.getMonth().abs().toString();
-    String dayStr = currentLunarTime.getDay().toString();
+    // Lunar currentLunarTime = Solar.fromDate(time).getLunar();
+    // String yearStr = currentLunarTime.getYear().toString();
+    // String monthStr = currentLunarTime.getMonth().abs().toString();
+    // String dayStr = currentLunarTime.getDay().toString();
     //转换成农历
     //转换成农历
 
 
-    String show = (yearStr) +
+    String show = '${time.year}' +
         '年' +
         '年' +
-        LunarCalendarUtil.formatLunarDate(
-            int.parse(monthStr), int.parse(dayStr));
+        LunarCalendarUtil.formatLunarDate(time.month, time.day);
     return show;
     return show;
   }
   }
 
 

@@ -68,16 +68,15 @@ class _SetBirthdayPageState extends State<SetBirthdayPage> {
           int.parse(widget.birthdayLunar) * 1000);
           int.parse(widget.birthdayLunar) * 1000);
 
 
       // 获取当前阴历
       // 获取当前阴历
-      Lunar currentLunarTime = Solar.fromDate(time).getLunar();
-      String yearStr = currentLunarTime.getYear().toString();
-      String monthStr = currentLunarTime.getMonth().abs().toString();
-      String dayStr = currentLunarTime.getDay().toString();
+      // Lunar currentLunarTime = Solar.fromDate(time).getLunar();
+      // String yearStr = currentLunarTime.getYear().toString();
+      // String monthStr = currentLunarTime.getMonth().abs().toString();
+      // String dayStr = currentLunarTime.getDay().toString();
       //转换成农历
       //转换成农历
 
 
-      birthdayLunar = (yearStr) +
+      birthdayLunar = '${time.year}' +
           '年' +
           '年' +
-          LunarCalendarUtil.formatLunarDate(
-              int.parse(monthStr), int.parse(dayStr));
+          LunarCalendarUtil.formatLunarDate(time.month, time.day);
     }
     }
   }
   }
 
 
@@ -312,6 +311,11 @@ class _SetBirthdayPageState extends State<SetBirthdayPage> {
                     widget.birthdayLunar != '') {
                     widget.birthdayLunar != '') {
                   now = DateTime.fromMillisecondsSinceEpoch(
                   now = DateTime.fromMillisecondsSinceEpoch(
                       int.parse(widget.birthdayLunar) * 1000);
                       int.parse(widget.birthdayLunar) * 1000);
+
+                  int mLeapMonth = LunarCalendarUtil.leapMonth(now.year);
+                  List<int?> time = LunarCalendarUtil.lunarToSolar(
+                      now.year, now.month, now.day, mLeapMonth == now.month);
+                  now = DateTime(time[0]!, time[1]!, time[2]!);
                 }
                 }
                 DatePicker.showDatePicker(
                 DatePicker.showDatePicker(
                   context,
                   context,
@@ -335,11 +339,19 @@ class _SetBirthdayPageState extends State<SetBirthdayPage> {
                   onConfirm: (time, lunar) async {
                   onConfirm: (time, lunar) async {
                     debugPrint(time.toString());
                     debugPrint(time.toString());
 
 
-                    print(time.millisecondsSinceEpoch);
-                    // 请求接口，设置生日
+                    // print(time.millisecondsSinceEpoch);
+                    // // 请求接口，设置生日
+
+                    // 获取当前阴历
+                    Lunar currentLunarTime = Solar.fromDate(time).getLunar();
+                    String yearStr = currentLunarTime.getYear().toString();
+                    String monthStr =
+                        currentLunarTime.getMonth().abs().toString();
+                    String dayStr = currentLunarTime.getDay().toString();
                     String from =
                     String from =
-                        '${time.year}-${Utils.addZeroNumber(time.month)}-${Utils.addZeroNumber(time.day)}' +
+                        '${yearStr}-${Utils.addZeroNumber(int.parse(monthStr))}-${Utils.addZeroNumber(int.parse(dayStr))}' +
                             ' 00:00:00';
                             ' 00:00:00';
+
                     Map<String, String?> params = {
                     Map<String, String?> params = {
                       'id': widget.gid,
                       'id': widget.gid,
                       'n_day':
                       'n_day':
@@ -352,11 +364,11 @@ class _SetBirthdayPageState extends State<SetBirthdayPage> {
                       Utils.showToast('保存成功');
                       Utils.showToast('保存成功');
 
 
                       // 获取当前阴历
                       // 获取当前阴历
-                      Lunar currentLunarTime = Solar.fromDate(time).getLunar();
-                      String yearStr = currentLunarTime.getYear().toString();
-                      String monthStr =
-                          currentLunarTime.getMonth().abs().toString();
-                      String dayStr = currentLunarTime.getDay().toString();
+                      // Lunar currentLunarTime = Solar.fromDate(time).getLunar();
+                      // String yearStr = currentLunarTime.getYear().toString();
+                      // String monthStr =
+                      //     currentLunarTime.getMonth().abs().toString();
+                      // String dayStr = currentLunarTime.getDay().toString();
                       //转换成农历
                       //转换成农历
 
 
                       birthdayLunar = (yearStr) +
                       birthdayLunar = (yearStr) +