|
@@ -151,16 +151,12 @@ public class ToolsUtils {
|
|
|
String format = timeFormat == 0 ? "hh:mm aa" : "HH:mm";
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat(format, Locale.getDefault());
|
|
|
return sdf.format(new Date(chatTime * 1000L));
|
|
|
- } else if (interval < 7 * 24 * 60 * 60) {
|
|
|
- String format = timeFormat == 0 ? "EEE hh:mm aa" : "EEE HH:mm";
|
|
|
- SimpleDateFormat sdf = new SimpleDateFormat(format, Locale.getDefault());
|
|
|
- return sdf.format(new Date(chatTime * 1000L));
|
|
|
} else if (lastYear != nowYear) {
|
|
|
- String format = "dd/MM/yyyy";
|
|
|
+ String format = "dd MMM yyyy";
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat(format, Locale.getDefault());
|
|
|
return sdf.format(new Date(chatTime * 1000L));
|
|
|
} else {
|
|
|
- String format = timeFormat == 0 ? "dd/MM hh:mm aa" : "dd/MM HH:mm";
|
|
|
+ String format = "dd MMM";
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat(format, Locale.getDefault());
|
|
|
return sdf.format(new Date(chatTime * 1000L));
|
|
|
}
|