lxm_library_java/lunar-java
1
0
Fork 0
mirror of synced 2026-10-26 08:26:11 +08:00
Code Issues Projects Releases Wiki Activity

v1.3.0 彻底抛弃Date和Calendar。

Browse Source
This commit is contained in:
6tail
2023-02-03 18:00:36 +08:00
parent 30f1e63579
commit 09baeb4dc5
14 changed files with 392 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/nlf/calendar/SolarHalfYear.java
View File

@@ -36,14 +36,15 @@ public class SolarHalfYear {
* 通过日期初始化
*/
public SolarHalfYear(Date date) {
Calendar c = ExactDate.fromDate(date);
year = c.get(Calendar.YEAR);
month = c.get(Calendar.MONTH) + 1;
Solar solar = Solar.fromDate(date);
year = solar.getYear();
month = solar.getMonth();
}
/**
* 通过日历初始化
*/
@Deprecated
public SolarHalfYear(Calendar calendar) {
year = calendar.get(Calendar.YEAR);
month = calendar.get(Calendar.MONTH) + 1;
@@ -76,6 +77,7 @@ public class SolarHalfYear {
* @param calendar 日历
* @return 阳历半年
*/
@Deprecated
public static SolarHalfYear fromCalendar(Calendar calendar) {
return new SolarHalfYear(calendar);
}
@@ -125,12 +127,8 @@ public class SolarHalfYear {
* @return 推移后的半年
*/
public SolarHalfYear next(int halfYears) {
if (0 == halfYears) {
return new SolarHalfYear(year, month);
}
Calendar c = ExactDate.fromYmd(year, month, 1);
c.add(Calendar.MONTH, MONTH_COUNT * halfYears);
return new SolarHalfYear(c);
SolarMonth m = SolarMonth.fromYm(year, month).next(MONTH_COUNT * halfYears);
return new SolarHalfYear(m.getYear(), m.getMonth());
}
/**