Skip to content

Commit 23dd088

Browse files
committed
see 05/08 log
1 parent beb6ffc commit 23dd088

File tree

6 files changed

+201
-103
lines changed

6 files changed

+201
-103
lines changed

utilcode/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ android {
1212

1313
buildTypes {
1414
debug {
15+
testCoverageEnabled true
1516
minifyEnabled true
1617
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1718
}
@@ -30,7 +31,7 @@ android {
3031
}
3132
}
3233

33-
tasks.matching {it instanceof Test}.all {
34+
tasks.matching { it instanceof Test }.all {
3435
testLogging.events = ["failed", "passed", "skipped"]
3536
}
3637

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

+158-88
Large diffs are not rendered by default.

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

+15-11
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@ public static void unregister() {
116116
*/
117117
private static Criteria getCriteria() {
118118
Criteria criteria = new Criteria();
119-
//设置定位精确度 Criteria.ACCURACY_COARSE比较粗略,Criteria.ACCURACY_FINE则比较精细
119+
// 设置定位精确度 Criteria.ACCURACY_COARSE比较粗略,Criteria.ACCURACY_FINE则比较精细
120120
criteria.setAccuracy(Criteria.ACCURACY_FINE);
121-
//设置是否要求速度
121+
// 设置是否要求速度
122122
criteria.setSpeedRequired(false);
123123
// 设置是否允许运营商收费
124124
criteria.setCostAllowed(false);
125-
//设置是否需要方位信息
125+
// 设置是否需要方位信息
126126
criteria.setBearingRequired(false);
127-
//设置是否需要海拔信息
127+
// 设置是否需要海拔信息
128128
criteria.setAltitudeRequired(false);
129129
// 设置对电源的需求
130130
criteria.setPowerRequirement(Criteria.POWER_LOW);
@@ -184,12 +184,14 @@ public static String getStreet(double latitude, double longitude) {
184184
Address address = getAddress(latitude, longitude);
185185
return address == null ? "unknown" : address.getAddressLine(0);
186186
}
187-
188-
/** Determines whether one Location reading is better than the current Location fix
189-
* @param newLocation The new Location that you want to evaluate
190-
* @param currentBestLocation The current Location fix, to which you want to compare the new one
187+
188+
/**
189+
* Determines whether one Location reading is better than the current Location fix
190+
*
191+
* @param newLocation The new Location that you want to evaluate
192+
* @param currentBestLocation The current Location fix, to which you want to compare the new one
191193
*/
192-
static boolean isBetterLocation(Location newLocation, Location currentBestLocation) {
194+
public static boolean isBetterLocation(Location newLocation, Location currentBestLocation) {
193195
if (currentBestLocation == null) {
194196
// A new location is always better than no location
195197
return true;
@@ -231,8 +233,10 @@ static boolean isBetterLocation(Location newLocation, Location currentBestLocati
231233
return false;
232234
}
233235

234-
/** Checks whether two providers are the same */
235-
static boolean isSameProvider(String provider1, String provider2) {
236+
/**
237+
* Checks whether two providers are the same
238+
*/
239+
private static boolean isSameProvider(String provider1, String provider2) {
236240
if (provider1 == null) {
237241
return provider2 == null;
238242
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
* desc : SP相关工具类
1616
* </pre>
1717
*/
18-
public final class SPUtils {
18+
public class SPUtils {
1919

20-
private SharedPreferences sp;
20+
private SharedPreferences sp;
2121
private SharedPreferences.Editor editor;
2222

2323
/**

utilcode/src/main/res/values/ids.xml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<item type="id" name="statusbarutil_fake_status_bar_view" />
4+
<item type="id" name="statusbarutil_translucent_view" />
5+
</resources>

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

+19-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,25 @@
66

77
import java.util.Date;
88

9-
import static com.blankj.utilcode.util.TimeUtils.*;
9+
import static com.blankj.utilcode.util.TimeUtils.date2Millis;
10+
import static com.blankj.utilcode.util.TimeUtils.date2String;
11+
import static com.blankj.utilcode.util.TimeUtils.getChineseZodiac;
12+
import static com.blankj.utilcode.util.TimeUtils.getFriendlyTimeSpanByNow;
13+
import static com.blankj.utilcode.util.TimeUtils.getNowMills;
14+
import static com.blankj.utilcode.util.TimeUtils.getNowString;
15+
import static com.blankj.utilcode.util.TimeUtils.getString;
16+
import static com.blankj.utilcode.util.TimeUtils.getTimeSpan;
17+
import static com.blankj.utilcode.util.TimeUtils.getWeek;
18+
import static com.blankj.utilcode.util.TimeUtils.getWeekIndex;
19+
import static com.blankj.utilcode.util.TimeUtils.getWeekOfMonth;
20+
import static com.blankj.utilcode.util.TimeUtils.getWeekOfYear;
21+
import static com.blankj.utilcode.util.TimeUtils.getZodiac;
22+
import static com.blankj.utilcode.util.TimeUtils.isLeapYear;
23+
import static com.blankj.utilcode.util.TimeUtils.isSameDay;
24+
import static com.blankj.utilcode.util.TimeUtils.millis2Date;
25+
import static com.blankj.utilcode.util.TimeUtils.millis2String;
26+
import static com.blankj.utilcode.util.TimeUtils.string2Date;
27+
import static com.blankj.utilcode.util.TimeUtils.string2Millis;
1028
import static com.google.common.truth.Truth.assertThat;
1129

1230

0 commit comments

Comments
 (0)