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

v1.2.23 新增525心理健康节；修复出现多个全国中小学生安全教育日的问题；新增胎息。

Browse Source
This commit is contained in:
6tail
2022-05-19 20:48:42 +08:00
parent 3415fc04a4
commit 5d589eb957
10 changed files with 65 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -474,6 +474,26 @@ public class EightChar {
return LunarUtil.NAYIN.get(getTaiYuan());
}
/**
* 获取胎息
*
* @return 胎息
*/
public String getTaiXi() {
int ganIndex = (2 == sect) ? lunar.getDayGanIndexExact2() : lunar.getDayGanIndexExact();
int zhiIndex = (2 == sect) ? lunar.getDayZhiIndexExact2() : lunar.getDayZhiIndexExact();
return LunarUtil.HE_GAN_5[ganIndex] + LunarUtil.HE_ZHI_6[zhiIndex];
}
/**
* 获取胎息纳音
*
* @return 纳音
*/
public String getTaiXiNaYin() {
return LunarUtil.NAYIN.get(getTaiXi());
}
/**
* 获取命宫
*
@@ -531,7 +551,10 @@ public class EightChar {
timeZhiIndex = i;
}
}
int zhiIndex = (2 + (monthZhiIndex + timeZhiIndex)) % 12;
int zhiIndex = 2 + monthZhiIndex + timeZhiIndex;
if (zhiIndex > 12) {
zhiIndex -= 12;
}
int jiaZiIndex = LunarUtil.getJiaZiIndex(lunar.getMonthInGanZhiExact()) - (monthZhiIndex - zhiIndex);
if (jiaZiIndex >= 60) {
jiaZiIndex -= 60;