|
@@ -148,7 +148,7 @@ public class ToolsUtils {
|
|
|
|
|
|
//今天
|
|
|
if (lastYear == nowYear && lastMonth == nowMonth && lastDay == nowDay) {
|
|
|
- String format = timeFormat == 0 ? "hh:mm aa" : "HH:mm";
|
|
|
+ String format = timeFormat == 0 ? "h:mm aa" : "HH:mm";
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat(format, Locale.getDefault());
|
|
|
return sdf.format(new Date(chatTime * 1000L));
|
|
|
} else if (lastYear != nowYear) {
|