diff --git a/README-CN.md b/README-CN.md index fa5513da31..d1896df83a 100644 --- a/README-CN.md +++ b/README-CN.md @@ -41,7 +41,7 @@ [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png -[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.20.0-brightgreen.svg +[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.20.1-brightgreen.svg [auc]: https://github.com/Blankj/AndroidUtilCode [apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg diff --git a/README.md b/README.md index 977d352d19..2827f62ff0 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png -[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.20.0-brightgreen.svg +[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.20.1-brightgreen.svg [auc]: https://github.com/Blankj/AndroidUtilCode [apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg diff --git a/app/src/main/java/com/blankj/androidutilcode/MainActivity.java b/app/src/main/java/com/blankj/androidutilcode/MainActivity.java index 8cd21dfecd..3dc5146f4f 100644 --- a/app/src/main/java/com/blankj/androidutilcode/MainActivity.java +++ b/app/src/main/java/com/blankj/androidutilcode/MainActivity.java @@ -12,6 +12,7 @@ import com.blankj.androidutilcode.feature.core.CoreUtilActivity; import com.blankj.androidutilcode.feature.sub.SubUtilActivity; import com.blankj.utilcode.util.BarUtils; +import com.blankj.utilcode.util.EncryptUtils; /** * 
diff --git a/app/src/main/java/com/blankj/androidutilcode/base/BaseActivity.java b/app/src/main/java/com/blankj/androidutilcode/base/BaseActivity.java
index 14276177a0..0afee9c3f8 100644
--- a/app/src/main/java/com/blankj/androidutilcode/base/BaseActivity.java
+++ b/app/src/main/java/com/blankj/androidutilcode/base/BaseActivity.java
@@ -31,6 +31,7 @@ public abstract class BaseActivity extends AppCompatActivity
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        ScreenUtils.adaptScreen4VerticalSlide(this, 720);
         super.onCreate(savedInstanceState);
         mActivity = this;
         Bundle bundle = getIntent().getExtras();
diff --git a/app/src/main/java/com/blankj/androidutilcode/feature/core/path/PathActivity.java b/app/src/main/java/com/blankj/androidutilcode/feature/core/path/PathActivity.java
index 4d7167f5eb..41a9850f2b 100644
--- a/app/src/main/java/com/blankj/androidutilcode/feature/core/path/PathActivity.java
+++ b/app/src/main/java/com/blankj/androidutilcode/feature/core/path/PathActivity.java
@@ -9,6 +9,7 @@
 
 import com.blankj.androidutilcode.R;
 import com.blankj.androidutilcode.base.BaseBackActivity;
+import com.blankj.utilcode.util.PathUtils;
 import com.blankj.utilcode.util.SpanUtils;
 
 /**
@@ -42,7 +43,45 @@ public void initView(Bundle savedInstanceState, View contentView) {
 
         TextView tvAboutMetaData = findViewById(R.id.tv_about_path);
         tvAboutMetaData.setText(new SpanUtils()
-//                .appendLine("getRootPath: " + PathUtils.getRootPath())
+                .appendLine("getRootPath: " + PathUtils.getRootPath())
+                .appendLine("getDataPath: " + PathUtils.getDataPath())
+                .appendLine("getDownloadCachePath: " + PathUtils.getDownloadCachePath())
+
+                .appendLine("getInternalAppDataPath: " + PathUtils.getInternalAppDataPath())
+                .appendLine("getInternalAppCodeCacheDir: " + PathUtils.getInternalAppCodeCacheDir())
+                .appendLine("getInternalAppCachePath: " + PathUtils.getInternalAppCachePath())
+                .appendLine("getInternalAppDbsPath: " + PathUtils.getInternalAppDbsPath())
+                .appendLine("getInternalAppDbPath: " + PathUtils.getInternalAppDbPath("demo"))
+                .appendLine("getInternalAppFilesPath: " + PathUtils.getInternalAppFilesPath())
+                .appendLine("getInternalAppSpPath: " + PathUtils.getInternalAppSpPath())
+                .appendLine("getInternalAppNoBackupFilesPath: " + PathUtils.getInternalAppNoBackupFilesPath())
+
+                .appendLine("getExternalStoragePath: " + PathUtils.getExternalStoragePath())
+                .appendLine("getExternalMusicPath: " + PathUtils.getExternalMusicPath())
+                .appendLine("getExternalPodcastsPath: " + PathUtils.getExternalPodcastsPath())
+                .appendLine("getExternalRingtonesPath: " + PathUtils.getExternalRingtonesPath())
+                .appendLine("getExternalAlarmsPath: " + PathUtils.getExternalAlarmsPath())
+                .appendLine("getExternalNotificationsPath: " + PathUtils.getExternalNotificationsPath())
+                .appendLine("getExternalPicturesPath: " + PathUtils.getExternalPicturesPath())
+                .appendLine("getExternalMoviesPath: " + PathUtils.getExternalMoviesPath())
+                .appendLine("getExternalDownloadsPath: " + PathUtils.getExternalDownloadsPath())
+                .appendLine("getExternalDcimPath: " + PathUtils.getExternalDcimPath())
+                .appendLine("getExternalDocumentsPath: " + PathUtils.getExternalDocumentsPath())
+
+                .appendLine("getExternalAppDataPath: " + PathUtils.getExternalAppDataPath())
+                .appendLine("getExternalAppCachePath: " + PathUtils.getExternalAppCachePath())
+                .appendLine("getExternalAppFilesPath: " + PathUtils.getExternalAppFilesPath())
+                .appendLine("getExternalAppMusicPath: " + PathUtils.getExternalAppMusicPath())
+                .appendLine("getExternalAppPodcastsPath: " + PathUtils.getExternalAppPodcastsPath())
+                .appendLine("getExternalAppRingtonesPath: " + PathUtils.getExternalAppRingtonesPath())
+                .appendLine("getExternalAppAlarmsPath: " + PathUtils.getExternalAppAlarmsPath())
+                .appendLine("getExternalAppNotificationsPath: " + PathUtils.getExternalAppNotificationsPath())
+                .appendLine("getExternalAppPicturesPath: " + PathUtils.getExternalAppPicturesPath())
+                .appendLine("getExternalAppMoviesPath: " + PathUtils.getExternalAppMoviesPath())
+                .appendLine("getExternalAppDownloadPath: " + PathUtils.getExternalAppDownloadPath())
+                .appendLine("getExternalAppDcimPath: " + PathUtils.getExternalAppDcimPath())
+                .appendLine("getExternalAppDocumentsPath: " + PathUtils.getExternalAppDocumentsPath())
+                .appendLine("getExternalAppObbPath: " + PathUtils.getExternalAppObbPath())
                 .append("")
                 .create());
     }
diff --git a/app/src/main/java/com/blankj/androidutilcode/feature/core/permission/PermissionActivity.java b/app/src/main/java/com/blankj/androidutilcode/feature/core/permission/PermissionActivity.java
index 7c85393dd2..8e92f82812 100644
--- a/app/src/main/java/com/blankj/androidutilcode/feature/core/permission/PermissionActivity.java
+++ b/app/src/main/java/com/blankj/androidutilcode/feature/core/permission/PermissionActivity.java
@@ -56,6 +56,7 @@ public void initView(Bundle savedInstanceState, View contentView) {
         findViewById(R.id.btn_open_app_settings).setOnClickListener(this);
         findViewById(R.id.btn_request_calendar).setOnClickListener(this);
         findViewById(R.id.btn_request_record_audio).setOnClickListener(this);
+        findViewById(R.id.btn_request_calendar_and_record_audio).setOnClickListener(this);
 
         StringBuilder sb = new StringBuilder();
         for (String s : PermissionUtils.getPermissions()) {
@@ -139,6 +140,32 @@ public void onDenied(List permissionsDeniedForever,
                         })
                         .request();
                 break;
+            case R.id.btn_request_calendar_and_record_audio:
+                PermissionUtils.permission(PermissionConstants.CALENDAR, PermissionConstants.MICROPHONE)
+                        .rationale(new PermissionUtils.OnRationaleListener() {
+                            @Override
+                            public void rationale(final ShouldRequest shouldRequest) {
+                                DialogHelper.showRationaleDialog(shouldRequest);
+                            }
+                        })
+                        .callback(new PermissionUtils.FullCallback() {
+                            @Override
+                            public void onGranted(List permissionsGranted) {
+                                updateAboutPermission();
+                                LogUtils.d(permissionsGranted);
+                            }
+
+                            @Override
+                            public void onDenied(List permissionsDeniedForever,
+                                                 List permissionsDenied) {
+                                if (!permissionsDeniedForever.isEmpty()) {
+                                    DialogHelper.showOpenAppSettingDialog();
+                                }
+                                LogUtils.d(permissionsDeniedForever, permissionsDenied);
+                            }
+                        })
+                        .request();
+                break;
         }
     }
 
diff --git a/app/src/main/java/com/blankj/androidutilcode/feature/core/toast/ToastActivity.java b/app/src/main/java/com/blankj/androidutilcode/feature/core/toast/ToastActivity.java
index c360cfe7c7..d36fb31659 100644
--- a/app/src/main/java/com/blankj/androidutilcode/feature/core/toast/ToastActivity.java
+++ b/app/src/main/java/com/blankj/androidutilcode/feature/core/toast/ToastActivity.java
@@ -8,12 +8,14 @@
 import android.support.v4.content.ContextCompat;
 import android.view.Gravity;
 import android.view.View;
+import android.widget.Toast;
 
 import com.blankj.androidutilcode.R;
 import com.blankj.androidutilcode.base.BaseBackActivity;
 import com.blankj.utilcode.util.SizeUtils;
 import com.blankj.utilcode.util.SpanUtils;
 import com.blankj.utilcode.util.ToastUtils;
+import com.blankj.utilcode.util.Utils;
 
 /**
  * 
diff --git a/app/src/main/res_core/layout/activity_keyboard1.xml b/app/src/main/res_core/layout/activity_keyboard1.xml
deleted file mode 100644
index aae8a3925b..0000000000
--- a/app/src/main/res_core/layout/activity_keyboard1.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-    
-
-