Skip to content

Commit b398471

Browse files
author
Blankj
committed
see 03/14 log
Signed-off-by: Blankj <625783482@qq.com>
1 parent 55e73ae commit b398471

14 files changed

Lines changed: 339 additions & 352 deletions

File tree

‎app/src/main/java/com/blankj/androidutilcode/activity/FragmentActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected void onCreate(Bundle savedInstanceState) {
3131
setContentView(R.layout.activity_fragment);
3232
ArrayList<Fragment> fragments = new ArrayList<>();
3333
fragments.add(Demo0Fragment.newInstance());
34-
rootFragment = FragmentUtils.addFragments(getSupportFragmentManager(), fragments, R.id.fragment_container, 0);
34+
rootFragment = FragmentUtils.addFragments(getSupportFragmentManager(), fragments, R.id.fragment_container, 0);
3535
}
3636

3737

‎config.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ext {
88
android = [
99
compileSdkVersion : 25,
1010
buildToolsVersion : "25.0.2",
11-
minSdkVersion : 11,
11+
minSdkVersion : 19,
1212
targetSdkVersion : 25,
1313
versionCode : 15,
1414
versionName : "1.3.6"

‎update_log.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
* 17/02/14 完善FragmentUtils中，修复部分bug
1+
* 17/03/14 新增常量包
22
* 17/02/14 完善FragmentUtils中，Demo测试中
33
* 17/02/13 完善FragmentUtils中
44
* 17/02/12 完善FragmentUtils中

‎utilcode/src/main/java/com/blankj/utilcode/utils/AppUtils.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -501,13 +501,13 @@ public static boolean isAppForeground(Context context, String packageName) {
501501
*/
502502
public static class AppInfo {
503503

504-
private String name;
504+
private String name;
505505
private Drawable icon;
506-
private String packageName;
507-
private String packagePath;
508-
private String versionName;
509-
private int versionCode;
510-
private boolean isSystem;
506+
private String packageName;
507+
private String packagePath;
508+
private String versionName;
509+
private int versionCode;
510+
private boolean isSystem;
511511

512512
public Drawable getIcon() {
513513
return icon;

‎utilcode/src/main/java/com/blankj/utilcode/utils/ConstUtils.java‎

Lines changed: 0 additions & 166 deletions
This file was deleted.

‎utilcode/src/main/java/com/blankj/utilcode/utils/ConvertUtils.java‎

Lines changed: 37 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
import android.graphics.drawable.Drawable;
1111
import android.view.View;
1212

13+
import com.blankj.utilcode.utils.constant.MemoryConstant;
14+
import com.blankj.utilcode.utils.constant.TimeConstant;
15+
1316
import java.io.ByteArrayInputStream;
1417
import java.io.ByteArrayOutputStream;
1518
import java.io.IOException;
@@ -131,26 +134,16 @@ public static char[] bytes2Chars(byte[] bytes) {
131134
* @param memorySize 大小
132135
* @param unit 单位类型
133136
* <ul>
134-
* <li>{@link ConstUtils.MemoryUnit#BYTE}: 字节</li>
135-
* <li>{@link ConstUtils.MemoryUnit#KB} : 千字节</li>
136-
* <li>{@link ConstUtils.MemoryUnit#MB} : 兆</li>
137-
* <li>{@link ConstUtils.MemoryUnit#GB} : GB</li>
137+
* <li>{@link MemoryConstant#BYTE}: 字节</li>
138+
* <li>{@link MemoryConstant#KB} : 千字节</li>
139+
* <li>{@link MemoryConstant#MB} : 兆</li>
140+
* <li>{@link MemoryConstant#GB} : GB</li>
138141
* </ul>
139142
* @return 字节数
140143
*/
141-
public static long memorySize2Byte(long memorySize, ConstUtils.MemoryUnit unit) {
144+
public static long memorySize2Byte(long memorySize, @MemoryConstant.Unit int unit) {
142145
if (memorySize < 0) return -1;
143-
switch (unit) {
144-
default:
145-
case BYTE:
146-
return memorySize;
147-
case KB:
148-
return memorySize * ConstUtils.KB;
149-
case MB:
150-
return memorySize * ConstUtils.MB;
151-
case GB:
152-
return memorySize * ConstUtils.GB;
153-
}
146+
return memorySize * unit;
154147
}
155148

156149
/**
@@ -159,26 +152,16 @@ public static long memorySize2Byte(long memorySize, ConstUtils.MemoryUnit unit)
159152
* @param byteNum 字节数
160153
* @param unit 单位类型
161154
* <ul>
162-
* <li>{@link ConstUtils.MemoryUnit#BYTE}: 字节</li>
163-
* <li>{@link ConstUtils.MemoryUnit#KB} : 千字节</li>
164-
* <li>{@link ConstUtils.MemoryUnit#MB} : 兆</li>
165-
* <li>{@link ConstUtils.MemoryUnit#GB} : GB</li>
155+
* <li>{@link MemoryConstant#BYTE}: 字节</li>
156+
* <li>{@link MemoryConstant#KB} : 千字节</li>
157+
* <li>{@link MemoryConstant#MB} : 兆</li>
158+
* <li>{@link MemoryConstant#GB} : GB</li>
166159
* </ul>
167160
* @return 以unit为单位的size
168161
*/
169-
public static double byte2MemorySize(long byteNum, ConstUtils.MemoryUnit unit) {
162+
public static double byte2MemorySize(long byteNum, @MemoryConstant.Unit int unit) {
170163
if (byteNum < 0) return -1;
171-
switch (unit) {
172-
default:
173-
case BYTE:
174-
return (double) byteNum;
175-
case KB:
176-
return (double) byteNum / ConstUtils.KB;
177-
case MB:
178-
return (double) byteNum / ConstUtils.MB;
179-
case GB:
180-
return (double) byteNum / ConstUtils.GB;
181-
}
164+
return (double) byteNum / unit;
182165
}
183166

184167
/**
@@ -192,14 +175,14 @@ public static double byte2MemorySize(long byteNum, ConstUtils.MemoryUnit unit) {
192175
public static String byte2FitMemorySize(long byteNum) {
193176
if (byteNum < 0) {
194177
return "shouldn't be less than zero!";
195-
} else if (byteNum < ConstUtils.KB) {
178+
} else if (byteNum < MemoryConstant.KB) {
196179
return String.format("%.3fB", (double) byteNum + 0.0005);
197-
} else if (byteNum < ConstUtils.MB) {
198-
return String.format("%.3fKB", (double) byteNum / ConstUtils.KB + 0.0005);
199-
} else if (byteNum < ConstUtils.GB) {
200-
return String.format("%.3fMB", (double) byteNum / ConstUtils.MB + 0.0005);
180+
} else if (byteNum < MemoryConstant.MB) {
181+
return String.format("%.3fKB", (double) byteNum / MemoryConstant.KB + 0.0005);
182+
} else if (byteNum < MemoryConstant.GB) {
183+
return String.format("%.3fMB", (double) byteNum / MemoryConstant.MB + 0.0005);
201184
} else {
202-
return String.format("%.3fGB", (double) byteNum / ConstUtils.GB + 0.0005);
185+
return String.format("%.3fGB", (double) byteNum / MemoryConstant.GB + 0.0005);
203186
}
204187
}
205188

@@ -209,28 +192,16 @@ public static String byte2FitMemorySize(long byteNum) {
209192
* @param timeSpan 毫秒时间戳
210193
* @param unit 单位类型
211194
* <ul>
212-
* <li>{@link ConstUtils.TimeUnit#MSEC}: 毫秒</li>
213-
* <li>{@link ConstUtils.TimeUnit#SEC }: 秒</li>
214-
* <li>{@link ConstUtils.TimeUnit#MIN }: 分</li>
215-
* <li>{@link ConstUtils.TimeUnit#HOUR}: 小时</li>
216-
* <li>{@link ConstUtils.TimeUnit#DAY }: 天</li>
195+
* <li>{@link TimeConstant#MSEC}: 毫秒</li>
196+
* <li>{@link TimeConstant#SEC }: 秒</li>
197+
* <li>{@link TimeConstant#MIN }: 分</li>
198+
* <li>{@link TimeConstant#HOUR}: 小时</li>
199+
* <li>{@link TimeConstant#DAY }: 天</li>
217200
* </ul>
218201
* @return 毫秒时间戳
219202
*/
220-
public static long timeSpan2Millis(long timeSpan, ConstUtils.TimeUnit unit) {
221-
switch (unit) {
222-
default:
223-
case MSEC:
224-
return timeSpan;
225-
case SEC:
226-
return timeSpan * ConstUtils.SEC;
227-
case MIN:
228-
return timeSpan * ConstUtils.MIN;
229-
case HOUR:
230-
return timeSpan * ConstUtils.HOUR;
231-
case DAY:
232-
return timeSpan * ConstUtils.DAY;
233-
}
203+
public static long timeSpan2Millis(long timeSpan, @TimeConstant.Unit int unit) {
204+
return timeSpan * unit;
234205
}
235206

236207
/**
@@ -239,28 +210,16 @@ public static long timeSpan2Millis(long timeSpan, ConstUtils.TimeUnit unit) {
239210
* @param millis 毫秒时间戳
240211
* @param unit 单位类型
241212
* <ul>
242-
* <li>{@link ConstUtils.TimeUnit#MSEC}: 毫秒</li>
243-
* <li>{@link ConstUtils.TimeUnit#SEC }: 秒</li>
244-
* <li>{@link ConstUtils.TimeUnit#MIN }: 分</li>
245-
* <li>{@link ConstUtils.TimeUnit#HOUR}: 小时</li>
246-
* <li>{@link ConstUtils.TimeUnit#DAY }: 天</li>
213+
* <li>{@link TimeConstant#MSEC}: 毫秒</li>
214+
* <li>{@link TimeConstant#SEC }: 秒</li>
215+
* <li>{@link TimeConstant#MIN }: 分</li>
216+
* <li>{@link TimeConstant#HOUR}: 小时</li>
217+
* <li>{@link TimeConstant#DAY }: 天</li>
247218
* </ul>
248219
* @return 以unit为单位的时间长度
249220
*/
250-
public static long millis2TimeSpan(long millis, ConstUtils.TimeUnit unit) {
251-
switch (unit) {
252-
default:
253-
case MSEC:
254-
return millis;
255-
case SEC:
256-
return millis / ConstUtils.SEC;
257-
case MIN:
258-
return millis / ConstUtils.MIN;
259-
case HOUR:
260-
return millis / ConstUtils.HOUR;
261-
case DAY:
262-
return millis / ConstUtils.DAY;
263-
}
221+
public static long millis2TimeSpan(long millis, @TimeConstant.Unit int unit) {
222+
return millis / unit;
264223
}
265224

266225
/**
@@ -348,9 +307,9 @@ public static ByteArrayOutputStream input2OutputStream(InputStream is) {
348307
if (is == null) return null;
349308
try {
350309
ByteArrayOutputStream os = new ByteArrayOutputStream();
351-
byte[] b = new byte[ConstUtils.KB];
310+
byte[] b = new byte[MemoryConstant.KB];
352311
int len;
353-
while ((len = is.read(b, 0, ConstUtils.KB)) != -1) {
312+
while ((len = is.read(b, 0, MemoryConstant.KB)) != -1) {
354313
os.write(b, 0, len);
355314
}
356315
return os;

0 commit comments

Comments
 (0)