diff --git a/picture_library/src/main/java/com/luck/picture/lib/PicturePreviewActivity.java b/picture_library/src/main/java/com/luck/picture/lib/PicturePreviewActivity.java index 1da1b95c1..5e8dd1402 100644 --- a/picture_library/src/main/java/com/luck/picture/lib/PicturePreviewActivity.java +++ b/picture_library/src/main/java/com/luck/picture/lib/PicturePreviewActivity.java @@ -1142,9 +1142,6 @@ protected void onSaveInstanceState(@NotNull Bundle outState) { @Override protected void onDestroy() { super.onDestroy(); - if (!isOnSaveInstanceState) { - ImagesObservable.getInstance().clearPreviewMediaData(); - } if (mHandler != null) { mHandler.removeCallbacksAndMessages(null); mHandler = null; @@ -1158,6 +1155,14 @@ protected void onDestroy() { } } + @Override + public void finish() { + super.finish(); + if (!isOnSaveInstanceState) { + ImagesObservable.getInstance().clearPreviewMediaData(); + } + } + @Override public void onActivityBackPressed() { onBackPressed(); diff --git a/picture_library/src/main/java/com/luck/picture/lib/language/LanguageConfig.java b/picture_library/src/main/java/com/luck/picture/lib/language/LanguageConfig.java index e9b198dfe..69186a28e 100644 --- a/picture_library/src/main/java/com/luck/picture/lib/language/LanguageConfig.java +++ b/picture_library/src/main/java/com/luck/picture/lib/language/LanguageConfig.java @@ -44,7 +44,17 @@ public class LanguageConfig { public static final int VIETNAM = 7; /** + * 泰语 + */ + public static final int THAI = 8; + + /** + * 俄语 + */ + public static final int RUSSIAN = 9; + * 西班牙语 */ - public static final int SPANISH = 8; + public static final int SPANISH = 10; + } diff --git a/picture_library/src/main/java/com/luck/picture/lib/language/LocaleTransform.java b/picture_library/src/main/java/com/luck/picture/lib/language/LocaleTransform.java index e9d4a6e19..8798d6034 100644 --- a/picture_library/src/main/java/com/luck/picture/lib/language/LocaleTransform.java +++ b/picture_library/src/main/java/com/luck/picture/lib/language/LocaleTransform.java @@ -31,6 +31,12 @@ public static Locale getLanguage(int language) { case LanguageConfig.VIETNAM: // 越南语 return new Locale("vi"); + case LanguageConfig.THAI: + //泰语 + return new Locale("th"); + case LanguageConfig.RUSSIAN: + //俄语 + return new Locale("ru"); case LanguageConfig.SPANISH: // 西班牙语 return new Locale("es", "ES");