获取周一零点
parent
f8d7247ae3
commit
9e7a84476a
|
@ -1766,19 +1766,16 @@ public class TimeUtils {
|
||||||
}
|
}
|
||||||
|
|
||||||
//周几的零点
|
//周几的零点
|
||||||
public static long getWeekZero(int weekDay) {
|
public static long getMondayZero() {
|
||||||
if (weekDay == 7) {
|
Calendar cal = Calendar.getInstance();
|
||||||
weekDay = 1;
|
cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
|
||||||
} else {
|
// java里的周,是外国的,周日 是第一天;
|
||||||
weekDay += 1;
|
// 中国的 周一 是第一天...一定要注意;
|
||||||
|
if (Calendar.SUNDAY == cal.get(Calendar.DAY_OF_WEEK)){
|
||||||
|
cal.add(Calendar.DATE, -1);
|
||||||
}
|
}
|
||||||
Calendar calendar = Calendar.getInstance();
|
cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
|
||||||
calendar.set(Calendar.SECOND, 0);
|
return cal.getTimeInMillis();
|
||||||
calendar.set(Calendar.MINUTE, 0);
|
|
||||||
calendar.set(Calendar.HOUR_OF_DAY, 0);
|
|
||||||
calendar.set(Calendar.MILLISECOND, 0);
|
|
||||||
calendar.set(Calendar.DAY_OF_WEEK, weekDay);
|
|
||||||
return calendar.getTimeInMillis();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -38,7 +38,7 @@ public class CrossLingmaiLogic {
|
||||||
public static List<Integer> getSendRewardWeekDay(){
|
public static List<Integer> getSendRewardWeekDay(){
|
||||||
SMServerLodeSetting setting = SMServerLodeSetting.lodeConfig.get(1);
|
SMServerLodeSetting setting = SMServerLodeSetting.lodeConfig.get(1);
|
||||||
int[][] battleTime = setting.getBattleTime();
|
int[][] battleTime = setting.getBattleTime();
|
||||||
long mondayZeroTime = TimeUtils.getWeekZero(1);
|
long mondayZeroTime = TimeUtils.getMondayZero();
|
||||||
List<Integer> sendWeekDay = new ArrayList<>();
|
List<Integer> sendWeekDay = new ArrayList<>();
|
||||||
for (int[] everyTime : battleTime) {
|
for (int[] everyTime : battleTime) {
|
||||||
sendWeekDay.add(TimeUtils.getDayOfWeekBytime(mondayZeroTime + (everyTime[1]+3) * 1000L));
|
sendWeekDay.add(TimeUtils.getDayOfWeekBytime(mondayZeroTime + (everyTime[1]+3) * 1000L));
|
||||||
|
@ -51,7 +51,7 @@ public class CrossLingmaiLogic {
|
||||||
SMServerLodeSetting setting = SMServerLodeSetting.lodeConfig.get(1);
|
SMServerLodeSetting setting = SMServerLodeSetting.lodeConfig.get(1);
|
||||||
int[][] restTime = setting.getRestTime();
|
int[][] restTime = setting.getRestTime();
|
||||||
int[][] battleTime = setting.getBattleTime();
|
int[][] battleTime = setting.getBattleTime();
|
||||||
long mondayZeroTime = TimeUtils.getWeekZero(1);
|
long mondayZeroTime = TimeUtils.getMondayZero();
|
||||||
long now = TimeUtils.now();
|
long now = TimeUtils.now();
|
||||||
//休战期
|
//休战期
|
||||||
for (int[] everyTime : restTime) {
|
for (int[] everyTime : restTime) {
|
||||||
|
|
Loading…
Reference in New Issue