|
@@ -1243,15 +1243,15 @@ public class DateUtil {
|
|
|
String formatStr = "";
|
|
|
if (seconds < 60) {
|
|
|
return seconds + "秒";
|
|
|
- } else if (60 < seconds && seconds < 3600) {
|
|
|
+ } else if (seconds < 3600) {
|
|
|
return seconds / 60 + "分钟";
|
|
|
- } else if (3600 < seconds && seconds < 86400) {
|
|
|
+ } else if (seconds < 86400) {
|
|
|
int hour = seconds / 3600;
|
|
|
formatStr += hour + "小时";
|
|
|
int second = (seconds - (3600 * hour)) / 60;
|
|
|
formatStr += second + "分钟";
|
|
|
return formatStr;
|
|
|
- } else if (seconds > 86400) {
|
|
|
+ } else {
|
|
|
int days = seconds / 86400;
|
|
|
formatStr += days + "天";
|
|
|
int hour = (seconds - (86400 * days)) / 3600;
|
|
@@ -1259,8 +1259,6 @@ public class DateUtil {
|
|
|
int second = (seconds - (86400 * days) - (3600 * hour)) / 60;
|
|
|
formatStr += second + "分钟";
|
|
|
return formatStr;
|
|
|
- } else {
|
|
|
- return "--";
|
|
|
}
|
|
|
}
|
|
|
|