@@ -119,7 +119,8 @@ public static String date2Str(String pattern, Date aDate) {
119119 public static Date convertStringToDate (String datePattern , String strDate ) {
120120 SimpleDateFormat df ;
121121 Date date ;
122- if (strDate .split (SymbolConst .HENGXIAN ).length < 2 ) {//传入的时间是以 / 分割
122+ //传入的时间是以 / 分割
123+ if (strDate .split (SymbolConst .HENGXIAN ).length < 2 ) {
123124 strDate = strDate .replace (SymbolConst .ZHENGXIEXIAN , SymbolConst .HENGXIAN );
124125 }
125126 if (strDate .split (SymbolConst .SPACE ).length > 1 ) {
@@ -141,7 +142,8 @@ public static Date convertStringToDate(String datePattern, String strDate) {
141142 */
142143 public static Date convertStringToDate (String strDate ) {
143144 Date aDate ;
144- if (strDate .split (SymbolConst .HENGXIAN ).length < 2 ) {//传入的时间是以 / 分割
145+ //传入的时间是以 / 分割
146+ if (strDate .split (SymbolConst .HENGXIAN ).length < 2 ) {
145147 strDate = strDate .replace (SymbolConst .ZHENGXIEXIAN , SymbolConst .HENGXIAN );
146148 }
147149 aDate = convertStringToDate (DATE_PATTERN_WITH_HENGXIAN , strDate );
@@ -731,32 +733,41 @@ public static long getTimeFromString(String timeStr, String format) {
731733 */
732734 public static String getLeftTimeString (long leftTime ) {
733735 StringBuilder sb = new StringBuilder ();
734- int leftSecond = (int ) (leftTime / 1000 );// 剩余秒数
735- int second = leftSecond % 60 ;// 秒数
736+ // 剩余秒数
737+ int leftSecond = (int ) (leftTime / 1000 );
738+ // 秒数
739+ int second = leftSecond % 60 ;
736740 if (second > 0 ) {
737741 sb .insert (0 , second + "秒" );
738742 }
739- int leftMinute = leftSecond / 60 ;// 剩余分钟数
740- int minute = leftMinute % 60 ;// 分钟数
743+ // 剩余分钟数
744+ int leftMinute = leftSecond / 60 ;
745+ // 分钟数
746+ int minute = leftMinute % 60 ;
741747 if (minute > 0 ) {
742748 sb .insert (0 , minute + "分" );
743749 }
744- int leftHour = leftMinute / 60 ;// 剩余小时
750+ // 剩余小时
751+ int leftHour = leftMinute / 60 ;
745752 int hour = leftHour % 24 ;
746753 if (hour > 0 ) {
747754 sb .insert (0 , hour + "小时" );
748755 }
749- int leftDay = leftHour / 24 ;// 剩余天数
756+ // 剩余天数
757+ int leftDay = leftHour / 24 ;
750758 if (leftDay > 0 ) {
751759 sb .insert (0 , leftDay + "天" );
752760 }
753- int day = (int ) (leftTime / ONE_DAY_IN_MILLISECONDS );// 获取剩余天数
754- if (day > 0 ) {// 1天及以上的显示剩余天
761+ // 获取剩余天数
762+ int day = (int ) (leftTime / ONE_DAY_IN_MILLISECONDS );
763+ // 1天及以上的显示剩余天
764+ if (day > 0 ) {
755765 sb .append (day ).append ("天" );
756766 leftTime -= (day * ONE_DAY_IN_MILLISECONDS );
757767 }
758768 hour = (int ) (leftTime / ONE_HOUR_IN_MILLISECONDS );
759- if (hour > 0 || sb .length () > 0 ) {// 1小时及以上或者前面显示了天数则后面需要小时
769+ // 1小时及以上或者前面显示了天数则后面需要小时
770+ if (hour > 0 || sb .length () > 0 ) {
760771 sb .append (hour ).append ("小时" );
761772 leftTime -= (hour * ONE_HOUR_IN_MILLISECONDS );
762773 }
0 commit comments