lxm_library_java/lunar-java
1
0
Fork 0
mirror of synced 2026-02-16 01:48:00 +08:00
Code Issues Projects Releases Wiki Activity

v1.2.26 修复物候的错误。

Browse Source
This commit is contained in:
6tail
2022-11-01 21:17:54 +08:00
parent ee0b227f75
commit 51afe36b4b
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nlf/calendar/Lunar.java
View File

@@ -2990,7 +2990,11 @@ public class Lunar {
}
Solar startSolar = jieQi.getSolar();
int days = ExactDate.getDaysBetween(startSolar.getYear(), startSolar.getMonth(), startSolar.getDay(), solar.getYear(), solar.getMonth(), solar.getDay());
return LunarUtil.WU_HOU[(offset * 3 + days / 5) % LunarUtil.WU_HOU.length];
int index = days / 5;
if (index > 2) {
index = 2;
}
return LunarUtil.WU_HOU[(offset * 3 + index) % LunarUtil.WU_HOU.length];
}
/**

14
src/test/java/test/WuHouTest.java
View File

@@ -103,4 +103,18 @@ public class WuHouTest {
Assert.assertEquals(solar.toString(),"小寒 初候",lunar.getHou());
}
@Test
public void test15(){
Solar solar = new Solar(2022,8,22);
Lunar lunar = solar.getLunar();
Assert.assertEquals(solar.toString(),"寒蝉鸣",lunar.getWuHou());
}
@Test
public void test16(){
Solar solar = new Solar(2022,8,23);
Lunar lunar = solar.getLunar();
Assert.assertEquals(solar.toString(),"鹰乃祭鸟",lunar.getWuHou());
}
}