diff --git a/README.md b/README.md index c7e79da5..d3d91c7f 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ allprojects { ```gradle dependencies { - implementation 'com.github.HuanTanSheng:EasyPhotos:3.1.2' //androidx版本，支持android 10、11，永久维护 + implementation 'com.github.HuanTanSheng:EasyPhotos:3.1.3' //androidx版本，支持android 10、11，永久维护 //implementation 'com.github.HuanTanSheng:EasyPhotos:2.4.5' //还没有升级到androidx的同学可以用这个版本，但不支持android 10，暂停维护   @@ -151,7 +151,7 @@ QQ交流群：[288600953](https://jq.qq.com/?_wv=1027&k=5QGgCDe) ## 更新日志 -**3.1.2：** +**3.1.3：** - 优化：线程安全 - 优化：防止用户在外部多次点击重复打开相册页 diff --git a/demo/release/demo-release.apk b/demo/release/demo-release.apk index 4ed37353..c7234a9e 100644 Binary files a/demo/release/demo-release.apk and b/demo/release/demo-release.apk differ diff --git a/demo/src/main/java/com/huantansheng/easyphotos/demo/SampleActivity.java b/demo/src/main/java/com/huantansheng/easyphotos/demo/SampleActivity.java index 03b71eb4..ae777645 100644 --- a/demo/src/main/java/com/huantansheng/easyphotos/demo/SampleActivity.java +++ b/demo/src/main/java/com/huantansheng/easyphotos/demo/SampleActivity.java @@ -561,7 +561,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { } else if (RESULT_CANCELED == resultCode) { - Toast.makeText(this, "cancel", Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), "cancel", Toast.LENGTH_SHORT).show(); } } diff --git a/easyPhotos/src/main/java/com/huantansheng/easyphotos/ui/EasyPhotosActivity.java b/easyPhotos/src/main/java/com/huantansheng/easyphotos/ui/EasyPhotosActivity.java index c9fc9dcd..72a27a72 100644 --- a/easyPhotos/src/main/java/com/huantansheng/easyphotos/ui/EasyPhotosActivity.java +++ b/easyPhotos/src/main/java/com/huantansheng/easyphotos/ui/EasyPhotosActivity.java @@ -326,11 +326,11 @@ private void toAndroidCamera(int requestCode) { cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, imageUri);//将拍取的照片保存到指定URI startActivityForResult(cameraIntent, requestCode); } else { - Toast.makeText(this, R.string.camera_temp_file_error_easy_photos, + Toast.makeText(getApplicationContext(), R.string.camera_temp_file_error_easy_photos, Toast.LENGTH_SHORT).show(); } } else { - Toast.makeText(this, R.string.msg_no_camera_easy_photos, Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), R.string.msg_no_camera_easy_photos, Toast.LENGTH_SHORT).show(); } } @@ -679,11 +679,11 @@ private void initView() { if (albumModel.getAlbumItems().isEmpty()) { if (Setting.isOnlyVideo()) { - Toast.makeText(this, R.string.no_videos_easy_photos, Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), R.string.no_videos_easy_photos, Toast.LENGTH_LONG).show(); finish(); return; } - Toast.makeText(this, R.string.no_photos_easy_photos, Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), R.string.no_photos_easy_photos, Toast.LENGTH_LONG).show(); if (Setting.isShowCamera) launchCamera(Code.REQUEST_CAMERA); else finish(); return; @@ -797,7 +797,7 @@ public void onClick(View v) { processSecondMenu(); } else if (R.id.tv_original == id) { if (!Setting.originalMenuUsable) { - Toast.makeText(this, Setting.originalMenuUnusableHint, Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), Setting.originalMenuUnusableHint, Toast.LENGTH_SHORT).show(); return; } Setting.selectedOriginal = !Setting.selectedOriginal; @@ -1006,29 +1006,29 @@ public void onPhotoClick(int position, int realPosition) { public void onSelectorOutOfMax(@Nullable Integer result) { if (result == null) { if (Setting.isOnlyVideo()) { - Toast.makeText(this, getString(R.string.selector_reach_max_video_hint_easy_photos + Toast.makeText(getApplicationContext(), getString(R.string.selector_reach_max_video_hint_easy_photos , Setting.count), Toast.LENGTH_SHORT).show(); } else if (Setting.showVideo) { - Toast.makeText(this, getString(R.string.selector_reach_max_hint_easy_photos, + Toast.makeText(getApplicationContext(), getString(R.string.selector_reach_max_hint_easy_photos, Setting.count), Toast.LENGTH_SHORT).show(); } else { - Toast.makeText(this, getString(R.string.selector_reach_max_image_hint_easy_photos, + Toast.makeText(getApplicationContext(), getString(R.string.selector_reach_max_image_hint_easy_photos, Setting.count), Toast.LENGTH_SHORT).show(); } return; } switch (result) { case Result.PICTURE_OUT: - Toast.makeText(this, getString(R.string.selector_reach_max_image_hint_easy_photos + Toast.makeText(getApplicationContext(), getString(R.string.selector_reach_max_image_hint_easy_photos , Setting.complexPictureCount), Toast.LENGTH_SHORT).show(); break; case Result.VIDEO_OUT: - Toast.makeText(this, getString(R.string.selector_reach_max_video_hint_easy_photos + Toast.makeText(getApplicationContext(), getString(R.string.selector_reach_max_video_hint_easy_photos , Setting.complexVideoCount), Toast.LENGTH_SHORT).show(); break; case Result.SINGLE_TYPE: - Toast.makeText(this, getString(R.string.selector_single_type_hint_easy_photos), + Toast.makeText(getApplicationContext(), getString(R.string.selector_single_type_hint_easy_photos), Toast.LENGTH_SHORT).show(); break; diff --git a/easyPhotos/src/main/java/com/huantansheng/easyphotos/ui/PreviewActivity.java b/easyPhotos/src/main/java/com/huantansheng/easyphotos/ui/PreviewActivity.java index 8da93704..d3de84e7 100644 --- a/easyPhotos/src/main/java/com/huantansheng/easyphotos/ui/PreviewActivity.java +++ b/easyPhotos/src/main/java/com/huantansheng/easyphotos/ui/PreviewActivity.java @@ -301,7 +301,7 @@ public void onClick(View v) { updateSelector(); } else if (R.id.tv_original == id) { if (!Setting.originalMenuUsable) { - Toast.makeText(this, Setting.originalMenuUnusableHint, Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), Setting.originalMenuUnusableHint, Toast.LENGTH_SHORT).show(); return; } Setting.selectedOriginal = !Setting.selectedOriginal; @@ -371,14 +371,14 @@ private void updateSelector() { return; } if (Setting.isOnlyVideo()) { - Toast.makeText(this, getString(R.string.selector_reach_max_video_hint_easy_photos + Toast.makeText(getApplicationContext(), getString(R.string.selector_reach_max_video_hint_easy_photos , Setting.count), Toast.LENGTH_SHORT).show(); } else if (Setting.showVideo) { - Toast.makeText(this, getString(R.string.selector_reach_max_hint_easy_photos, + Toast.makeText(getApplicationContext(), getString(R.string.selector_reach_max_hint_easy_photos, Setting.count), Toast.LENGTH_SHORT).show(); } else { - Toast.makeText(this, getString(R.string.selector_reach_max_image_hint_easy_photos, + Toast.makeText(getApplicationContext(), getString(R.string.selector_reach_max_image_hint_easy_photos, Setting.count), Toast.LENGTH_SHORT).show(); } return; @@ -390,17 +390,17 @@ private void updateSelector() { item.selected = false; switch (res) { case Result.PICTURE_OUT: - Toast.makeText(this, + Toast.makeText(getApplicationContext(), getString(R.string.selector_reach_max_image_hint_easy_photos, Setting.complexPictureCount), Toast.LENGTH_SHORT).show(); break; case Result.VIDEO_OUT: - Toast.makeText(this, + Toast.makeText(getApplicationContext(), getString(R.string.selector_reach_max_video_hint_easy_photos, Setting.complexVideoCount), Toast.LENGTH_SHORT).show(); break; case Result.SINGLE_TYPE: - Toast.makeText(this, getString(R.string.selector_single_type_hint_easy_photos), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), getString(R.string.selector_single_type_hint_easy_photos), Toast.LENGTH_SHORT).show(); break; } return; diff --git a/easyPhotos/src/main/java/com/huantansheng/easyphotos/ui/PuzzleSelectorActivity.java b/easyPhotos/src/main/java/com/huantansheng/easyphotos/ui/PuzzleSelectorActivity.java index 300fc095..0f50c2a3 100644 --- a/easyPhotos/src/main/java/com/huantansheng/easyphotos/ui/PuzzleSelectorActivity.java +++ b/easyPhotos/src/main/java/com/huantansheng/easyphotos/ui/PuzzleSelectorActivity.java @@ -226,7 +226,7 @@ public void onBackPressed() { @Override public void onPhotoClick(int position) { if (selectedPhotos.size() > 8) { - Toast.makeText(this, getString(R.string.selector_reach_max_image_hint_easy_photos, 9), Toast.LENGTH_SHORT).show(); + Toast.makeText(getApplicationContext(), getString(R.string.selector_reach_max_image_hint_easy_photos, 9), Toast.LENGTH_SHORT).show(); return; }