From 459b8fca9fbd58be00539ae7c33e77a69ea986cc Mon Sep 17 00:00:00 2001
From: ganlong <long.gan@beantechs.com>
Date: Thu, 29 Oct 2020 11:22:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=B0=E8=AF=AD?=
 =?UTF-8?q?=E5=92=8C=E4=BF=84=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/luck/picture/lib/language/LanguageConfig.java  | 10 ++++++++++
 .../com/luck/picture/lib/language/LocaleTransform.java |  6 ++++++
 2 files changed, 16 insertions(+)

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 ea5fdbf4b..da3ad2042 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
@@ -42,4 +42,14 @@ public class LanguageConfig {
      * 越语
      */
     public static final int VIETNAM = 7;
+
+    /**
+     * 泰语
+     */
+    public static final int THAI = 8;
+
+    /**
+     * 俄语
+     */
+    public static final int RUSSIAN = 9;
 }
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 684eeac88..80fedbb7a 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");
             default:
                 // 简体中文
                 return Locale.CHINESE;

From e6cdaa55d6f912021c9529c632e2daae0efaa8b7 Mon Sep 17 00:00:00 2001
From: ganlong-2016 <676001590@qq.com>
Date: Fri, 13 Nov 2020 15:43:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DonDestroy=E5=BB=B6?=
 =?UTF-8?q?=E6=97=B6=E6=89=A7=E8=A1=8C=E6=97=B6=E5=AF=BC=E8=87=B4=E5=86=8D?=
 =?UTF-8?q?=E6=AC=A1=E8=BF=9B=E5=85=A5=E9=A2=84=E8=A7=88=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/luck/picture/lib/PicturePreviewActivity.java  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 21c77ec0b..4f648d130 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
@@ -1015,9 +1015,6 @@ protected void onSaveInstanceState(Bundle outState) {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (!isOnSaveInstanceState) {
-            ImagesObservable.getInstance().clearPreviewMediaData();
-        }
         if (mHandler != null) {
             mHandler.removeCallbacksAndMessages(null);
             mHandler = null;
@@ -1031,6 +1028,14 @@ protected void onDestroy() {
         }
     }
 
+    @Override
+    public void finish() {
+        super.finish();
+        if (!isOnSaveInstanceState) {
+            ImagesObservable.getInstance().clearPreviewMediaData();
+        }
+    }
+        
     @Override
     public void onActivityBackPressed() {
         onBackPressed();