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

v1.3.10 修复八字转阳历为空的问题；修复一处法定假日数据错误；十神优化。

Browse Source
This commit is contained in:
6tail
2024-01-03 19:31:09 +08:00
parent a17402241a
commit 1411d8017f
9 changed files with 73 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nlf/calendar/EightChar.java
View File

@@ -145,14 +145,14 @@ public class EightChar {
* @return 十神
*/
public String getYearShiShenGan() {
return LunarUtil.SHI_SHEN_GAN.get(getDayGan() + getYearGan());
return LunarUtil.SHI_SHEN.get(getDayGan() + getYearGan());
}
private List<String> getShiShenZhi(String zhi) {
List<String> hideGan = LunarUtil.ZHI_HIDE_GAN.get(zhi);
List<String> l = new ArrayList<String>(hideGan.size());
for (String gan : hideGan) {
l.add(LunarUtil.SHI_SHEN_ZHI.get(getDayGan() + gan));
l.add(LunarUtil.SHI_SHEN.get(getDayGan() + gan));
}
return l;
}
@@ -264,7 +264,7 @@ public class EightChar {
* @return 十神
*/
public String getMonthShiShenGan() {
return LunarUtil.SHI_SHEN_GAN.get(getDayGan() + getMonthGan());
return LunarUtil.SHI_SHEN.get(getDayGan() + getMonthGan());
}
/**
@@ -426,7 +426,7 @@ public class EightChar {
* @return 十神
*/
public String getTimeShiShenGan() {
return LunarUtil.SHI_SHEN_GAN.get(getDayGan() + getTimeGan());
return LunarUtil.SHI_SHEN.get(getDayGan() + getTimeGan());
}
/**