From a10b544711253585d5ec79f6382bef2d6f913c0b Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Thu, 15 Dec 2022 15:47:26 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E4=BF=AE=E6=94=B9=E5=B0=8F=E6=97=B6?= =?UTF-8?q?=E5=88=86=E9=92=9F=E7=A7=92=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utils/TimeUtils.java | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/TimeUtils.java b/library/src/main/java/com/yizhuan/xchat_android_library/utils/TimeUtils.java index ea0fb13fb..7dbb1a95c 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/TimeUtils.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/utils/TimeUtils.java @@ -403,20 +403,29 @@ public class TimeUtils { sencond = time % 60; } } - return (hour<10?("0"+hour):hour) + ":" + (minutes<10?("0"+minutes):minutes) + ":" + (sencond<10?("0"+sencond):sencond); + return (hour < 10 ? ("0" + hour) : hour) + ":" + (minutes < 10 ? ("0" + minutes) : minutes) + ":" + (sencond < 10 ? ("0" + sencond) : sencond); } - public static String secondsToTime(long seconds){ - long h=seconds/3600; //小时 - long m=(seconds%3600)/60; //分钟 - long s=(seconds%3600)%60; //秒 - if(h>0){ - return h+"小時"+m+"分鐘"+s+"秒"; + public static String + secondsToTime(long seconds) { + long h = seconds / 3600; //小时 + long m = (seconds % 3600) / 60; //分钟 + long s = (seconds % 3600) % 60; //秒 + if (h > 0) { + if(m== 0 && s == 0){ + return h + "小時"; + }else { + return h + "小時" + m + "分鐘" + s + "秒"; + } } - if(m>0){ - return m+"分鐘"+s+"秒"; + if (m > 0) { + if(s == 0){ + return m + "分鐘"; + }else { + return m + "分鐘" + s + "秒"; + } } - return s+"秒"; + return s + "秒"; } public static String getChineseMonth(Context context, long millis) {