| Chunk |
|---|
| Conflicting content |
|---|
return now.getTime();
}
<<<<<<< HEAD
public static Date getGMT8Date(){
TimeZone timeZone = TimeZone.getTimeZone("GMT+0800");
Calendar now = Calendar.getInstance(timeZone);
now.setTime(new Date());
return now.getTime();
}
=======
public static int calcHour(Date startDate, Date endDate) {
if (startDate.before(endDate)) {
long start = startDate.getTime();
long end = endDate.getTime();
int hours = (int) ((end - start) / (3600L * 1000));
return hours;
} else {
return -1;
}
}
>>>>>>> 28f7545226e333ca2db38fb332425d176c628747
public static boolean isMiddleDate(int startHour, int startMinute, int endHour, int endMinute){
|
| Solution content |
|---|
return now.getTime();
}
public static Date getGMT8Date(){
TimeZone timeZone = TimeZone.getTimeZone("GMT+0800");
Calendar now = Calendar.getInstance(timeZone);
now.setTime(new Date());
return now.getTime();
}
public static int calcHour(Date startDate, Date endDate) {
if (startDate.before(endDate)) {
long start = startDate.getTime();
long end = endDate.getTime();
int hours = (int) ((end - start) / (3600L * 1000));
return hours;
} else {
return -1;
}
}
public static boolean isMiddleDate(int startHour, int startMinute, int endHour, int endMinute){
|
| File |
|---|
| DateUtil.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Method declaration |