修复闰冬月、闰腊月的问题;修复日历不准的问题;修复物候错误;大运、小运、流年支持自定义轮数。
This commit is contained in:
@@ -2,6 +2,7 @@ package com.nlf.calendar;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.TimeZone;
|
||||
|
||||
/**
|
||||
* 精确日期
|
||||
@@ -10,8 +11,13 @@ import java.util.Date;
|
||||
*/
|
||||
public class ExactDate {
|
||||
|
||||
/**
|
||||
* 时区
|
||||
*/
|
||||
private static final TimeZone TIME_ZONE = TimeZone.getTimeZone("GMT+8");
|
||||
|
||||
public static Calendar fromYmdHms(int year, int month, int day, int hour, int minute, int second) {
|
||||
Calendar c = Calendar.getInstance();
|
||||
Calendar c = Calendar.getInstance(TIME_ZONE);
|
||||
c.set(year, month - 1, day, hour, minute, second);
|
||||
c.set(Calendar.MILLISECOND, 0);
|
||||
return c;
|
||||
@@ -22,7 +28,7 @@ public class ExactDate {
|
||||
}
|
||||
|
||||
public static Calendar fromDate(Date date) {
|
||||
Calendar c = Calendar.getInstance();
|
||||
Calendar c = Calendar.getInstance(TIME_ZONE);
|
||||
c.setTime(date);
|
||||
c.set(Calendar.MILLISECOND, 0);
|
||||
return c;
|
||||
|
||||
Reference in New Issue
Block a user