Skip to content

Commit 130387c

Browse files
author
Blankj
committed
see 08/06 log
1 parent 81ccc58 commit 130387c

109 files changed

Lines changed: 889 additions & 453 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README-CN.md‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -684,21 +684,19 @@ Utils.init(context);
684684
[readme-cn.md]: https://github.com/Blankj/AndroidUtilCode/blob/master/README-CN.md
685685

686686
[activity.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ActivityUtils.java
687-
[activity.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/ActivityActivity.java
687+
[activity.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/core/activity/ActivityActivity.java
688688

689689
[app.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/AppUtils.java
690-
[app.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/AppActivity.java
690+
[app.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/core/app/AppActivity.java
691691

692692
[bar.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/BarUtils.java
693-
[bar.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/BarActivity.java
693+
[bar.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/core/bar/BarActivity.java
694694

695695
[cache.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/CacheUtils.java
696696
[cache.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/CacheUtilsTest.java
697697

698698
[clean.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/CleanUtils.java
699-
[clean.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/CleanActivity.java
700-
701-
[clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ClipboardUtils.java
699+
[clean.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/core/clean/CleanActivity.java
702700

703701
[close.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/CloseUtils.java
704702

@@ -708,7 +706,7 @@ Utils.init(context);
708706
[crash.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/CrashUtils.java
709707

710708
[device.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/DeviceUtils.java
711-
[device.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/DeviceActivity.java
709+
[device.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/core/device/DeviceActivity.java
712710

713711
[empty.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/EmptyUtils.java
714712
[empty.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/EmptyUtilsTest.java
@@ -726,35 +724,35 @@ Utils.init(context);
726724
[file.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/FileUtilsTest.java
727725

728726
[fragment.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
729-
[fragment.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/FragmentActivity.java
727+
[fragment.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/core/fragment/FragmentActivity.java
730728

731729
[image.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ImageUtils.java
732-
[image.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/ImageActivity.java
730+
[image.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/core/image/ImageActivity.java
733731

734732
[intent.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/IntentUtils.java
735733

736734
[keyboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/KeyboardUtils.java
737-
[keyboard.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/KeyboardActivity.java
735+
[keyboard.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/core/keyboard/KeyboardActivity.java
738736

739737
[log.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/LogUtils.java
740-
[log.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/LogActivity.java
738+
[log.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/core/log/LogActivity.java
741739

742740
[network.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/NetworkUtils.java
743-
[network.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/NetworkActivity.java
741+
[network.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/core/network/NetworkActivity.java
744742

745743
[phone.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/PhoneUtils.java
746-
[phone.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/PhoneActivity.java
744+
[phone.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/core/phone/PhoneActivity.java
747745

748746
[process.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ProcessUtils.java
749-
[process.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/ProcessActivity.java
747+
[process.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/core/process/ProcessActivity.java
750748

751749
[regex.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/RegexUtils.java
752750
[regex.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/RegexUtilsTest.java
753751

754752
[screen.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ScreenUtils.java
755753

756754
[sdcard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SDCardUtils.java
757-
[sdcard.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/SDCardActivity.java
755+
[sdcard.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/core/sd_card/SDCardActivity.java
758756

759757
[service.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ServiceUtils.java
760758

@@ -763,10 +761,10 @@ Utils.init(context);
763761
[size.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SizeUtils.java
764762

765763
[snackbar.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SnackbarUtils.java
766-
[snackbar.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/SnackbarActivity.java
764+
[snackbar.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/core/snackbar/SnackbarActivity.java
767765

768766
[span.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SpanUtils.java
769-
[span.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/SpanActivity.java
767+
[span.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/core/span/SpanActivity.java
770768

771769
[sp.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/SPUtils.java
772770
[sp.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/SPUtilsTest.java
@@ -778,7 +776,7 @@ Utils.init(context);
778776
[time.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/TimeUtilsTest.java
779777

780778
[toast.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ToastUtils.java
781-
[toast.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/activity/ToastActivity.java
779+
[toast.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/core/toast/ToastActivity.java
782780

783781
[zip.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ZipUtils.java
784782
[zip.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/ZipUtilsTest.java

‎app/build.gradle‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,17 @@ android {
4141
}
4242
}
4343

44+
sourceSets {
45+
main {
46+
res.srcDirs =
47+
[
48+
'src/main/res',
49+
'src/main/res/core',
50+
'src/main/res/sub',
51+
]
52+
}
53+
}
54+
4455
lintOptions {
4556
abortOnError false
4657
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 52 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,6 @@
99
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
1010
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
1111

12-
<!--flashlight-->
13-
<uses-permission android:name="android.permission.CAMERA" />
14-
15-
<uses-feature android:name="android.hardware.camera" />
16-
<uses-feature android:name="android.hardware.camera.autofocus" />
17-
<uses-feature android:name="android.hardware.camera.flash" />
18-
19-
<uses-permission android:name="android.permission.FLASHLIGHT" />
20-
21-
<!--location-->
22-
<!--<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />-->
23-
<!--<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
24-
2512
<!--network-->
2613
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
2714
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
@@ -46,46 +33,61 @@
4633

4734
<!--process-->
4835
<uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
36+
37+
38+
<!--flashlight-->
39+
<uses-permission android:name="android.permission.CAMERA" />
40+
<uses-feature android:name="android.hardware.camera" />
41+
<uses-feature android:name="android.hardware.camera.autofocus" />
42+
<uses-feature android:name="android.hardware.camera.flash" />
43+
<uses-permission android:name="android.permission.FLASHLIGHT" />
44+
45+
<!--location-->
46+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
47+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
48+
4949
<application
5050
android:name=".UtilsApp"
5151
android:allowBackup="false"
5252
android:icon="@mipmap/ic_launcher"
5353
android:label="@string/my_app_name"
5454
android:theme="@style/AppTheme">
55-
<activity android:name=".activity.ActivityActivity" />
56-
<activity android:name=".activity.AppActivity" />
57-
<activity android:name=".activity.BarActivity" />
58-
<activity android:name=".activity.BarNavActivity" />
59-
<activity android:name=".activity.BarStatusAlphaActivity" />
60-
<activity android:name=".activity.BarStatusColorActivity" />
61-
<activity android:name=".activity.BarStatusDrawerActivity" />
62-
<activity android:name=".activity.BarStatusFragmentActivity" />
63-
<activity android:name=".activity.BarStatusImageViewActivity" />
64-
<activity android:name=".activity.BarStatusSwipeBackActivity" />
65-
<activity android:name=".activity.CleanActivity" />
66-
<activity android:name=".activity.DeviceActivity" />
67-
<activity android:name=".activity.FragmentActivity" />
68-
<!--<activity android:name=".activities.FlashlightActivity"/>-->
69-
<activity android:name=".activity.ImageActivity" />
70-
<activity
71-
android:name=".activity.KeyboardActivity"
72-
android:windowSoftInputMode="stateHidden|adjustPan" />
73-
<activity android:name=".activity.LogActivity" />
74-
<activity android:name=".activity.MainActivity">
55+
<activity android:name=".main.MainActivity">
7556
<intent-filter>
7657
<action android:name="android.intent.action.MAIN" />
7758
<category android:name="android.intent.category.LAUNCHER" />
7859
</intent-filter>
7960
</activity>
80-
<activity android:name=".activity.NetworkActivity" />
61+
62+
63+
<!--core-->
64+
<activity android:name=".core.main.CoreUtilActivity" />
65+
<activity android:name=".core.activity.ActivityActivity" />
66+
<activity android:name=".core.app.AppActivity" />
67+
<activity android:name=".core.bar.BarActivity" />
68+
<activity android:name=".core.bar.BarNavActivity" />
69+
<activity android:name=".core.bar.BarStatusAlphaActivity" />
70+
<activity android:name=".core.bar.BarStatusColorActivity" />
71+
<activity android:name=".core.bar.BarStatusDrawerActivity" />
72+
<activity android:name=".core.bar.BarStatusFragmentActivity" />
73+
<activity android:name=".core.bar.BarStatusImageViewActivity" />
74+
<activity android:name=".core.bar.BarStatusSwipeBackActivity" />
75+
<activity android:name=".core.clean.CleanActivity" />
76+
<activity android:name=".core.device.DeviceActivity" />
77+
<activity android:name=".core.fragment.FragmentActivity" />
78+
<activity android:name=".core.image.ImageActivity" />
79+
<activity
80+
android:name=".core.keyboard.KeyboardActivity"
81+
android:windowSoftInputMode="stateHidden|adjustPan" />
82+
<activity android:name=".core.log.LogActivity" />
83+
<activity android:name=".core.network.NetworkActivity" />
8184
<!--<activity android:name=".activities.PermissionActivity"/>-->
82-
<activity android:name=".activity.PhoneActivity" />
83-
<activity android:name=".activity.PinyinActivity" />
84-
<activity android:name=".activity.ProcessActivity" />
85-
<activity android:name=".activity.SDCardActivity" />
86-
<activity android:name=".activity.SnackbarActivity" />
87-
<activity android:name=".activity.SpanActivity" />
88-
<activity android:name=".activity.ToastActivity" />
85+
<activity android:name=".core.phone.PhoneActivity" />
86+
<activity android:name=".core.process.ProcessActivity" />
87+
<activity android:name=".core.sdcard.SDCardActivity" />
88+
<activity android:name=".core.snackbar.SnackbarActivity" />
89+
<activity android:name=".core.span.SpanActivity" />
90+
<activity android:name=".core.toast.ToastActivity" />
8991

9092
<provider
9193
android:name="android.support.v4.content.FileProvider"
@@ -96,6 +98,15 @@
9698
android:name="android.support.FILE_PROVIDER_PATHS"
9799
android:resource="@xml/provider_paths" />
98100
</provider>
101+
102+
103+
<!--sub-->
104+
<activity android:name=".sub.main.SubUtilActivity" />
105+
<activity android:name=".sub.location.LocationActivity" />
106+
<activity android:name=".sub.pinyin.PinyinActivity" />
107+
108+
<service android:name=".sub.location.LocationService" />
109+
99110
</application>
100111

101112
</manifest>

‎app/src/main/java/com/blankj/androidutilcode/UtilsApp.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.blankj.utilcode.util.FileIOUtils;
66
import com.blankj.utilcode.util.FileUtils;
77
import com.blankj.utilcode.util.LogUtils;
8-
import com.blankj.utilcode.util.Utils;
98
import com.squareup.leakcanary.LeakCanary;
109

1110
import java.io.IOException;
@@ -30,7 +29,8 @@ public void onCreate() {
3029
return;
3130
}
3231
LeakCanary.install(this);
33-
Utils.init(this);
32+
com.blankj.utilcode.util.Utils.init(this);
33+
com.blankj.subutil.util.Utils.init(this);
3434
initLog();
3535
initCrash();
3636
initAssets();

app/src/main/java/com/blankj/androidutilcode/activity/ActivityActivity.java renamed to app/src/main/java/com/blankj/androidutilcode/core/activity/ActivityActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blankj.androidutilcode.activity;
1+
package com.blankj.androidutilcode.core.activity;
22

33
import android.content.Context;
44
import android.content.Intent;

app/src/main/java/com/blankj/androidutilcode/activity/AppActivity.java renamed to app/src/main/java/com/blankj/androidutilcode/core/app/AppActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blankj.androidutilcode.activity;
1+
package com.blankj.androidutilcode.core.app;
22

33
import android.content.Context;
44
import android.content.Intent;

app/src/main/java/com/blankj/androidutilcode/activity/BarActivity.java renamed to app/src/main/java/com/blankj/androidutilcode/core/bar/BarActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blankj.androidutilcode.activity;
1+
package com.blankj.androidutilcode.core.bar;
22

33
import android.content.Context;
44
import android.content.Intent;

app/src/main/java/com/blankj/androidutilcode/activity/BarNavActivity.java renamed to app/src/main/java/com/blankj/androidutilcode/core/bar/BarNavActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blankj.androidutilcode.activity;
1+
package com.blankj.androidutilcode.core.bar;
22

33
import android.content.Context;
44
import android.content.Intent;

app/src/main/java/com/blankj/androidutilcode/activity/BarStatusAlphaActivity.java renamed to app/src/main/java/com/blankj/androidutilcode/core/bar/BarStatusAlphaActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blankj.androidutilcode.activity;
1+
package com.blankj.androidutilcode.core.bar;
22

33
import android.content.Context;
44
import android.content.Intent;

app/src/main/java/com/blankj/androidutilcode/activity/BarStatusColorActivity.java renamed to app/src/main/java/com/blankj/androidutilcode/core/bar/BarStatusColorActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blankj.androidutilcode.activity;
1+
package com.blankj.androidutilcode.core.bar;
22

33
import android.content.Context;
44
import android.content.Intent;

0 commit comments

Comments
 (0)