Skip to content

Commit ea43b05

Browse files
BlankjBlankj
committed
modify some file
1 parent c5be8ba commit ea43b05

File tree

6 files changed

+72
-40
lines changed

6 files changed

+72
-40
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Android开发人员不得不收集的代码(持续更新中)
1+
## Android开发人员不得不收集的代码(持续更新中)
22
***
33
为方便查找，已进行大致归类，其目录如下所示：
44
> - [App相关][app.md]→[AppUtils.java][app.java]
@@ -96,7 +96,7 @@
9696
> - SP中写入boolean类型value *putBoolean*
9797
> - SP中读取boolean *getBoolean*
9898
99-
> [时间相关][time.md]→[TimeUtils.java][time.java]
99+
> - [时间相关][time.md]→[TimeUtils.java][time.java]
100100
> - 将时间戳转为时间字符串 *milliseconds2String*
101101
> - 将时间字符串转为时间戳 *string2Milliseconds*
102102
> - 将时间字符串转为Date类型 *string2Date*

‎utilcode/.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
/build
1+
/build
2+
local.properties

‎utilcode/build.gradle

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'com.github.dcendents.android-maven'
33

4-
group='com.github.icodeu'
4+
group = 'com.github.icodeu'
55

66
android {
77
compileSdkVersion 23
@@ -22,8 +22,7 @@ android {
2222
}
2323

2424
dependencies {
25-
compile fileTree(dir: 'libs', include: ['*.jar'])
26-
provided 'com.android.support:appcompat-v7:23.3.0'
2725
testCompile 'junit:junit:4.12'
26+
testCompile 'org.robolectric:robolectric:3.1.2'
2827
}
2928
apply from: "https://raw.githubusercontent.com/xiaopansky/android-library-publish-to-jcenter/master/bintrayUpload.gradle"

‎utilcode/local.properties

-8
This file was deleted.

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

+20-15
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
package com.blankj.utilcode.utils;
22

3-
import org.junit.Assert;
43
import org.junit.Before;
54
import org.junit.Test;
65

7-
/*********************************************
8-
* author: Blankj on 2016/8/6 14:02
9-
* blog: http://blankj.com
10-
* e-mail: [email protected]
11-
*********************************************/
6+
import static org.junit.Assert.assertEquals;
7+
8+
/**
9+
* <pre>
10+
* author: Blankj
11+
* blog : http://blankj.com
12+
* time : 2016/8/6
13+
* desc : EncryptUtils单元测试
14+
* </pre>
15+
*/
1216
public class EncryptUtilsTest {
1317

1418
@Before
@@ -18,27 +22,28 @@ public void setUp() throws Exception {
1822

1923
@Test
2024
public void testGetMD5() throws Exception {
21-
Assert.assertEquals(EncryptUtils.getMD5("blankj"), "AAC25CD336E01C8655F4EC7875445A60");
25+
assertEquals(EncryptUtils.getMD5("blankj"), "AAC25CD336E01C8655F4EC7875445A60");
26+
2227
}
2328

2429
@Test
2530
public void testGetMD51() throws Exception {
26-
Assert.assertEquals(EncryptUtils.getMD5("blank", "j"), "AAC25CD336E01C8655F4EC7875445A60");
31+
assertEquals(EncryptUtils.getMD5("blank", "j"), "AAC25CD336E01C8655F4EC7875445A60");
2732
}
2833

2934
@Test
3035
public void testGetMD52() throws Exception {
31-
Assert.assertEquals(EncryptUtils.getMD5("blankj".getBytes()), "AAC25CD336E01C8655F4EC7875445A60");
36+
assertEquals(EncryptUtils.getMD5("blankj".getBytes()), "AAC25CD336E01C8655F4EC7875445A60");
3237
}
3338

3439
@Test
3540
public void testGetMD53() throws Exception {
36-
Assert.assertEquals(EncryptUtils.getMD5("blank".getBytes(), "j".getBytes()), "AAC25CD336E01C8655F4EC7875445A60");
41+
assertEquals(EncryptUtils.getMD5("blank".getBytes(), "j".getBytes()), "AAC25CD336E01C8655F4EC7875445A60");
3742
}
3843

3944
@Test
4045
public void testEncryptMD5() throws Exception {
41-
Assert.assertEquals(EncryptUtils.bytes2Hex(EncryptUtils.encryptMD5("blankj".getBytes())), "AAC25CD336E01C8655F4EC7875445A60");
46+
assertEquals(EncryptUtils.bytes2Hex(EncryptUtils.encryptMD5("blankj".getBytes())), "AAC25CD336E01C8655F4EC7875445A60");
4247
}
4348

4449
@Test
@@ -53,21 +58,21 @@ public void testGetMD5File1() throws Exception {
5358

5459
@Test
5560
public void testGetSHA() throws Exception {
56-
Assert.assertEquals(EncryptUtils.getSHA("blankj"), "C606ACCB1FEB669E19D080ADDDDBB8E6CDA5F43C");
61+
assertEquals(EncryptUtils.getSHA("blankj"), "C606ACCB1FEB669E19D080ADDDDBB8E6CDA5F43C");
5762
}
5863

5964
@Test
6065
public void testGetSHA1() throws Exception {
61-
Assert.assertEquals(EncryptUtils.getSHA("blankj".getBytes()), "C606ACCB1FEB669E19D080ADDDDBB8E6CDA5F43C");
66+
assertEquals(EncryptUtils.getSHA("blankj".getBytes()), "C606ACCB1FEB669E19D080ADDDDBB8E6CDA5F43C");
6267
}
6368

6469
@Test
6570
public void testEncryptSHA() throws Exception {
66-
Assert.assertEquals(EncryptUtils.bytes2Hex(EncryptUtils.encryptSHA("blankj".getBytes())), "C606ACCB1FEB669E19D080ADDDDBB8E6CDA5F43C");
71+
assertEquals(EncryptUtils.bytes2Hex(EncryptUtils.encryptSHA("blankj".getBytes())), "C606ACCB1FEB669E19D080ADDDDBB8E6CDA5F43C");
6772
}
6873

6974
@Test
7075
public void testBytes2Hex() throws Exception {
71-
Assert.assertEquals(EncryptUtils.bytes2Hex(new byte[]{(byte) 0xff, (byte) 0x11}), "FF11");
76+
assertEquals(EncryptUtils.bytes2Hex(new byte[]{(byte) 0xff, (byte) 0x11}), "FF11");
7277
}
7378
}

‎utilcode/utilcode.iml

+46-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":utilcode" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.icodeu" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":utilcode" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.blankj" external.system.module.version="1.0" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -88,10 +88,6 @@
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
9090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.3.0/jars" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.3.0/jars" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.3.0/jars" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.3.0/jars" />
9591
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9692
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
9793
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
@@ -106,14 +102,53 @@
106102
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
107103
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
108104
</content>
109-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
105+
<orderEntry type="jdk" jdkName="Android API 23 Platform (2)" jdkType="Android SDK" />
110106
<orderEntry type="sourceFolder" forTests="false" />
111-
<orderEntry type="library" exported="" name="support-v4-23.3.0" level="project" />
107+
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
108+
<orderEntry type="library" exported="" scope="TEST" name="backport-util-concurrent-3.1" level="project" />
109+
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
110+
<orderEntry type="library" exported="" scope="TEST" name="xercesMinimal-1.9.6.2" level="project" />
111+
<orderEntry type="library" exported="" scope="TEST" name="maven-profile-2.2.1" level="project" />
112+
<orderEntry type="library" exported="" scope="TEST" name="maven-settings-2.2.1" level="project" />
113+
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
114+
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
115+
<orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-2.1" level="project" />
116+
<orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
117+
<orderEntry type="library" exported="" scope="TEST" name="xpp3_min-1.1.4c" level="project" />
118+
<orderEntry type="library" exported="" scope="TEST" name="wagon-http-lightweight-1.0-beta-6" level="project" />
119+
<orderEntry type="library" exported="" scope="TEST" name="nekohtml-1.9.6.2" level="project" />
120+
<orderEntry type="library" exported="" scope="TEST" name="wagon-file-1.0-beta-6" level="project" />
121+
<orderEntry type="library" exported="" scope="TEST" name="maven-error-diagnostics-2.2.1" level="project" />
122+
<orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
123+
<orderEntry type="library" exported="" scope="TEST" name="maven-repository-metadata-2.2.1" level="project" />
124+
<orderEntry type="library" exported="" scope="TEST" name="wagon-provider-api-1.0-beta-6" level="project" />
125+
<orderEntry type="library" exported="" scope="TEST" name="xstream-1.4.8" level="project" />
126+
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
127+
<orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
128+
<orderEntry type="library" exported="" scope="TEST" name="wagon-http-shared-1.0-beta-6" level="project" />
129+
<orderEntry type="library" exported="" scope="TEST" name="maven-model-2.2.1" level="project" />
130+
<orderEntry type="library" exported="" scope="TEST" name="xmlpull-1.1.3.1" level="project" />
131+
<orderEntry type="library" exported="" scope="TEST" name="maven-artifact-2.2.1" level="project" />
132+
<orderEntry type="library" exported="" scope="TEST" name="guava-19.0" level="project" />
133+
<orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.1.2" level="project" />
134+
<orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
135+
<orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.1.2" level="project" />
136+
<orderEntry type="library" exported="" scope="TEST" name="robolectric-3.1.2" level="project" />
137+
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
138+
<orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
139+
<orderEntry type="library" exported="" scope="TEST" name="plexus-utils-1.5.15" level="project" />
140+
<orderEntry type="library" exported="" scope="TEST" name="maven-plugin-registry-2.2.1" level="project" />
141+
<orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
142+
<orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.1.2" level="project" />
143+
<orderEntry type="library" exported="" scope="TEST" name="protobuf-java-2.6.1" level="project" />
144+
<orderEntry type="library" exported="" scope="TEST" name="maven-project-2.2.1" level="project" />
112145
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
146+
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
113147
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
114-
<orderEntry type="library" exported="" name="support-annotations-23.3.0" level="project" />
115-
<orderEntry type="library" exported="" name="support-vector-drawable-23.3.0" level="project" />
116-
<orderEntry type="library" exported="" name="animated-vector-drawable-23.3.0" level="project" />
117-
<orderEntry type="library" exported="" name="appcompat-v7-23.3.0" level="project" />
148+
<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="classworlds-1.1-alpha-2" level="project" />
150+
<orderEntry type="library" exported="" scope="TEST" name="shadows-core-v23-3.1.2" level="project" />
151+
<orderEntry type="library" exported="" scope="TEST" name="plexus-interpolation-1.11" level="project" />
152+
<orderEntry type="library" exported="" scope="TEST" name="maven-artifact-manager-2.2.1" level="project" />
118153
</component>
119154
</module>

0 commit comments

Comments
 (0)