lxm_library_java/lunar-java
1
0
Fork 0
mirror of synced 2025-12-16 18:38:00 +08:00
Code Issues Projects Releases Wiki Activity

优化八字代码

Browse Source
This commit is contained in:
6tail
2020-07-29 11:44:20 +08:00
parent 221d714dca
commit 4b8d195b03
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,10 @@ public class EightChar {
this.lunar = lunar; this.lunar = lunar;
} }
public static EightChar fromLunar(Lunar lunar){
return new EightChar(lunar);
}
@Override @Override
public String toString(){ public String toString(){
return getYear()+" "+getMonth()+" "+getDay()+" "+getTime(); return getYear()+" "+getMonth()+" "+getDay()+" "+getTime();
@@ -103,7 +107,7 @@ public class EightChar {
return LunarUtil.SHI_SHEN_GAN.get(getDayGan()+getYearGan()); return LunarUtil.SHI_SHEN_GAN.get(getDayGan()+getYearGan());
} }
private List<String> getYearShiShenZhi(String zhi){ private List<String> getShiShenZhi(String zhi){
List<String> hideGan = LunarUtil.ZHI_HIDE_GAN.get(zhi); List<String> hideGan = LunarUtil.ZHI_HIDE_GAN.get(zhi);
List<String> l = new ArrayList<String>(hideGan.size()); List<String> l = new ArrayList<String>(hideGan.size());
for(String gan:hideGan){ for(String gan:hideGan){
@@ -117,7 +121,7 @@ public class EightChar {
* @return 十神 * @return 十神
*/ */
public List<String> getYearShiShenZhi(){ public List<String> getYearShiShenZhi(){
return getYearShiShenZhi(getYearZhi()); return getShiShenZhi(getYearZhi());
} }
private String getDiShi(int zhiIndex){ private String getDiShi(int zhiIndex){
@@ -201,7 +205,7 @@ public class EightChar {
* @return 十神 * @return 十神
*/ */
public List<String> getMonthShiShenZhi(){ public List<String> getMonthShiShenZhi(){
return getYearShiShenZhi(getMonthZhi()); return getShiShenZhi(getMonthZhi());
} }
/** /**
@@ -273,7 +277,7 @@ public class EightChar {
* @return 十神 * @return 十神
*/ */
public List<String> getDayShiShenZhi(){ public List<String> getDayShiShenZhi(){
return getYearShiShenZhi(getDayZhi()); return getShiShenZhi(getDayZhi());
} }
/** /**
@@ -345,7 +349,7 @@ public class EightChar {
* @return 十神 * @return 十神
*/ */
public List<String> getTimeShiShenZhi(){ public List<String> getTimeShiShenZhi(){
return getYearShiShenZhi(getTimeZhi()); return getShiShenZhi(getTimeZhi());
} }
/** /**
@@ -362,11 +366,11 @@ public class EightChar {
*/ */
public String getTaiYuan(){ public String getTaiYuan(){
int ganIndex = lunar.getMonthGanIndexExact() + 1; int ganIndex = lunar.getMonthGanIndexExact() + 1;
if(ganIndex>10){ if(ganIndex>=10){
ganIndex -= 10; ganIndex -= 10;
} }
int zhiIndex = lunar.getMonthZhiIndexExact() + 3; int zhiIndex = lunar.getMonthZhiIndexExact() + 3;
if(zhiIndex>12){ if(zhiIndex>=12){
zhiIndex -= 12; zhiIndex -= 12;
} }
return LunarUtil.GAN[ganIndex+1]+LunarUtil.ZHI[zhiIndex+1]; return LunarUtil.GAN[ganIndex+1]+LunarUtil.ZHI[zhiIndex+1];