Skip to content

Commit dfeabab

Browse files
committed
see 01/24 log
1 parent d46e7ce commit dfeabab

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

utilcode/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ dependencies {
2525
testCompile rootProject.ext.deps.truth
2626
testCompile rootProject.ext.deps.robolectric
2727
}
28-
//apply from: "https://raw.githubusercontent.com/xiaopansky/android-library-publish-to-jcenter/master/bintrayUpload.gradle"
28+
apply from: "https://raw.githubusercontent.com/xiaopansky/android-library-publish-to-jcenter/master/bintrayUpload.gradle"
2929
//gradlew bintrayUpload

utilcode/src/main/java/com/blankj/utilcode/utils/LunarUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ private static long SolarToInt(int y, int m, int d) {
7777

7878
/**
7979
* @param lunarYear 农历年份
80-
* @return String of Ganzhi: 甲子年 Tiangan:甲乙丙丁戊己庚辛壬癸<br/>
80+
* @return String of Ganzhi: 甲子年 Tiangan:甲乙丙丁戊己庚辛壬癸
8181
* Dizhi: 子丑寅卯辰巳无为申酉戌亥
8282
*/
8383
public static String lunarYearToGanZhi(int lunarYear) {

utilcode/src/main/java/com/blankj/utilcode/utils/ScreenUtils.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,13 @@ public static Bitmap captureWithoutStatusBar(Activity activity) {
154154
* @return {@code true}: 是<br>{@code false}: 否
155155
*/
156156
public static boolean isScreenLock() {
157-
KeyguardManager km = (KeyguardManager) Utils.getContext()
158-
.getSystemService(Context.KEYGUARD_SERVICE);
157+
KeyguardManager km = (KeyguardManager) Utils.getContext().getSystemService(Context.KEYGUARD_SERVICE);
159158
return km.inKeyguardRestrictedInputMode();
160159
}
161160

162161
/**
163162
* 设置进入休眠时长
164-
* <uses-permission android:name="android.permission.WRITE_SETTINGS" />
163+
* <p>需添加权限 {@code <uses-permission android:name="android.permission.WRITE_SETTINGS" />}</p>
165164
*
166165
* @param duration 时长
167166
*/

utilcode/src/test/java/com/blankj/utilcode/utils/TestUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ public class TestUtils {
2525

2626
static final char SEP = File.separatorChar;
2727

28-
static final String BASEPATH = System.getProperty("user.dir")
29-
+ SEP + "src" + SEP + "test" + SEP + "res" + SEP;
28+
static final String BASEPATH = System.getProperty("user.dir") + SEP + "src" + SEP + "test" + SEP + "res" + SEP;
3029

3130
public static void init() {
3231
Utils.init(RuntimeEnvironment.application);

0 commit comments

Comments
 (0)