Skip to content

Commit cdcb76f

Browse files
BlankjBlankj
committed
see 09/05 log
1 parent 6718e06 commit cdcb76f

20 files changed

+748
-451
lines changed

‎README-CN.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.20.0-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.20.1-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.20.0-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.20.1-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

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

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.blankj.androidutilcode.feature.core.CoreUtilActivity;
1313
import com.blankj.androidutilcode.feature.sub.SubUtilActivity;
1414
import com.blankj.utilcode.util.BarUtils;
15+
import com.blankj.utilcode.util.EncryptUtils;
1516

1617
/**
1718
* <pre>

‎app/src/main/java/com/blankj/androidutilcode/base/BaseActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public abstract class BaseActivity extends AppCompatActivity
3131

3232
@Override
3333
protected void onCreate(Bundle savedInstanceState) {
34+
ScreenUtils.adaptScreen4VerticalSlide(this, 720);
3435
super.onCreate(savedInstanceState);
3536
mActivity = this;
3637
Bundle bundle = getIntent().getExtras();

‎app/src/main/java/com/blankj/androidutilcode/feature/core/path/PathActivity.java

+40-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import com.blankj.androidutilcode.R;
1111
import com.blankj.androidutilcode.base.BaseBackActivity;
12+
import com.blankj.utilcode.util.PathUtils;
1213
import com.blankj.utilcode.util.SpanUtils;
1314

1415
/**
@@ -42,7 +43,45 @@ public void initView(Bundle savedInstanceState, View contentView) {
4243

4344
TextView tvAboutMetaData = findViewById(R.id.tv_about_path);
4445
tvAboutMetaData.setText(new SpanUtils()
45-
// .appendLine("getRootPath: " + PathUtils.getRootPath())
46+
.appendLine("getRootPath: " + PathUtils.getRootPath())
47+
.appendLine("getDataPath: " + PathUtils.getDataPath())
48+
.appendLine("getDownloadCachePath: " + PathUtils.getDownloadCachePath())
49+
50+
.appendLine("getInternalAppDataPath: " + PathUtils.getInternalAppDataPath())
51+
.appendLine("getInternalAppCodeCacheDir: " + PathUtils.getInternalAppCodeCacheDir())
52+
.appendLine("getInternalAppCachePath: " + PathUtils.getInternalAppCachePath())
53+
.appendLine("getInternalAppDbsPath: " + PathUtils.getInternalAppDbsPath())
54+
.appendLine("getInternalAppDbPath: " + PathUtils.getInternalAppDbPath("demo"))
55+
.appendLine("getInternalAppFilesPath: " + PathUtils.getInternalAppFilesPath())
56+
.appendLine("getInternalAppSpPath: " + PathUtils.getInternalAppSpPath())
57+
.appendLine("getInternalAppNoBackupFilesPath: " + PathUtils.getInternalAppNoBackupFilesPath())
58+
59+
.appendLine("getExternalStoragePath: " + PathUtils.getExternalStoragePath())
60+
.appendLine("getExternalMusicPath: " + PathUtils.getExternalMusicPath())
61+
.appendLine("getExternalPodcastsPath: " + PathUtils.getExternalPodcastsPath())
62+
.appendLine("getExternalRingtonesPath: " + PathUtils.getExternalRingtonesPath())
63+
.appendLine("getExternalAlarmsPath: " + PathUtils.getExternalAlarmsPath())
64+
.appendLine("getExternalNotificationsPath: " + PathUtils.getExternalNotificationsPath())
65+
.appendLine("getExternalPicturesPath: " + PathUtils.getExternalPicturesPath())
66+
.appendLine("getExternalMoviesPath: " + PathUtils.getExternalMoviesPath())
67+
.appendLine("getExternalDownloadsPath: " + PathUtils.getExternalDownloadsPath())
68+
.appendLine("getExternalDcimPath: " + PathUtils.getExternalDcimPath())
69+
.appendLine("getExternalDocumentsPath: " + PathUtils.getExternalDocumentsPath())
70+
71+
.appendLine("getExternalAppDataPath: " + PathUtils.getExternalAppDataPath())
72+
.appendLine("getExternalAppCachePath: " + PathUtils.getExternalAppCachePath())
73+
.appendLine("getExternalAppFilesPath: " + PathUtils.getExternalAppFilesPath())
74+
.appendLine("getExternalAppMusicPath: " + PathUtils.getExternalAppMusicPath())
75+
.appendLine("getExternalAppPodcastsPath: " + PathUtils.getExternalAppPodcastsPath())
76+
.appendLine("getExternalAppRingtonesPath: " + PathUtils.getExternalAppRingtonesPath())
77+
.appendLine("getExternalAppAlarmsPath: " + PathUtils.getExternalAppAlarmsPath())
78+
.appendLine("getExternalAppNotificationsPath: " + PathUtils.getExternalAppNotificationsPath())
79+
.appendLine("getExternalAppPicturesPath: " + PathUtils.getExternalAppPicturesPath())
80+
.appendLine("getExternalAppMoviesPath: " + PathUtils.getExternalAppMoviesPath())
81+
.appendLine("getExternalAppDownloadPath: " + PathUtils.getExternalAppDownloadPath())
82+
.appendLine("getExternalAppDcimPath: " + PathUtils.getExternalAppDcimPath())
83+
.appendLine("getExternalAppDocumentsPath: " + PathUtils.getExternalAppDocumentsPath())
84+
.appendLine("getExternalAppObbPath: " + PathUtils.getExternalAppObbPath())
4685
.append("")
4786
.create());
4887
}

‎app/src/main/java/com/blankj/androidutilcode/feature/core/permission/PermissionActivity.java

+27
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ public void initView(Bundle savedInstanceState, View contentView) {
5656
findViewById(R.id.btn_open_app_settings).setOnClickListener(this);
5757
findViewById(R.id.btn_request_calendar).setOnClickListener(this);
5858
findViewById(R.id.btn_request_record_audio).setOnClickListener(this);
59+
findViewById(R.id.btn_request_calendar_and_record_audio).setOnClickListener(this);
5960

6061
StringBuilder sb = new StringBuilder();
6162
for (String s : PermissionUtils.getPermissions()) {
@@ -139,6 +140,32 @@ public void onDenied(List<String> permissionsDeniedForever,
139140
})
140141
.request();
141142
break;
143+
case R.id.btn_request_calendar_and_record_audio:
144+
PermissionUtils.permission(PermissionConstants.CALENDAR, PermissionConstants.MICROPHONE)
145+
.rationale(new PermissionUtils.OnRationaleListener() {
146+
@Override
147+
public void rationale(final ShouldRequest shouldRequest) {
148+
DialogHelper.showRationaleDialog(shouldRequest);
149+
}
150+
})
151+
.callback(new PermissionUtils.FullCallback() {
152+
@Override
153+
public void onGranted(List<String> permissionsGranted) {
154+
updateAboutPermission();
155+
LogUtils.d(permissionsGranted);
156+
}
157+
158+
@Override
159+
public void onDenied(List<String> permissionsDeniedForever,
160+
List<String> permissionsDenied) {
161+
if (!permissionsDeniedForever.isEmpty()) {
162+
DialogHelper.showOpenAppSettingDialog();
163+
}
164+
LogUtils.d(permissionsDeniedForever, permissionsDenied);
165+
}
166+
})
167+
.request();
168+
break;
142169
}
143170
}
144171

‎app/src/main/java/com/blankj/androidutilcode/feature/core/toast/ToastActivity.java

+2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88
import android.support.v4.content.ContextCompat;
99
import android.view.Gravity;
1010
import android.view.View;
11+
import android.widget.Toast;
1112

1213
import com.blankj.androidutilcode.R;
1314
import com.blankj.androidutilcode.base.BaseBackActivity;
1415
import com.blankj.utilcode.util.SizeUtils;
1516
import com.blankj.utilcode.util.SpanUtils;
1617
import com.blankj.utilcode.util.ToastUtils;
18+
import com.blankj.utilcode.util.Utils;
1719

1820
/**
1921
* <pre>

‎app/src/main/res_core/layout/activity_keyboard1.xml

-50
This file was deleted.

‎app/src/main/res_core/layout/activity_permission.xml

+7
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,11 @@
3434
android:layout_height="wrap_content"
3535
android:text="@string/permission_request_record_audio" />
3636

37+
<Button
38+
android:id="@+id/btn_request_calendar_and_record_audio"
39+
style="@style/WideBtnStyle"
40+
android:layout_width="match_parent"
41+
android:layout_height="wrap_content"
42+
android:text="@string/permission_request_calendar" />
43+
3744
</LinearLayout>

‎app/src/main/res_core/layout/activity_util_core.xml

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<LinearLayout
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
43
android:layout_width="match_parent"
54
android:layout_height="wrap_content"
65
android:gravity="center_horizontal"
@@ -92,12 +91,12 @@
9291
android:onClick="networkClick"
9392
android:text="@string/demo_network" />
9493

95-
<!--<Button-->
96-
<!--style="@style/WideBtnStyle"-->
97-
<!--android:layout_width="match_parent"-->
98-
<!--android:layout_height="wrap_content"-->
99-
<!--android:onClick="pathClick"-->
100-
<!--android:text="@string/demo_path" />-->
94+
<Button
95+
style="@style/WideBtnStyle"
96+
android:layout_width="match_parent"
97+
android:layout_height="wrap_content"
98+
android:onClick="pathClick"
99+
android:text="@string/demo_path" />
101100

102101
<Button
103102
style="@style/WideBtnStyle"

0 commit comments

Comments
 (0)