From 31de6330048e4e0db3518c280a443a7af76905b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=AB=A0=E6=96=87=E8=BD=A9?= <12812285557@qq.com>
Date: Mon, 6 Jun 2022 09:58:50 +0800
Subject: [PATCH] fix null bug

---
 .idea/workspace.xml            |  4 +---
 lib/utils/solar_term_util.dart | 11 +++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 43fb2ca..ef0feda 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,9 +10,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="18463f0e-cf10-4ee2-975b-376476396e12" name="Default Changelist" comment="Default Changelist">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/model/date_model.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/model/date_model.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/utils/lunar_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/utils/lunar_util.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/utils/solar_term_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/utils/solar_term_util.dart" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/lib/utils/solar_term_util.dart b/lib/utils/solar_term_util.dart
index 4a36fe9..0cab5a3 100644
--- a/lib/utils/solar_term_util.dart
+++ b/lib/utils/solar_term_util.dart
@@ -2001,7 +2001,7 @@ class SolarTermUtil {
    */
   static List<double> earCal(double jd) {
     EnnT = jd / 365250;
-    List<double> llr = [];
+    List<double> llr = [0,0,0];
     double t1 = EnnT, t2 = t1 * t1, t3 = t2 * t1, t4 = t3 * t1, t5 = t4 * t1;
     llr[0] = Enn(E10) +
         Enn(E11) * t1 +
@@ -2045,7 +2045,7 @@ class SolarTermUtil {
   static List<double?> moonCoord(double julian) {
     MnnT = julian / 36525;
     double t1 = MnnT, t2 = t1 * t1, t3 = t2 * t1, t4 = t3 * t1;
-    List<double?> llr = [];
+    List<double?> llr = [0,0,0];
     llr[0] = (Mnn(M10) + Mnn(M11) * t1 + Mnn(M12) * t2) / SECOND_PER_RAD;
     llr[1] = (Mnn(M20) + Mnn(M21) * t1) / SECOND_PER_RAD;
     llr[2] = (Mnn(M30) + Mnn(M31) * t1) * 0.999999949827;
@@ -2125,6 +2125,9 @@ class SolarTermUtil {
 
   static List<String?> getSolarTerms(int year) {
     List<String?> solarTerms = [];
+    for(int i=0;i<24;i++){
+      solarTerms.add('');
+    }
     List<String?> preOffset = getSolarTermsPreOffset(year - 1);
     List<String?> nextOffset = getSolarTermsNextOffset(year - 1);
     System.arraycopy(preOffset, 0, solarTerms, 0, preOffset.length);
@@ -2148,7 +2151,7 @@ class SolarTermUtil {
    * @return 返回 立春 雨水 惊蛰
    */
   static List<String?> getSolarTermsPreOffset(int year) {
-    List<String?> solarTerms = [];
+    List<String?> solarTerms = ['','',''];
     double jd = 365.2422 * (year - 2000), q;
     for (int i = 21; i < 24; i++) {
       q = getTimeFromAngle(jd + i * 15.2, i * 15.toDouble(), 0);
@@ -2166,7 +2169,7 @@ class SolarTermUtil {
    * @return 返回 小寒大寒
    */
   static List<String?> getSolarTermsNextOffset(int year) {
-    List<String?> solarTerms = [];
+    List<String?> solarTerms = ['',''];
     double jd = 365.2422 * (year - 2000), q;
     for (int i = 19; i < 21; i++) {
       q = getTimeFromAngle(jd + i * 15.2, i * 15.toDouble(), 0);