Skip to content

Commit 0f566fd

Browse files
BlankjBlankj
committed
see 04/08 log
1 parent 377f063 commit 0f566fd

File tree

13 files changed

+223
-129
lines changed

13 files changed

+223
-129
lines changed

‎app/src/main/java/com/blankj/androidutilcode/feature/core/activity/ActivityActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ public void initView(Bundle savedInstanceState, View contentView) {
9696
.appendLine("isActivityExists: " + ActivityUtils.isActivityExists(Config.PKG, SubActivityActivity.class.getName()))
9797
.appendLine("getLauncherActivity: " + ActivityUtils.getLauncherActivity(Config.PKG))
9898
.appendLine("getTopActivity: " + ActivityUtils.getTopActivity())
99-
.appendLine("getTopActivity: " + ActivityUtils.getTopActivity())
10099
.appendLine("isActivityExistsInStack: " + ActivityUtils.isActivityExistsInStack(CoreUtilActivity.class))
101100
.append("getActivityIcon: ")
102101
.appendImage(ActivityUtils.getActivityIcon(ActivityActivity.class), SpanUtils.ALIGN_CENTER)

‎subutil/README-CN.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,21 @@ copyIntent: 复制意图到剪贴板
2525
getIntent : 获取剪贴板的意图
2626
```
2727

28+
* ### 克隆相关 -> [CloneUtils.java][clone.java] -> [Test][clone.test]
29+
```
30+
deepClone: 深度克隆
31+
```
32+
33+
* ### 坐标转换相关 -> [CoordinateUtils.java][coordinate.java] -> [Test][coordinate.test]
34+
```
35+
bd09ToGcj02 : BD09 坐标转 GCJ02 坐标
36+
gcj02ToBd09 : GCJ02 坐标转 BD09 坐标
37+
gcj02ToWGS84: GCJ02 坐标转 WGS84 坐标
38+
wgs84ToGcj02: WGS84 坐标转 GCJ02 坐标
39+
bd09ToWGS84 : BD09 坐标转 WGS84 坐标
40+
wgs84ToBd09 : WGS84 坐标转 BD09 坐标
41+
```
42+
2843
* ### Gson 相关 -> [GsonUtils.java][gson.java] -> [Test][gson.test]
2944
```
3045
getGson : 获取 Gson 对象
@@ -84,6 +99,12 @@ scheduleWithFixedDelay: 延迟并以固定休息时间循环执行命令
8499
[clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/main/java/com/blankj/subutil/util/ClipboardUtils.java
85100
[clipboard.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java
86101

102+
[clone.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/main/java/com/blankj/subutil/util/CloneUtils.java
103+
[clone.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/test/java/com/blankj/subutil/util/CloneUtilsTest.java
104+
105+
[coordinate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/main/java/com/blankj/subutil/util/CoordinateUtils.java
106+
[coordinate.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/test/java/com/blankj/subutil/util/CoordinateUtilsTest.java
107+
87108
[gson.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/main/java/com/blankj/subutil/util/GsonUtils.java
88109
[gson.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/test/java/com/blankj/subutil/util/GsonUtilsTest.java
89110

‎subutil/README.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,21 @@ copyIntent
2525
getIntent
2626
```
2727

28+
* ### About Clone -> [CloneUtils.java][clone.java] -> [Test][clone.test]
29+
```
30+
deepClone
31+
```
32+
33+
* ### About Coordinate -> [CoordinateUtils.java][coordinate.java] -> [Test][coordinate.test]
34+
```
35+
bd09ToGcj02
36+
gcj02ToBd09
37+
gcj02ToWGS84
38+
wgs84ToGcj02
39+
bd09ToWGS84
40+
wgs84ToBd09
41+
```
42+
2843
* ### About Gson -> [GsonUtils.java][gson.java] -> [Test][gson.test]
2944
```
3045
getGson
@@ -84,6 +99,12 @@ scheduleWithFixedDelay
8499
[clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/main/java/com/blankj/subutil/util/ClipboardUtils.java
85100
[clipboard.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java
86101

102+
[clone.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/main/java/com/blankj/subutil/util/CloneUtils.java
103+
[clone.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/test/java/com/blankj/subutil/util/CloneUtilsTest.java
104+
105+
[coordinate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/main/java/com/blankj/subutil/util/CoordinateUtils.java
106+
[coordinate.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/test/java/com/blankj/subutil/util/CoordinateUtilsTest.java
107+
87108
[gson.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/main/java/com/blankj/subutil/util/GsonUtils.java
88109
[gson.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/src/test/java/com/blankj/subutil/util/GsonUtilsTest.java
89110

‎subutil/src/main/java/com/blankj/subutil/util/CoordinateConvertUtils.java renamed to ‎subutil/src/main/java/com/blankj/subutil/util/CoordinateUtils.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
* author: Blankj
88
* blog : http://blankj.com
99
* time : 2018/03/21
10-
* desc : 坐标转换工具类
10+
* desc : 坐标相关工具类
1111
* </pre>
1212
*/
13-
public final class CoordinateConvertUtils {
13+
public final class CoordinateUtils {
1414

1515
private final static double X_PI = 3.14159265358979324 * 3000.0 / 180.0;
1616
private final static double A = 6378245.0;
@@ -73,7 +73,7 @@ public static double[] gcj02ToWGS84(double lng, double lat) {
7373
}
7474

7575
/**
76-
* WGS84 坐标 转 GCJ02 坐标
76+
* WGS84 坐标转 GCJ02 坐标
7777
*
7878
* @param lng WGS84 坐标经度
7979
* @param lat WGS84 坐标纬度
@@ -97,7 +97,7 @@ public static double[] wgs84ToGcj02(double lng, double lat) {
9797
}
9898

9999
/**
100-
* BD09 坐标 转 WGS84 坐标
100+
* BD09 坐标转 WGS84 坐标
101101
*
102102
* @param lng BD09 坐标经度
103103
* @param lat BD09 坐标纬度
@@ -137,14 +137,7 @@ private static double transformLng(double lng, double lat) {
137137
return ret;
138138
}
139139

140-
/**
141-
* 判断坐标是否不在国内
142-
*
143-
* @param lng 经度
144-
* @param lat 纬度
145-
* @return 坐标是否在国内
146-
*/
147-
public static boolean outOfChina(double lng, double lat) {
140+
private static boolean outOfChina(double lng, double lat) {
148141
return lng < 72.004 || lng > 137.8347 || lat < 0.8293 || lat > 55.8271;
149142
}
150143
}

‎subutil/src/main/java/com/blankj/subutil/util/Utils.java

Lines changed: 29 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,49 +2,27 @@
22

33
import android.annotation.SuppressLint;
44
import android.app.Application;
5+
import android.content.Context;
56
import android.support.annotation.NonNull;
67

78
/**
89
* <pre>
9-
* author: Blankj
10+
* author:
11+
* ___ ___ ___ ___
12+
* _____ / /\ /__/\ /__/| / /\
13+
* / /::\ / /::\ \ \:\ | |:| / /:/
14+
* / /:/\:\ ___ ___ / /:/\:\ \ \:\ | |:| /__/::\
15+
* / /:/~/::\ /__/\ / /\ / /:/~/::\ _____\__\:\ __| |:| \__\/\:\
16+
* /__/:/ /:/\:| \ \:\ / /:/ /__/:/ /:/\:\ /__/::::::::\ /__/\_|:|____ \ \:\
17+
* \ \:\/:/~/:/ \ \:\ /:/ \ \:\/:/__\/ \ \:\~~\~~\/ \ \:\/:::::/ \__\:\
18+
* \ \::/ /:/ \ \:\/:/ \ \::/ \ \:\ ~~~ \ \::/~~~~ / /:/
19+
* \ \:\/:/ \ \::/ \ \:\ \ \:\ \ \:\ /__/:/
20+
* \ \::/ \__\/ \ \:\ \ \:\ \ \:\ \__\/
21+
* \__\/ \__\/ \__\/ \__\/
1022
* blog : http://blankj.com
1123
* time : 16/12/08
12-
* desc : Utils初始化相关
24+
* desc : utils about initialization
1325
* </pre>
14-
* 　　　　　　　　　瓦瓦　　　　　　　　　　　　十
15-
* 　　　　　　　　十齱龠己　　　　　　　　　亅瓦車己
16-
* 　　　　　　　　乙龍龠毋日丶　　　　　　丶乙己毋毋丶
17-
* 　　　　　　　　十龠馬鬼車瓦　　　　　　己十瓦毋毋
18-
* 　　　　　　　　　鬼馬龠馬龠十　　　　己己毋車毋瓦
19-
* 　　　　　　　　　毋龠龠龍龠鬼乙丶丶乙車乙毋鬼車己
20-
* 　　　　　　　　　乙龠龍龍鬼龍瓦　十瓦毋乙瓦龠瓦亅
21-
* 　　　　　　　　　　馬齱龍馬鬼十丶日己己己毋車乙丶
22-
* 　　　　　　　　　　己齱馬鬼車十十毋日乙己己乙乙
23-
* 　　　　　　　　　　　車馬齱齱日乙毋瓦己乙瓦日亅
24-
* 　　　　　　　　　　　亅車齺龖瓦乙車龖龍乙乙十
25-
* 　　　　　　　　　　　　日龠龠十亅車龍毋十十
26-
* 　　　　　　　　　　　　日毋己亅　己己十亅亅
27-
* 　　　　　　　　　　　丶己十十乙　　丶丶丶丶丶
28-
* 　　　　　　　　　　　亅己十龍龖瓦　　丶　丶　乙十
29-
* 　　　　　　　　　　　亅己十龠龖毋　丶丶　　丶己鬼鬼瓦亅
30-
* 　　　　　　　　　　　十日十十日亅丶亅丶　丶十日毋鬼馬馬車乙
31-
* 　　　　　　　　　　　十日乙十亅亅亅丶　　十乙己毋鬼鬼鬼龍齺馬乙
32-
* 　　　　　　　　　　　丶瓦己乙十十亅丶亅乙乙乙己毋鬼鬼鬼龍齱齺齺鬼十
33-
* 　　　　　　　　　　　　乙乙十十十亅乙瓦瓦己日瓦毋鬼鬼龠齱齱龍龍齱齱毋丶
34-
* 　　　　　　　　　　　　亅十十十十乙瓦車毋瓦瓦日車馬龠龍龍龍龍龍龠龠龠馬亅
35-
* 　　　　　　　　　　　　　十十十十己毋車瓦瓦瓦瓦鬼馬龠龍龠龠龍龠龠龠馬龠車
36-
* 　　　　　　　　　　　　　　亅十十日毋瓦日日瓦鬼鬼鬼龠龠馬馬龠龍龍龠馬馬車
37-
* 　　　　　　　　　　　　　　亅亅亅乙瓦瓦毋車車車馬龍龠鬼鬼馬龠龍龍龠馬馬鬼
38-
* 　　　　　　　　　　　　丶丶乙亅亅乙車鬼鬼鬼毋車龍龍龠鬼馬馬龠龍齱齱龍馬鬼
39-
* 　　　　　　　　　　　亅己十十己十日鬼鬼車瓦毋龠龍龠馬馬龠龠龠齱齺齺齱龠鬼
40-
* 　　　　　　　　　　　　亅乙乙乙十車馬車毋馬齱齱龍龠龠龠馬龠龍齱龍龠龠鬼瓦
41-
* 　　　　　　　　　　　　　　　　丶毋龠鬼車瓦車馬龠龍龠龠龍齱齱龠馬馬鬼毋日
42-
* 　　　　　　　　　　　　　　　　十乙己日十　　丶己鬼龍齱齺齱龍馬馬馬車毋己
43-
* 　　　　　　　　　　　　　　丶十己乙亅丶　　　　　　亅瓦馬龠龍龠龠馬毋瓦乙
44-
* 　　　　　　　　　　　　　丶十十乙亅十　　　　　　　　亅己瓦車馬龠鬼車瓦乙
45-
* 　　　　　　　　　　　　　丶十乙十十丶　　　　　　　　　丶丶亅十瓦鬼車瓦己
46-
* 　　　　　　　　　　　　　　丶亅亅丶　　　　　　　　　　　　　　　亅日瓦日
47-
* 　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　丶
4826
*/
4927
public final class Utils {
5028

@@ -56,18 +34,29 @@ private Utils() {
5634
}
5735

5836
/**
59-
* 初始化工具类
37+
* Init utils.
38+
* <p>Init it in the class of Application.</p>
6039
*
61-
* @param app 应用
40+
* @param context context
41+
*/
42+
public static void init(@NonNull final Context context) {
43+
init((Application) context.getApplicationContext());
44+
}
45+
46+
/**
47+
* Init utils.
48+
* <p>Init it in the class of Application.</p>
49+
*
50+
* @param app application
6251
*/
6352
public static void init(@NonNull final Application app) {
6453
Utils.sApplication = app;
6554
}
6655

6756
/**
68-
* 获取 Application
57+
* Return the context of Application object.
6958
*
70-
* @return Application
59+
* @return the context of Application object
7160
*/
7261
public static Application getApp() {
7362
if (sApplication != null) return sApplication;

‎subutil/src/test/java/com/blankj/subutil/util/CloneUtilsTest.java

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
package com.blankj.subutil.util;
2+
3+
import org.junit.Assert;
4+
import org.junit.Test;
5+
6+
import java.io.Serializable;
7+
8+
/**
9+
* <pre>
10+
* author: Blankj
11+
* blog : http://blankj.com
12+
* time : 2018/04/08
13+
* desc : test CloneUtils
14+
* </pre>
15+
*/
16+
public class CloneUtilsTest {
17+
18+
@Test
19+
public void deepClone() throws Exception {
20+
Person person = new Person("Blankj");
21+
Person clonePerson = CloneUtils.deepClone(person);
22+
System.out.println(person);
23+
System.out.println(clonePerson);
24+
Assert.assertNotEquals(person, clonePerson);
25+
}
26+
27+
static class Person implements Serializable {
28+
29+
String name;
30+
int gender;
31+
String address;
32+
33+
public Person(String name) {
34+
this.name = name;
35+
this.gender = gender;
36+
this.address = address;
37+
}
38+
39+
@Override
40+
public String toString() {
41+
return "{\"name\":" + name + ",\"gender\":" + gender + ",\"address\":" + address + "}";
42+
}
43+
}
44+
}

‎subutil/src/test/java/com/blankj/subutil/util/CoordinateConvertUtilsTest.java renamed to ‎subutil/src/test/java/com/blankj/subutil/util/CoordinateUtilsTest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
* author: Blankj
1111
* blog : http://blankj.com
1212
* time : 2018/03/22
13-
* desc : CoordinateConvertUtils 单元测试
13+
* desc : CoordinateUtils 单元测试
1414
* </pre>
1515
*/
16-
public class CoordinateConvertUtilsTest {
16+
public class CoordinateUtilsTest {
1717

1818
// 以下为各个坐标系的 天安门坐标
1919
private static final double[] locationWGS84 = new double[]{116.3912022800, 39.9075017400};
@@ -25,64 +25,64 @@ public class CoordinateConvertUtilsTest {
2525

2626
@Test
2727
public void gcj2BD09() throws Exception {
28-
double[] BD09 = CoordinateConvertUtils.gcj02ToBd09(locationGCJ02[0], locationGCJ02[1]);
28+
double[] BD09 = CoordinateUtils.gcj02ToBd09(locationGCJ02[0], locationGCJ02[1]);
2929
double distance = distance(locationBD09[0], locationBD09[1], BD09[0], BD09[1]);
3030
System.out.println("distance: " + distance);
3131
Assert.assertTrue(distance < 10);
3232
}
3333

3434
@Test
3535
public void bd092GCJ() {
36-
double[] GCJ02 = CoordinateConvertUtils.bd09ToGcj02(locationBD09[0], locationBD09[1]);
36+
double[] GCJ02 = CoordinateUtils.bd09ToGcj02(locationBD09[0], locationBD09[1]);
3737
double distance = distance(locationGCJ02[0], locationGCJ02[1], GCJ02[0], GCJ02[1]);
3838
System.out.println("distance: " + distance);
3939
Assert.assertTrue(distance < 10);
4040
}
4141

4242
@Test
4343
public void bd092WGS() {
44-
double[] WGS84 = CoordinateConvertUtils.bd09ToWGS84(locationBD09[0], locationBD09[1]);
44+
double[] WGS84 = CoordinateUtils.bd09ToWGS84(locationBD09[0], locationBD09[1]);
4545
double distance = distance(locationWGS84[0], locationWGS84[1], WGS84[0], WGS84[1]);
4646
System.out.println("distance: " + distance);
4747
Assert.assertTrue(distance < 10);
4848
}
4949

5050
@Test
5151
public void wgs2BD09() {
52-
double[] BD09 = CoordinateConvertUtils.wgs84ToBd09(locationWGS84[0], locationWGS84[1]);
52+
double[] BD09 = CoordinateUtils.wgs84ToBd09(locationWGS84[0], locationWGS84[1]);
5353
double distance = distance(locationBD09[0], locationBD09[1], BD09[0], BD09[1]);
5454
System.out.println("distance: " + distance);
5555
Assert.assertTrue(distance < 10);
5656
}
5757

5858
@Test
5959
public void wgs2GCJ() {
60-
double[] GCJ02 = CoordinateConvertUtils.wgs84ToGcj02(locationWGS84[0], locationWGS84[1]);
60+
double[] GCJ02 = CoordinateUtils.wgs84ToGcj02(locationWGS84[0], locationWGS84[1]);
6161
double distance = distance(locationGCJ02[0], locationGCJ02[1], GCJ02[0], GCJ02[1]);
6262
System.out.println("distance: " + distance);
6363
Assert.assertTrue(distance < 10);
6464
}
6565

6666
@Test
6767
public void gcj2WGS() {
68-
double[] WGS84 = CoordinateConvertUtils.gcj02ToWGS84(locationGCJ02[0], locationGCJ02[1]);
68+
double[] WGS84 = CoordinateUtils.gcj02ToWGS84(locationGCJ02[0], locationGCJ02[1]);
6969
double distance = distance(locationWGS84[0], locationWGS84[1], WGS84[0], WGS84[1]);
7070
System.out.println("distance: " + distance);
7171
Assert.assertTrue(distance < 10);
7272
}
7373

7474
@Test
7575
public void gcj2WGSExactly() {
76-
double[] WGS84 = CoordinateConvertUtils.gcj02ToWGS84(locationGCJ02[0], locationGCJ02[1]);
76+
double[] WGS84 = CoordinateUtils.gcj02ToWGS84(locationGCJ02[0], locationGCJ02[1]);
7777
double distance = distance(locationWGS84[0], locationWGS84[1], WGS84[0], WGS84[1]);
7878
System.out.println("distance: " + distance);
7979
Assert.assertTrue(distance < 10);
8080
}
8181

8282
@Test
8383
public void outOfChina() {
84-
Assert.assertFalse(CoordinateConvertUtils.outOfChina(locationWGS84[0], locationWGS84[1]));
85-
Assert.assertTrue(CoordinateConvertUtils.outOfChina(newyorkWGS84[0], newyorkWGS84[1]));
84+
Assert.assertFalse(CoordinateUtils.outOfChina(locationWGS84[0], locationWGS84[1]));
85+
Assert.assertTrue(CoordinateUtils.outOfChina(newyorkWGS84[0], newyorkWGS84[1]));
8686
}
8787

8888
public static double distance(double lngA, double latA, double lngB, double latB) {

‎subutil/src/test/java/com/blankj/subutil/util/GsonUtilsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* author: Blankj
1010
* blog : http://blankj.com
1111
* time : 2016/09/26
12-
* desc : GsonUtils 单元测试
12+
* desc : test GsonUtils
1313
* </pre>
1414
*/
1515
public class GsonUtilsTest {
@@ -40,7 +40,7 @@ public void fromJson() {
4040
);
4141
}
4242

43-
class Person {
43+
static class Person {
4444

4545
String name;
4646
int gender;

‎subutil/src/test/java/com/blankj/subutil/util/TestConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* author: Blankj
66
* blog : http://blankj.com
77
* time : 2017/09/10
8-
* desc :
8+
* desc : config of test
99
* </pre>
1010
*/
1111
public class TestConfig {

‎subutil/src/test/java/com/blankj/subutil/util/TestUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* author: Blankj
1212
* blog : http://blankj.com
1313
* time : 2016/08/21
14-
* desc : 单元测试工具类
14+
* desc : utils about test
1515
* </pre>
1616
*/
1717
@RunWith(RobolectricTestRunner.class)

0 commit comments

Comments
 (0)