Skip to content

Commit a5fe7c0

Browse files
BlankjBlankj
committed
see 01/09 log
1 parent 772de5f commit a5fe7c0

File tree

86 files changed

+1863
-918
lines changed

Some content is hidden

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

86 files changed

+1863
-918
lines changed

‎app/src/main/AndroidManifest.xml

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,26 @@
1616
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
1717
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
1818
<uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
19-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
2019
<uses-permission android:name="android.permission.INTERNET" />
2120

21+
<!--permission-->
22+
<uses-permission android:name="android.permission.READ_CALENDAR" />
23+
<uses-permission android:name="android.permission.RECORD_AUDIO" />
24+
2225
<!--phone-->
2326
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
2427
<uses-permission android:name="android.permission.CALL_PHONE" />
2528
<uses-permission android:name="android.permission.SEND_SMS" />
26-
<!--拨打电话-->
27-
<uses-permission android:name="android.permission.CALL_PHONE" />
28-
<!--发送短信-->
29-
<uses-permission android:name="android.permission.SEND_SMS" />
30-
<!--获取手机联系人-->
31-
<!--<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />-->
32-
<uses-permission android:name="android.permission.READ_CONTACTS" />
33-
<!--获取短信-->
34-
<!--<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />-->
3529
<uses-permission android:name="android.permission.READ_SMS" />
30+
<uses-permission android:name="android.permission.READ_CONTACTS" />
3631

3732
<!--process-->
3833
<uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
3934

4035
<!--screen-->
4136
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
4237

38+
4339
<!--flashlight-->
4440
<uses-permission android:name="android.permission.CAMERA" />
4541

@@ -60,7 +56,7 @@
6056
android:label="@string/my_app_name"
6157
android:theme="@style/AppTheme">
6258
<activity
63-
android:name=".main.MainActivity"
59+
android:name=".MainActivity"
6460
android:launchMode="singleTop">
6561
<intent-filter>
6662
<action android:name="android.intent.action.MAIN" />
@@ -70,95 +66,99 @@
7066

7167
<!--core-->
7268
<activity
73-
android:name=".core.main.CoreUtilActivity"
69+
android:name=".feature.core.CoreUtilActivity"
7470
android:launchMode="singleTop" />
7571
<activity
76-
android:name=".core.activity.ActivityActivity"
77-
android:launchMode="singleTop" />
72+
android:name=".feature.core.activity.ActivityActivity"
73+
android:icon="@drawable/ic_icon"
74+
android:launchMode="singleTop"
75+
android:logo="@drawable/ic_logo" />
7876
<activity
79-
android:name=".core.activity.SubActivityActivity"
77+
android:name=".feature.core.activity.SubActivityActivity"
8078
android:launchMode="singleTop" />
8179
<activity
82-
android:name=".core.app.AppActivity"
80+
android:name=".feature.core.app.AppActivity"
8381
android:launchMode="singleTop" />
8482
<activity
85-
android:name=".core.bar.BarActivity"
83+
android:name=".feature.core.bar.BarActivity"
8684
android:launchMode="singleTop" />
8785
<activity
88-
android:name=".core.bar.BarStatusActivity"
86+
android:name=".feature.core.bar.BarStatusActivity"
8987
android:launchMode="singleTop" />
9088
<activity
91-
android:name=".core.bar.BarNotificationActivity"
89+
android:name=".feature.core.bar.BarNotificationActivity"
9290
android:launchMode="singleTop" />
9391
<activity
94-
android:name=".core.bar.BarNavActivity"
92+
android:name=".feature.core.bar.BarNavActivity"
9593
android:launchMode="singleTop" />
9694
<activity
97-
android:name=".core.bar.BarStatusAlphaActivity"
95+
android:name=".feature.core.bar.BarStatusAlphaActivity"
9896
android:launchMode="singleTop" />
9997
<activity
100-
android:name=".core.bar.BarStatusColorActivity"
98+
android:name=".feature.core.bar.BarStatusColorActivity"
10199
android:launchMode="singleTop" />
102100
<activity
103-
android:name=".core.bar.BarStatusDrawerActivity"
101+
android:name=".feature.core.bar.BarStatusDrawerActivity"
104102
android:launchMode="singleTop" />
105103
<activity
106-
android:name=".core.bar.BarStatusFragmentActivity"
104+
android:name=".feature.core.bar.BarStatusFragmentActivity"
107105
android:launchMode="singleTop" />
108106
<activity
109-
android:name=".core.bar.BarStatusImageViewActivity"
107+
android:name=".feature.core.bar.BarStatusImageViewActivity"
110108
android:launchMode="singleTop" />
111109
<activity
112-
android:name=".core.bar.BarStatusSwipeBackActivity"
110+
android:name=".feature.core.bar.BarStatusSwipeBackActivity"
113111
android:launchMode="singleTop" />
114112
<activity
115-
android:name=".core.clean.CleanActivity"
113+
android:name=".feature.core.clean.CleanActivity"
116114
android:launchMode="singleTop" />
117115
<activity
118-
android:name=".core.device.DeviceActivity"
116+
android:name=".feature.core.device.DeviceActivity"
119117
android:launchMode="singleTop" />
120118
<activity
121-
android:name=".core.fragment.FragmentActivity"
119+
android:name=".feature.core.fragment.FragmentActivity"
122120
android:launchMode="singleTop" />
123121
<activity
124-
android:name=".core.image.ImageActivity"
122+
android:name=".feature.core.image.ImageActivity"
125123
android:launchMode="singleTop" />
126124
<activity
127-
android:name=".core.keyboard.KeyboardActivity"
125+
android:name=".feature.core.keyboard.KeyboardActivity"
128126
android:launchMode="singleTop"
129-
android:windowSoftInputMode="stateHidden|adjustPan" />
127+
/>
128+
<activity
129+
android:name=".feature.core.log.LogActivity"
130+
android:launchMode="singleTop" />
130131
<activity
131-
android:name=".core.log.LogActivity"
132+
android:name=".feature.core.network.NetworkActivity"
132133
android:launchMode="singleTop" />
133134
<activity
134-
android:name=".core.network.NetworkActivity"
135+
android:name=".feature.core.permission.PermissionActivity"
135136
android:launchMode="singleTop" />
136-
<!--<activity android:name=".activities.PermissionActivity" />-->
137137
<activity
138-
android:name=".core.phone.PhoneActivity"
138+
android:name=".feature.core.phone.PhoneActivity"
139139
android:launchMode="singleTop" />
140140
<activity
141-
android:name=".core.process.ProcessActivity"
141+
android:name=".feature.core.process.ProcessActivity"
142142
android:launchMode="singleTop" />
143143
<activity
144-
android:name=".core.screen.ScreenActivity"
144+
android:name=".feature.core.screen.ScreenActivity"
145145
android:launchMode="singleTop" />
146146
<activity
147-
android:name=".core.sdcard.SDCardActivity"
147+
android:name=".feature.core.sdcard.SDCardActivity"
148148
android:launchMode="singleTop" />
149149
<activity
150-
android:name=".core.snackbar.SnackbarActivity"
150+
android:name=".feature.core.snackbar.SnackbarActivity"
151151
android:launchMode="singleTop" />
152152
<activity
153-
android:name=".core.span.SpanActivity"
153+
android:name=".feature.core.sp.SPActivity"
154+
android:launchMode="singleTop">
155+
</activity>
156+
<activity
157+
android:name=".feature.core.span.SpanActivity"
154158
android:launchMode="singleTop">
155-
<!--<intent-filter>-->
156-
<!--<action android:name="android.intent.action.MAIN" />-->
157-
<!--<category android:name="android.intent.category.LAUNCHER" />-->
158-
<!--</intent-filter>-->
159159
</activity>
160160
<activity
161-
android:name=".core.toast.ToastActivity"
161+
android:name=".feature.core.toast.ToastActivity"
162162
android:launchMode="singleTop" />
163163

164164
<provider
@@ -174,17 +174,17 @@
174174

175175
<!--sub-->
176176
<activity
177-
android:name=".sub.main.SubUtilActivity"
177+
android:name=".feature.sub.SubUtilActivity"
178178
android:launchMode="singleTop" />
179179
<activity
180-
android:name=".sub.location.LocationActivity"
180+
android:name=".feature.sub.location.LocationActivity"
181181
android:launchMode="singleTop" />
182182
<activity
183-
android:name=".sub.pinyin.PinyinActivity"
183+
android:name=".feature.sub.pinyin.PinyinActivity"
184184
android:launchMode="singleTop" />
185185

186186
<service
187-
android:name=".sub.location.LocationService"
187+
android:name=".feature.sub.location.LocationService"
188188
android:launchMode="singleTop" />
189189

190190
</application>

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
import android.os.Environment;
44

5+
import com.blankj.utilcode.util.Utils;
6+
7+
import java.io.File;
8+
59
/**
610
* <pre>
711
* author: Blankj
@@ -22,7 +26,13 @@ public class Config {
2226
public static final String TEST_APK_PATH;
2327

2428
static {
25-
CACHE_PATH = Environment.getExternalStorageDirectory().getAbsolutePath();
29+
File cacheDir = Utils.getApp().getExternalCacheDir();
30+
if (cacheDir != null) {
31+
CACHE_PATH = cacheDir.getAbsolutePath();
32+
} else {
33+
CACHE_PATH = Environment.getExternalStorageDirectory().getAbsolutePath();
34+
}
2635
TEST_APK_PATH = CACHE_PATH + FILE_SEP + "test_install.apk";
36+
2737
}
2838
}

‎app/src/main/java/com/blankj/androidutilcode/main/MainActivity.java renamed to ‎app/src/main/java/com/blankj/androidutilcode/MainActivity.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blankj.androidutilcode.main;
1+
package com.blankj.androidutilcode;
22

33
import android.graphics.Color;
44
import android.os.Bundle;
@@ -7,10 +7,9 @@
77
import android.support.v7.widget.Toolbar;
88
import android.view.View;
99

10-
import com.blankj.androidutilcode.R;
1110
import com.blankj.androidutilcode.base.BaseDrawerActivity;
12-
import com.blankj.androidutilcode.core.main.CoreUtilActivity;
13-
import com.blankj.androidutilcode.sub.main.SubUtilActivity;
11+
import com.blankj.androidutilcode.feature.core.CoreUtilActivity;
12+
import com.blankj.androidutilcode.feature.sub.SubUtilActivity;
1413
import com.blankj.utilcode.util.BarUtils;
1514

1615
/**

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

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
package com.blankj.androidutilcode;
22

33
import com.blankj.androidutilcode.base.BaseApplication;
4-
import com.blankj.subutil.util.ThreadPoolUtils;
54
import com.blankj.utilcode.util.CrashUtils;
6-
import com.blankj.utilcode.util.FileIOUtils;
7-
import com.blankj.utilcode.util.FileUtils;
85
import com.blankj.utilcode.util.LogUtils;
6+
import com.blankj.utilcode.util.PermissionUtils;
97
import com.squareup.leakcanary.LeakCanary;
108

11-
import java.io.IOException;
12-
139
/**
1410
* <pre>
1511
* author: Blankj
@@ -35,7 +31,8 @@ public void onCreate() {
3531
initLeakCanary();
3632
initLog();
3733
initCrash();
38-
initAssets();
34+
35+
LogUtils.d(PermissionUtils.getPermissions());
3936
}
4037

4138
private void initLeakCanary() {
@@ -70,22 +67,6 @@ public void initLog() {
7067
private void initCrash() {
7168
CrashUtils.init();
7269
}
73-
74-
private void initAssets() {
75-
if (!FileUtils.isFileExists(Config.TEST_APK_PATH)) {
76-
ThreadPoolUtils poolUtils = new ThreadPoolUtils(ThreadPoolUtils.SingleThread, 1);
77-
poolUtils.execute(new Runnable() {
78-
@Override
79-
public void run() {
80-
try {
81-
FileIOUtils.writeFileFromIS(Config.TEST_APK_PATH, getAssets().open("test_install"), false);
82-
} catch (IOException e) {
83-
e.printStackTrace();
84-
}
85-
}
86-
});
87-
} else {
88-
LogUtils.d("test apk existed.");
89-
}
90-
}
9170
}
71+
72+

‎app/src/main/java/com/blankj/androidutilcode/core/clean/CleanActivity.java

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

0 commit comments

Comments
 (0)