Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

增加泰语和俄语 #1714

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

增加泰语和俄语 #1714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
459b8fc
增加泰语和俄语
Oct 29, 2020
e6cdaa5
修复onDestroy延时执行时导致再次进入预览界面崩溃问题
ganlong-2016 Nov 13, 2020
46cf21f
Merge branch 'master' into master
ganlong-2016 Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions picture_library/src/main/java/com/luck/picture/lib/PicturePreviewActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -1158,6 +1155,14 @@ protected void onDestroy() {
}
}

@Override
public void finish() {
super.finish();
if (!isOnSaveInstanceState) {
ImagesObservable.getInstance().clearPreviewMediaData();
}
}

@Override
public void onActivityBackPressed() {
onBackPressed();
Expand Down
12 changes: 11 additions & 1 deletion picture_library/src/main/java/com/luck/picture/lib/language/LanguageConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

}
6 changes: 6 additions & 0 deletions picture_library/src/main/java/com/luck/picture/lib/language/LocaleTransform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down