Skip to content

Commit dd2193e

Browse files
BlankjBlankj
committed
see 08/23 log
1 parent 7ec95e8 commit dd2193e

File tree

6 files changed

+91
-17
lines changed

6 files changed

+91
-17
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ limitations under the License.
280280

281281
[network.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/utils/NetworkUtils.java
282282

283-
[phone.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/utils/PhonekUtils.java
283+
[phone.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/utils/PhoneUtils.java
284284

285285
[regular.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/utils/RegularUtils.java
286286
[regular.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/utils/RegularUtilsTest.java

‎update_log.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
###
2+
#### 16/08/23 小修bug，接下来完善SDCardUtils和ImageUtils
23
#### 16/08/22 SPUtils将commit改为apply提高效率，将SPUtils改为构造函数法创建，FileUtils新增查找函数，规范JavaDoc
34
#### 16/08/21 FileUtils单元测试完毕，修复FileUtils的bug，发布版本1.1.2
45
#### 16/08/20 更新目录，继续完善FileUtils单元测试，发布版本1.1.1

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
package com.blankj.utilcode.utils;
22

3+
import java.io.ByteArrayInputStream;
4+
import java.io.ByteArrayOutputStream;
5+
import java.io.IOException;
6+
import java.io.InputStream;
7+
38
/**
49
* <pre>
510
* author: Blankj
@@ -95,4 +100,38 @@ public static char[] bytes2Chars(byte[] bytes) {
95100
}
96101
return chars;
97102
}
103+
104+
/**
105+
* 将输入流转为字节数组
106+
*
107+
* @param is 输入流
108+
* @return 字节数组
109+
*/
110+
public static byte[] inputStream2Bytes(InputStream is) {
111+
if (is == null) return null;
112+
try {
113+
ByteArrayOutputStream os = new ByteArrayOutputStream();
114+
byte[] b = new byte[ConstUtils.KB];
115+
int len;
116+
while ((len = is.read(b)) != -1) {
117+
os.write(b, 0, len);
118+
}
119+
return os.toByteArray();
120+
} catch (IOException e) {
121+
e.printStackTrace();
122+
return null;
123+
} finally {
124+
FileUtils.closeIO(is);
125+
}
126+
}
127+
128+
/**
129+
* 将字节数组转为输入流
130+
*
131+
* @param bytes 字节数组
132+
* @return 输入流
133+
*/
134+
public static InputStream bytes2InputStream(byte[] bytes) {
135+
return new ByteArrayInputStream(bytes);
136+
}
98137
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.blankj.utilcode.utils;
22

3+
import android.content.Context;
34
import android.os.Environment;
45

56
import java.io.File;
@@ -37,6 +38,10 @@ public static String getSDCardPath() {
3738
return Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator;
3839
}
3940

41+
public static String getSDCardCacheDir(Context context){
42+
return context.getExternalCacheDir().getPath();
43+
}
44+
4045
// /**
4146
// * 计算SD卡的剩余空间
4247
// *

‎utilcode/src/test/java/com/blankj/utilcode/utils/SDCardUtilsTest.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com.blankj.utilcode.utils;
2+
3+
import org.junit.Test;
4+
import org.junit.runner.RunWith;
5+
import org.robolectric.RobolectricTestRunner;
6+
import org.robolectric.annotation.Config;
7+
8+
/**
9+
* <pre>
10+
* author: Blankj
11+
* blog : http://blankj.com
12+
* time : 2016/8/23
13+
* desc : SDCard单元测试
14+
* </pre>
15+
*/
16+
@RunWith(RobolectricTestRunner.class)
17+
@Config(manifest = Config.NONE)
18+
public class SDCardUtilsTest {
19+
20+
@Test
21+
public void testIsSDCardEnable() throws Exception {
22+
System.out.println(SDCardUtils.isSDCardEnable());
23+
}
24+
25+
@Test
26+
public void testGetSDCardPath() throws Exception {
27+
System.out.println(SDCardUtils.getSDCardPath());
28+
}
29+
}

‎utilcode/utilcode.iml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,6 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7668
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7769
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -81,6 +73,14 @@
8173
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8274
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8375
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
@@ -101,34 +101,34 @@
101101
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
102102
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
103103
</content>
104-
<orderEntry type="jdk" jdkName="Android API 23 Platform (2)" jdkType="Android SDK" />
104+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
105105
<orderEntry type="sourceFolder" forTests="false" />
106-
<orderEntry type="library" exported="" scope="TEST" name="backport-util-concurrent-3.1" level="project" />
107106
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
108-
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
107+
<orderEntry type="library" exported="" scope="TEST" name="backport-util-concurrent-3.1" level="project" />
109108
<orderEntry type="library" exported="" scope="TEST" name="maven-profile-2.2.1" level="project" />
110109
<orderEntry type="library" exported="" scope="TEST" name="xercesMinimal-1.9.6.2" level="project" />
110+
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
111111
<orderEntry type="library" exported="" scope="TEST" name="maven-settings-2.2.1" level="project" />
112112
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
113+
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
113114
<orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
114115
<orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-2.1" level="project" />
115-
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
116116
<orderEntry type="library" exported="" scope="TEST" name="xpp3_min-1.1.4c" level="project" />
117117
<orderEntry type="library" exported="" scope="TEST" name="nekohtml-1.9.6.2" level="project" />
118118
<orderEntry type="library" exported="" scope="TEST" name="wagon-http-lightweight-1.0-beta-6" level="project" />
119119
<orderEntry type="library" exported="" scope="TEST" name="wagon-file-1.0-beta-6" level="project" />
120120
<orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
121121
<orderEntry type="library" exported="" scope="TEST" name="maven-error-diagnostics-2.2.1" level="project" />
122122
<orderEntry type="library" exported="" scope="TEST" name="maven-repository-metadata-2.2.1" level="project" />
123-
<orderEntry type="library" exported="" scope="TEST" name="xstream-1.4.8" level="project" />
124123
<orderEntry type="library" exported="" scope="TEST" name="wagon-provider-api-1.0-beta-6" level="project" />
124+
<orderEntry type="library" exported="" scope="TEST" name="xstream-1.4.8" level="project" />
125125
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
126126
<orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
127127
<orderEntry type="library" exported="" scope="TEST" name="wagon-http-shared-1.0-beta-6" level="project" />
128128
<orderEntry type="library" exported="" scope="TEST" name="maven-model-2.2.1" level="project" />
129129
<orderEntry type="library" exported="" scope="TEST" name="xmlpull-1.1.3.1" level="project" />
130-
<orderEntry type="library" exported="" scope="TEST" name="maven-artifact-2.2.1" level="project" />
131130
<orderEntry type="library" exported="" scope="TEST" name="error_prone_annotations-2.0.8" level="project" />
131+
<orderEntry type="library" exported="" scope="TEST" name="maven-artifact-2.2.1" level="project" />
132132
<orderEntry type="library" exported="" scope="TEST" name="truth-0.29" level="project" />
133133
<orderEntry type="library" exported="" scope="TEST" name="guava-19.0" level="project" />
134134
<orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.1.2" level="project" />
@@ -145,11 +145,11 @@
145145
<orderEntry type="library" exported="" scope="TEST" name="maven-project-2.2.1" level="project" />
146146
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
147147
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
148-
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
149148
<orderEntry type="library" exported="" scope="TEST" name="plexus-container-default-1.0-alpha-9-stable-1" level="project" />
149+
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
150+
<orderEntry type="library" exported="" scope="TEST" name="classworlds-1.1-alpha-2" level="project" />
150151
<orderEntry type="library" exported="" scope="TEST" name="maven-artifact-manager-2.2.1" level="project" />
151152
<orderEntry type="library" exported="" scope="TEST" name="plexus-interpolation-1.11" level="project" />
152-
<orderEntry type="library" exported="" scope="TEST" name="classworlds-1.1-alpha-2" level="project" />
153153
<orderEntry type="library" exported="" scope="TEST" name="shadows-core-v23-3.1.2" level="project" />
154154
</component>
155155
</module>

0 commit comments

Comments
 (0)