Skip to content

Commit

Permalink
v1.3.0 彻底抛弃Date和Calendar。
Browse files Browse the repository at this point in the history
  • Loading branch information
@6tail
6tail committed Feb 3, 2023
1 parent 30f1e63 commit 09baeb4
Show file tree
Hide file tree
Showing 14 changed files with 392 additions and 269 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ lunar是一款无第三方依赖的公历(阳历)、农历(阴历、老黄历)
<dependency>
<groupId>cn.6tail</groupId>
<artifactId>lunar</artifactId>
<version>1.2.29</version>
<version>1.3.0</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion README_EN.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.29</version>
<version>1.3.0</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>cn.6tail</groupId>
<artifactId>lunar</artifactId>
<packaging>jar</packaging>
<version>1.2.29</version>
<version>1.3.0</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>
Expand Down
68 changes: 0 additions & 68 deletions src/main/java/com/nlf/calendar/ExactDate.java
View file

This file was deleted.

88 changes: 43 additions & 45 deletions src/main/java/com/nlf/calendar/Lunar.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,20 +190,16 @@ public Lunar(int lunarYear, int lunarMonth, int lunarDay, int hour, int minute,
}

/**
* 通过阳历日期初始化
* 通过阳历初始化
*
* @param date 阳历日期
* @param solar 阳历
*/
public Lunar(Date date) {
solar = new Solar(date);
int currentYear = solar.getYear();
int currentMonth = solar.getMonth();
int currentDay = solar.getDay();
LunarYear ly = LunarYear.fromYear(currentYear);
public Lunar(Solar solar) {
LunarYear ly = LunarYear.fromYear(solar.getYear());
for (LunarMonth m : ly.getMonths()) {
// 初一
Solar firstDay = Solar.fromJulianDay(m.getFirstJulianDay());
int days = ExactDate.getDaysBetween(firstDay.getYear(), firstDay.getMonth(), firstDay.getDay(), currentYear, currentMonth, currentDay);
int days = solar.subtract(firstDay);
if (days < m.getDayCount()) {
year = m.getYear();
month = m.getMonth();
Expand All @@ -214,9 +210,19 @@ public Lunar(Date date) {
hour = solar.getHour();
minute = solar.getMinute();
second = solar.getSecond();
this.solar = solar;
compute(ly);
}

/**
* 通过阳历日期初始化
*
* @param date 阳历日期
*/
public Lunar(Date date) {
this(Solar.fromDate(date));
}

/**
* 计算节气表
*/
Expand Down Expand Up @@ -2175,13 +2181,13 @@ public NineStar getDayNineStar() {
String solarNiZiYmd = solarNiZi.toYmd();
int offset = 0;
if (solarYmd.compareTo(solarShunBaiYmd) >= 0 && solarYmd.compareTo(solarNiZiYmd) < 0) {
offset = ExactDate.getDaysBetween(solarShunBai.getCalendar(), this.getSolar().getCalendar()) % 9;
offset = solar.subtract(solarShunBai) % 9;
} else if (solarYmd.compareTo(solarNiZiYmd) >= 0 && solarYmd.compareTo(solarShunBaiYmd2) < 0) {
offset = 8 - (ExactDate.getDaysBetween(solarNiZi.getCalendar(), this.getSolar().getCalendar()) % 9);
offset = 8 - (solar.subtract(solarNiZi) % 9);
} else if (solarYmd.compareTo(solarShunBaiYmd2) >= 0) {
offset = ExactDate.getDaysBetween(solarShunBai2.getCalendar(), this.getSolar().getCalendar()) % 9;
offset = solar.subtract(solarShunBai2) % 9;
} else if (solarYmd.compareTo(solarShunBaiYmd) < 0) {
offset = (8 + ExactDate.getDaysBetween(this.getSolar().getCalendar(), solarShunBai.getCalendar())) % 9;
offset = (8 + solarShunBai.subtract(solar)) % 9;
}
return NineStar.fromIndex(offset);
}
Expand Down Expand Up @@ -2884,23 +2890,23 @@ public String getTimeXunKong() {
* @return 数九，如果不是数九天，返回null
*/
public ShuJiu getShuJiu() {
Calendar currentCalendar = ExactDate.fromYmd(solar.getYear(), solar.getMonth(), solar.getDay());
Solar current = Solar.fromYmd(solar.getYear(), solar.getMonth(), solar.getDay());
Solar start = jieQi.get("DONG_ZHI");
Calendar startCalendar = ExactDate.fromYmd(start.getYear(), start.getMonth(), start.getDay());
start = Solar.fromYmd(start.getYear(), start.getMonth(), start.getDay());

if (currentCalendar.compareTo(startCalendar) < 0) {
if (current.isBefore(start)) {
start = jieQi.get("冬至");
startCalendar = ExactDate.fromYmd(start.getYear(), start.getMonth(), start.getDay());
start = Solar.fromYmd(start.getYear(), start.getMonth(), start.getDay());
}

Calendar endCalendar = ExactDate.fromYmd(start.getYear(), start.getMonth(), start.getDay());
endCalendar.add(Calendar.DATE, 81);
Solar end = Solar.fromYmd(start.getYear(), start.getMonth(), start.getDay());
end = end.next(81);

if (currentCalendar.compareTo(startCalendar) < 0 || currentCalendar.compareTo(endCalendar) >= 0) {
if (current.isBefore(start) || !current.isBefore(end)) {
return null;
}

int days = ExactDate.getDaysBetween(startCalendar, currentCalendar);
int days = current.subtract(start);
return new ShuJiu(LunarUtil.NUMBER[days / 9 + 1] + "九", days % 9 + 1);
}

Expand All @@ -2910,45 +2916,42 @@ public ShuJiu getShuJiu() {
* @return 三伏，如果不是伏天，返回null
*/
public Fu getFu() {
Calendar currentCalendar = ExactDate.fromYmd(solar.getYear(), solar.getMonth(), solar.getDay());
Solar current = Solar.fromYmd(solar.getYear(), solar.getMonth(), solar.getDay());
Solar xiaZhi = jieQi.get("夏至");
Solar liQiu = jieQi.get("立秋");
Calendar startCalendar = ExactDate.fromYmd(xiaZhi.getYear(), xiaZhi.getMonth(), xiaZhi.getDay());
Solar start = Solar.fromYmd(xiaZhi.getYear(), xiaZhi.getMonth(), xiaZhi.getDay());
// 第1个庚日
int add = 6 - xiaZhi.getLunar().getDayGanIndex();
if (add < 0) {
add += 10;
}
// 第3个庚日，即初伏第1天
add += 20;
startCalendar.add(Calendar.DATE, add);
start = start.next(add);

// 初伏以前
if (currentCalendar.compareTo(startCalendar) < 0) {
if (current.isBefore(start)) {
return null;
}

int days = ExactDate.getDaysBetween(startCalendar, currentCalendar);
int days = current.subtract(start);
if (days < 10) {
return new Fu("初伏", days + 1);
}

// 第4个庚日，中伏第1天
startCalendar.add(Calendar.DATE, 10);

days = ExactDate.getDaysBetween(startCalendar, currentCalendar);
start = start.next(10);
days = current.subtract(start);
if (days < 10) {
return new Fu("中伏", days + 1);
}

// 第5个庚日，中伏第11天或末伏第1天
startCalendar.add(Calendar.DATE, 10);

Calendar liQiuCalendar = ExactDate.fromYmd(liQiu.getYear(), liQiu.getMonth(), liQiu.getDay());

days = ExactDate.getDaysBetween(startCalendar, currentCalendar);
start = start.next(10);
days = current.subtract(start);
Solar liQiuSolar = Solar.fromYmd(liQiu.getYear(), liQiu.getMonth(), liQiu.getDay());
// 末伏
if (liQiuCalendar.compareTo(startCalendar) <= 0) {
if (!liQiuSolar.isAfter(start)) {
if (days < 10) {
return new Fu("末伏", days + 1);
}
Expand All @@ -2958,8 +2961,8 @@ public Fu getFu() {
return new Fu("中伏", days + 11);
}
// 末伏第1天
startCalendar.add(Calendar.DATE, 10);
days = ExactDate.getDaysBetween(startCalendar, currentCalendar);
start = start.next(10);
days = current.subtract(start);
if (days < 10) {
return new Fu("末伏", days + 1);
}
Expand All @@ -2983,17 +2986,14 @@ public String getLiuYao() {
*/
public String getWuHou() {
JieQi jieQi = getPrevJieQi(true);
String name = jieQi.getName();
int offset = 0;
for (int i = 0, j = JIE_QI.length; i < j; i++) {
if (name.equals(JIE_QI[i])) {
if (jieQi.getName().equals(JIE_QI[i])) {
offset = i;
break;
}
}
Solar startSolar = jieQi.getSolar();
int days = ExactDate.getDaysBetween(startSolar.getYear(), startSolar.getMonth(), startSolar.getDay(), solar.getYear(), solar.getMonth(), solar.getDay());
int index = days / 5;
int index = solar.subtract(jieQi.getSolar()) / 5;
if (index > 2) {
index = 2;
}
Expand All @@ -3007,10 +3007,8 @@ public String getWuHou() {
*/
public String getHou() {
JieQi jieQi = getPrevJieQi(true);
Solar startSolar = jieQi.getSolar();
int days = ExactDate.getDaysBetween(startSolar.getYear(), startSolar.getMonth(), startSolar.getDay(), solar.getYear(), solar.getMonth(), solar.getDay());
int max = LunarUtil.HOU.length - 1;
int offset = days / 5;
int offset = solar.subtract(jieQi.getSolar()) / 5;
if (offset > max) {
offset = max;
}
Expand Down
Loading

0 comments on commit 09baeb4

Please sign in to comment.