From 0a5ea27b20bc085c03d855f85675c00177d4b2e9 Mon Sep 17 00:00:00 2001
From: 6tail <6tail@6tail.cn>
Date: Mon, 10 Jan 2022 20:45:45 +0800
Subject: [PATCH] =?UTF-8?q?v1.2.18=20=E4=BF=AE=E5=A4=8DSolarWeek=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=BD=93=E6=9C=88=E7=AC=AC=E5=87=A0=E5=91=A8=E7=9A=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 +-
 README_EN.md                                  |  2 +-
 pom.xml                                       |  2 +-
 src/main/java/com/nlf/calendar/Lunar.java     | 55 ++++++++------
 src/main/java/com/nlf/calendar/SolarWeek.java |  7 +-
 .../java/com/nlf/calendar/eightchar/Yun.java  |  4 +-
 src/test/java/test/SolarWeekTest.java         | 74 +++++++++++++++++++
 7 files changed, 114 insertions(+), 32 deletions(-)
 create mode 100644 src/test/java/test/SolarWeekTest.java

diff --git a/README.md b/README.md
index 380a93e..611cfbf 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ lunar是一款无第三方依赖的公历(阳历)、农历(阴历、老黄历)
 <dependency>
   <groupId>cn.6tail</groupId>
   <artifactId>lunar</artifactId>
-  <version>1.2.17</version>
+  <version>1.2.18</version>
 </dependency>
 ```
 
diff --git a/README_EN.md b/README_EN.md
index fbec63d..238d238 100644
--- a/README_EN.md
+++ b/README_EN.md
@@ -12,7 +12,7 @@ lunar is a calendar library for Solar and Chinese Lunar.
 <dependency>
   <groupId>cn.6tail</groupId>
   <artifactId>lunar</artifactId>
-  <version>1.2.17</version>
+  <version>1.2.18</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 84b7fd4..4a620f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>cn.6tail</groupId>
     <artifactId>lunar</artifactId>
     <packaging>jar</packaging>
-    <version>1.2.17</version>
+    <version>1.2.18</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <url>https://github.com/6tail/lunar-java</url>
     <description>a calendar library for Solar and Chinese Lunar</description>
diff --git a/src/main/java/com/nlf/calendar/Lunar.java b/src/main/java/com/nlf/calendar/Lunar.java
index 07c6e1e..d84a4c4 100644
--- a/src/main/java/com/nlf/calendar/Lunar.java
+++ b/src/main/java/com/nlf/calendar/Lunar.java
@@ -833,16 +833,14 @@ public class Lunar {
    * @return 节令
    */
   public String getJie() {
-    String jie = "";
-    for(int i=0,j=JIE_QI_IN_USE.length;i<j;i+=2){
+    for(int i=0, j=JIE_QI_IN_USE.length; i<j; i+=2){
       String key = JIE_QI_IN_USE[i];
       Solar d = jieQi.get(key);
       if (d.getYear() == solar.getYear() && d.getMonth() == solar.getMonth() && d.getDay() == solar.getDay()) {
-        jie = key;
-        break;
+        return convertJieQi(key);
       }
     }
-    return convertJieQi(jie);
+    return "";
   }
 
   /**
@@ -851,16 +849,14 @@ public class Lunar {
    * @return 气令
    */
   public String getQi() {
-    String qi = "";
-    for(int i=1,j=JIE_QI_IN_USE.length;i<j;i+=2){
+    for(int i=1, j=JIE_QI_IN_USE.length; i<j; i+=2){
       String key = JIE_QI_IN_USE[i];
       Solar d = jieQi.get(key);
       if (d.getYear() == solar.getYear() && d.getMonth() == solar.getMonth() && d.getDay() == solar.getDay()) {
-        qi = key;
-        break;
+        return convertJieQi(key);
       }
     }
-    return convertJieQi(qi);
+    return "";
   }
 
   /**
@@ -2389,15 +2385,13 @@ public class Lunar {
    * @return 节气名称
    */
   public String getJieQi() {
-    String name = "";
     for (Map.Entry<String, Solar> jq : jieQi.entrySet()) {
       Solar d = jq.getValue();
       if (d.getYear() == solar.getYear() && d.getMonth() == solar.getMonth() && d.getDay() == solar.getDay()) {
-        name = jq.getKey();
-        break;
+        return convertJieQi(jq.getKey());
       }
     }
-    return convertJieQi(name);
+    return "";
   }
 
   /**
@@ -2406,8 +2400,13 @@ public class Lunar {
    * @return 节气对象
    */
   public JieQi getCurrentJieQi() {
-    String name = getJieQi();
-    return name.length() > 0 ? new JieQi(name, solar) : null;
+    for (Map.Entry<String, Solar> jq : jieQi.entrySet()) {
+      Solar d = jq.getValue();
+      if (d.getYear() == solar.getYear() && d.getMonth() == solar.getMonth() && d.getDay() == solar.getDay()) {
+        return new JieQi(convertJieQi(jq.getKey()), d);
+      }
+    }
+    return null;
   }
 
   /**
@@ -2416,8 +2415,14 @@ public class Lunar {
    * @return 节气对象
    */
   public JieQi getCurrentJie() {
-    String name = getJie();
-    return name.length() > 0 ? new JieQi(name, solar) : null;
+    for(int i=0, j=JIE_QI_IN_USE.length; i<j; i+=2){
+      String key = JIE_QI_IN_USE[i];
+      Solar d = jieQi.get(key);
+      if (d.getYear() == solar.getYear() && d.getMonth() == solar.getMonth() && d.getDay() == solar.getDay()) {
+        return new JieQi(convertJieQi(key), d);
+      }
+    }
+    return null;
   }
 
   /**
@@ -2426,8 +2431,14 @@ public class Lunar {
    * @return 节气对象
    */
   public JieQi getCurrentQi() {
-    String name = getQi();
-    return name.length() > 0 ? new JieQi(name, solar) : null;
+    for(int i=1, j=JIE_QI_IN_USE.length; i<j; i+=2){
+      String key = JIE_QI_IN_USE[i];
+      Solar d = jieQi.get(key);
+      if (d.getYear() == solar.getYear() && d.getMonth() == solar.getMonth() && d.getDay() == solar.getDay()) {
+        return new JieQi(convertJieQi(key), d);
+      }
+    }
+    return null;
   }
 
   public String toFullString() {
@@ -2964,10 +2975,8 @@ public class Lunar {
   public String getHou() {
     JieQi jieQi = getPrevJieQi(true);
     String name = jieQi.getName();
-    Calendar currentCalendar = ExactDate.fromYmd(solar.getYear(), solar.getMonth(), solar.getDay());
     Solar startSolar = jieQi.getSolar();
-    Calendar startCalendar = ExactDate.fromYmd(startSolar.getYear(), startSolar.getMonth(), startSolar.getDay());
-    int days = ExactDate.getDaysBetween(startCalendar, currentCalendar);
+    int days = ExactDate.getDaysBetween(startSolar.getYear(), startSolar.getMonth(), startSolar.getDay(), solar.getYear(), solar.getMonth(), solar.getDay());
     return String.format("%s %s", name, LunarUtil.HOU[(days / 5) % LunarUtil.HOU.length]);
   }
 
diff --git a/src/main/java/com/nlf/calendar/SolarWeek.java b/src/main/java/com/nlf/calendar/SolarWeek.java
index 1c399cf..991d72b 100644
--- a/src/main/java/com/nlf/calendar/SolarWeek.java
+++ b/src/main/java/com/nlf/calendar/SolarWeek.java
@@ -159,10 +159,11 @@ public class SolarWeek {
   public int getIndex() {
     Calendar c = ExactDate.fromYmd(year, month, 1);
     int firstDayWeek = c.get(Calendar.DAY_OF_WEEK) - 1;
-    if (firstDayWeek == 0) {
-      firstDayWeek = 7;
+    int offset = firstDayWeek - start;
+    if(offset < 0) {
+      offset += 7;
     }
-    return (int) Math.ceil((day + firstDayWeek - start) / 7D);
+    return (int) Math.ceil((day + offset) / 7D);
   }
 
   /**
diff --git a/src/main/java/com/nlf/calendar/eightchar/Yun.java b/src/main/java/com/nlf/calendar/eightchar/Yun.java
index 80d5ec6..5a39444 100644
--- a/src/main/java/com/nlf/calendar/eightchar/Yun.java
+++ b/src/main/java/com/nlf/calendar/eightchar/Yun.java
@@ -62,10 +62,8 @@ public class Yun {
     int startTimeZhiIndex = (start.getHour() == 23) ? 11 : LunarUtil.getTimeZhiIndex(start.toYmdHms().substring(11, 16));
     // 时辰差
     int hourDiff = endTimeZhiIndex - startTimeZhiIndex;
-    Calendar endCalendar = ExactDate.fromYmd(end.getYear(), end.getMonth(), end.getDay());
-    Calendar startCalendar = ExactDate.fromYmd(start.getYear(), start.getMonth(), start.getDay());
     // 天数差
-    int dayDiff = (int) ((endCalendar.getTimeInMillis() - startCalendar.getTimeInMillis()) / (1000 * 3600 * 24));
+    int dayDiff = ExactDate.getDaysBetween(start.getYear(), start.getMonth(), start.getDay(), end.getYear(), end.getMonth(), end.getDay());
     if (hourDiff < 0) {
       hourDiff += 12;
       dayDiff--;
diff --git a/src/test/java/test/SolarWeekTest.java b/src/test/java/test/SolarWeekTest.java
new file mode 100644
index 0000000..4e11c28
--- /dev/null
+++ b/src/test/java/test/SolarWeekTest.java
@@ -0,0 +1,74 @@
+package test;
+
+import com.nlf.calendar.SolarWeek;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * 阳历周测试
+ *
+ * @author 6tail
+ */
+public class SolarWeekTest {
+
+  @Test
+  public void test() {
+    SolarWeek week = SolarWeek.fromYmd(2022, 5, 1, 0);
+    Assert.assertEquals(1, week.getIndex());
+  }
+
+  @Test
+  public void test1() {
+    SolarWeek week = SolarWeek.fromYmd(2022, 5, 7, 0);
+    Assert.assertEquals(1, week.getIndex());
+  }
+
+  @Test
+  public void test2() {
+    SolarWeek week = SolarWeek.fromYmd(2022, 5, 8, 0);
+    Assert.assertEquals(2, week.getIndex());
+  }
+
+  @Test
+  public void test3() {
+    SolarWeek week = SolarWeek.fromYmd(2022, 5, 1, 1);
+    Assert.assertEquals(1, week.getIndex());
+  }
+
+  @Test
+  public void test4() {
+    SolarWeek week = SolarWeek.fromYmd(2022, 5, 2, 1);
+    Assert.assertEquals(2, week.getIndex());
+  }
+
+  @Test
+  public void test5() {
+    SolarWeek week = SolarWeek.fromYmd(2022, 5, 8, 1);
+    Assert.assertEquals(2, week.getIndex());
+  }
+
+  @Test
+  public void test6() {
+    SolarWeek week = SolarWeek.fromYmd(2021, 11, 1, 0);
+    Assert.assertEquals(1, week.getIndex());
+  }
+
+  @Test
+  public void test7() {
+    SolarWeek week = SolarWeek.fromYmd(2021, 11, 1, 1);
+    Assert.assertEquals(1, week.getIndex());
+  }
+
+  @Test
+  public void test8() {
+    SolarWeek week = SolarWeek.fromYmd(2021, 5, 2, 2);
+    Assert.assertEquals(1, week.getIndex());
+  }
+
+  @Test
+  public void test9() {
+    SolarWeek week = SolarWeek.fromYmd(2021, 5, 4, 2);
+    Assert.assertEquals(2, week.getIndex());
+  }
+
+}