提交 0572bf7d 编写于 作者: B Blankj

see 04/21 log

上级 9468a642
......@@ -36,5 +36,5 @@ dependencies {
testCompile "com.google.truth:truth:$TRUTH_VERSION"
testCompile "org.robolectric:robolectric:$ROBOLECTRIC_VERSION"
}
//apply from: "https://raw.githubusercontent.com/xiaopansky/android-library-publish-to-jcenter/master/bintrayUpload.gradle"
apply from: "https://raw.githubusercontent.com/xiaopansky/android-library-publish-to-jcenter/master/bintrayUpload.gradle"
//gradlew bintrayUpload
......@@ -1032,7 +1032,7 @@ public final class TimeUtils {
* @return 与当前时间等于时间差的时间戳
*/
public static long getMillisByNow(long timeSpan, @TimeConstants.Unit int unit) {
return getNowMills() + timeSpan2Millis(timeSpan, unit);
return getMillis(getNowMills(), timeSpan, unit);
}
/**
......@@ -1069,7 +1069,7 @@ public final class TimeUtils {
* @return 与当前时间等于时间差的时间字符串
*/
public static String getStringByNow(long timeSpan, @TimeConstants.Unit int unit, String pattern) {
return millis2String(getNowMills() + timeSpan2Millis(timeSpan, unit), pattern);
return getString(getNowMills(), pattern, timeSpan, unit);
}
/**
......@@ -1087,7 +1087,7 @@ public final class TimeUtils {
* @return 与当前时间等于时间差的Date
*/
public static Date getDateByNow(long timeSpan, @TimeConstants.Unit int unit) {
return millis2Date(getNowMills() + timeSpan2Millis(timeSpan, unit));
return getDate(getNowMills(), timeSpan, unit);
}
/**
......
......@@ -24,6 +24,7 @@ public class TimeUtilsTest {
long millis = 1470991049000L;
Date timeDate = new Date(millis);
String timeString = "2016-08-12 16:37:29";
String tomorrowTimeString = "2016-08-13 16:37:29";
String myTimeString = "2016-08-12 16:37:29 中国标准时间";
String timeString0 = "2016-08-12 16:00:00";
String timeString1 = "2016-08-12 17:10:10";
......@@ -93,6 +94,11 @@ public class TimeUtilsTest {
System.out.println(getFriendlyTimeSpanByNow(System.currentTimeMillis() - 2 * TimeConstants.DAY));
}
@Test
public void testGetString() throws Exception {
assertThat(tomorrowTimeString).isEqualTo(getString(millis, 1, TimeConstants.DAY));
}
@Test
public void testIsSameDay() throws Exception {
System.out.println(isSameDay(System.currentTimeMillis()));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册