diff --git a/README-CN.md b/README-CN.md index a4abf35bdbe8256affb04a8935ddec9206d3766f..4c2e3813e72a17c9f4b2dce643dec3586135daa6 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.12.3-brightgreen.svg +[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.12.4-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 455890eadad1d541550df20007d06b274453bdce..8f7861bff6c733c11d70f4f5cc7260cd5d6c5db7 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ If this ptoject helps you a lot, and you would like to support this ptoject's fu [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png -[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.12.3-brightgreen.svg +[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.12.4-brightgreen.svg [auc]: https://github.com/Blankj/AndroidUtilCode [apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg diff --git a/app/build.gradle b/app/build.gradle index 2b5a41c9103cb44ad26c396d985d9c4f32eb1bbf..cdfb1c4a158a42b53b0ff13f4e415fd090664b3f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,7 +67,7 @@ dependencies { debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version" releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version" -// implementation 'com.blankj:utilcode:1.12.3' +// implementation 'com.blankj:utilcode:1.12.4' } diff --git a/app/src/main/java/com/blankj/androidutilcode/feature/core/activity/ActivityActivity.java b/app/src/main/java/com/blankj/androidutilcode/feature/core/activity/ActivityActivity.java index 54e0dde00a6448f5876772a0f2fdda0c1dcb0243..b214864e4f2f158a3a2ed2e666b3138a50c0acd7 100644 --- a/app/src/main/java/com/blankj/androidutilcode/feature/core/activity/ActivityActivity.java +++ b/app/src/main/java/com/blankj/androidutilcode/feature/core/activity/ActivityActivity.java @@ -249,7 +249,6 @@ public class ActivityActivity extends BaseBackActivity { private Bundle getOption(int type) { switch (type) { - default: case 0: return ActivityOptionsCompat.makeCustomAnimation(this, R.anim.slide_in_right_1000, @@ -277,6 +276,8 @@ public class ActivityActivity extends BaseBackActivity { viewSharedElement, getString(R.string.activity_shared_element)) .toBundle(); + default: + return null; } } } diff --git a/app/src/main/java/com/blankj/androidutilcode/feature/core/screen/ScreenActivity.java b/app/src/main/java/com/blankj/androidutilcode/feature/core/screen/ScreenActivity.java index c0ee00a5789d34ee5ca0586dfb7beb93b961f49c..eff193f4ed1d9a521a98745d8ca07a23bfa2c5d2 100644 --- a/app/src/main/java/com/blankj/androidutilcode/feature/core/screen/ScreenActivity.java +++ b/app/src/main/java/com/blankj/androidutilcode/feature/core/screen/ScreenActivity.java @@ -61,8 +61,6 @@ public class ScreenActivity extends BaseBackActivity { .append("isTablet: " + ScreenUtils.isTablet()) .create() ); - - } @Override diff --git a/build.gradle b/build.gradle index 1a60c83cffec34c1daf47d1eddd05efb736deeda..07fab041c314b8639f262ef9cfe1502c621479ed 100644 --- a/build.gradle +++ b/build.gradle @@ -32,8 +32,8 @@ ext { min_sdk_version = 14 target_sdk_version = 23 - version_code = 1_012_003 - version_name = '1.12.3'// E.g 1.9.72 => 1,009,072 + version_code = 1_012_004 + version_name = '1.12.4'// E.g 1.9.72 => 1,009,072 // App dependencies support_version = '26.1.0' diff --git a/subutil/src/main/java/com/blankj/subutil/util/CloneUtils.java b/subutil/src/main/java/com/blankj/subutil/util/CloneUtils.java new file mode 100644 index 0000000000000000000000000000000000000000..69717a09258bab69e89e0c9908a98caa648f2340 --- /dev/null +++ b/subutil/src/main/java/com/blankj/subutil/util/CloneUtils.java @@ -0,0 +1,66 @@ +package com.blankj.subutil.util; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; + +/** + *
+ * author: Blankj + * blog : http://blankj.com + * time : 2018/01/30 + * desc : 克隆相关工具类 + *+ */ +public final class CloneUtils { + + public static
返回 -1 表示异常
* * @param filePath 文件路径 * @return 旋转角度 */ public static int getRotateDegree(final String filePath) { - int degree = 0; try { ExifInterface exifInterface = new ExifInterface(filePath); int orientation = exifInterface.getAttributeInt( ExifInterface.TAG_ORIENTATION, - ExifInterface.ORIENTATION_NORMAL); + ExifInterface.ORIENTATION_NORMAL + ); switch (orientation) { - default: case ExifInterface.ORIENTATION_ROTATE_90: - degree = 90; - break; + return 90; case ExifInterface.ORIENTATION_ROTATE_180: - degree = 180; - break; + return 180; case ExifInterface.ORIENTATION_ROTATE_270: - degree = 270; - break; + return 270; + default: + return 0; } } catch (IOException e) { e.printStackTrace(); + return -1; } - return degree; } /** diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/ScreenUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/ScreenUtils.java index 1dfe16ef077c82a4f76b09e3d6472fe9a7fecc25..9476a4f314cc4865d172551e55344627bfbb32a1 100644 --- a/utilcode/src/main/java/com/blankj/utilcode/util/ScreenUtils.java +++ b/utilcode/src/main/java/com/blankj/utilcode/util/ScreenUtils.java @@ -150,7 +150,6 @@ public final class ScreenUtils { */ public static int getScreenRotation(@NonNull final Activity activity) { switch (activity.getWindowManager().getDefaultDisplay().getRotation()) { - default: case Surface.ROTATION_0: return 0; case Surface.ROTATION_90: @@ -159,6 +158,8 @@ public final class ScreenUtils { return 180; case Surface.ROTATION_270: return 270; + default: + return 0; } }