Skip to content

Commit 0572bf7

Browse files
committed
see 04/21 log
1 parent 9468a64 commit 0572bf7

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

utilcode/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ dependencies {
3636
testCompile "com.google.truth:truth:$TRUTH_VERSION"
3737
testCompile "org.robolectric:robolectric:$ROBOLECTRIC_VERSION"
3838
}
39-
//apply from: "https://raw.githubusercontent.com/xiaopansky/android-library-publish-to-jcenter/master/bintrayUpload.gradle"
39+
apply from: "https://raw.githubusercontent.com/xiaopansky/android-library-publish-to-jcenter/master/bintrayUpload.gradle"
4040
//gradlew bintrayUpload

utilcode/src/main/java/com/blankj/utilcode/util/TimeUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@ public static Date getDate(Date date, long timeSpan, @TimeConstants.Unit int uni
10321032
* @return 与当前时间等于时间差的时间戳
10331033
*/
10341034
public static long getMillisByNow(long timeSpan, @TimeConstants.Unit int unit) {
1035-
return getNowMills() + timeSpan2Millis(timeSpan, unit);
1035+
return getMillis(getNowMills(), timeSpan, unit);
10361036
}
10371037

10381038
/**
@@ -1069,7 +1069,7 @@ public static String getStringByNow(long timeSpan, @TimeConstants.Unit int unit)
10691069
* @return 与当前时间等于时间差的时间字符串
10701070
*/
10711071
public static String getStringByNow(long timeSpan, @TimeConstants.Unit int unit, String pattern) {
1072-
return millis2String(getNowMills() + timeSpan2Millis(timeSpan, unit), pattern);
1072+
return getString(getNowMills(), pattern, timeSpan, unit);
10731073
}
10741074

10751075
/**
@@ -1087,7 +1087,7 @@ public static String getStringByNow(long timeSpan, @TimeConstants.Unit int unit,
10871087
* @return 与当前时间等于时间差的Date
10881088
*/
10891089
public static Date getDateByNow(long timeSpan, @TimeConstants.Unit int unit) {
1090-
return millis2Date(getNowMills() + timeSpan2Millis(timeSpan, unit));
1090+
return getDate(getNowMills(), timeSpan, unit);
10911091
}
10921092

10931093
/**

utilcode/src/test/java/com/blankj/utilcode/util/TimeUtilsTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public class TimeUtilsTest {
2424
long millis = 1470991049000L;
2525
Date timeDate = new Date(millis);
2626
String timeString = "2016-08-12 16:37:29";
27+
String tomorrowTimeString = "2016-08-13 16:37:29";
2728
String myTimeString = "2016-08-12 16:37:29 中国标准时间";
2829
String timeString0 = "2016-08-12 16:00:00";
2930
String timeString1 = "2016-08-12 17:10:10";
@@ -93,6 +94,11 @@ public void testGetFriendlyTimeSpanByNow() throws Exception {
9394
System.out.println(getFriendlyTimeSpanByNow(System.currentTimeMillis() - 2 * TimeConstants.DAY));
9495
}
9596

97+
@Test
98+
public void testGetString() throws Exception {
99+
assertThat(tomorrowTimeString).isEqualTo(getString(millis, 1, TimeConstants.DAY));
100+
}
101+
96102
@Test
97103
public void testIsSameDay() throws Exception {
98104
System.out.println(isSameDay(System.currentTimeMillis()));

0 commit comments

Comments
 (0)