lxm_library_java/lunar-java
1
0
Fork 0
mirror of synced 2026-10-20 21:46:15 +08:00
Code Issues Projects Releases Wiki Activity

v1.3.3 优化八字转阳历；修复少量农历年的月份错误；新增农历年天数和当年月份列表。

Browse Source
This commit is contained in:
6tail
2023-03-11 18:20:54 +08:00
parent 60dde2c619
commit 586a8d3f1e
12 changed files with 340 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,9 +197,7 @@ public class Lunar {
public Lunar(Solar solar) {
LunarYear ly = LunarYear.fromYear(solar.getYear());
for (LunarMonth m : ly.getMonths()) {
// 初一
Solar firstDay = Solar.fromJulianDay(m.getFirstJulianDay());
int days = solar.subtract(firstDay);
int days = solar.subtract(Solar.fromJulianDay(m.getFirstJulianDay()));
if (days < m.getDayCount()) {
year = m.getYear();
month = m.getMonth();
@@ -2899,8 +2897,7 @@ public class Lunar {
start = Solar.fromYmd(start.getYear(), start.getMonth(), start.getDay());
}
Solar end = Solar.fromYmd(start.getYear(), start.getMonth(), start.getDay());
end = end.next(81);
Solar end = Solar.fromYmd(start.getYear(), start.getMonth(), start.getDay()).next(81);
if (current.isBefore(start) || !current.isBefore(end)) {
return null;