...

app/src/main/java/com/base/pdfviewerscannerwhite/ui/main/MainActivity.kt

@@ -2,6 +2,7 @@ package com.base.pdfviewerscannerwhite.ui.main
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.app.Dialog
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
@@ -35,7 +36,6 @@ import java.io.File
 
 class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
 
-
     private val TAG = "MainActivity"
     lateinit var mainPresenter: MainPresenter
     override val binding: ActivityMain2Binding by lazy {
@@ -79,12 +79,8 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
 
         if (checkStorePermission() && needRefresh) {
             mainPresenter.initAllDocumentData()
-//            Log.d("glc","我被调用了A")
         } else {
-            showStoragePermission(launcher, allowAction = {
-//            mainPresenter.initAllDocumentData()
-//                Log.d("glc","我被调用了B")
-            })
+            showStoragePermission(launcher, allowAction = {})
         }
     }
 

app/src/main/java/com/base/pdfviewerscannerwhite/ui/set/SetLanguageActivity.kt

 package com.base.pdfviewerscannerwhite.ui.set
 
 import androidx.activity.addCallback
+import com.base.pdfviewerscannerwhite.R
 import com.base.pdfviewerscannerwhite.bean.ConstObject
 import com.base.pdfviewerscannerwhite.bean.ConstObject.appLanguageSp
 import com.base.pdfviewerscannerwhite.bean.ConstObject.changeLanguageSp
 import com.base.pdfviewerscannerwhite.bean.LanguageBean
 import com.base.pdfviewerscannerwhite.databinding.ActivitySetLanguageBinding
 import com.base.pdfviewerscannerwhite.helper.BaseActivity
-import com.base.pdfviewerscannerwhite.helper.MyApplication
+import com.base.pdfviewerscannerwhite.utils.LanguageUtils.getSystemLanguageDefault
 import java.util.Locale
 
 class SetLanguageActivity : BaseActivity<ActivitySetLanguageBinding>() {
@@ -18,7 +19,7 @@ class SetLanguageActivity : BaseActivity<ActivitySetLanguageBinding>() {
     private lateinit var adapter: LanguageAdapter
     private var from: String = ""
     override fun initView() {
-        ConstObject.haveSelectLanguage = true
+
         from = intent.extras?.getString("from", "") ?: ""
         adapter = LanguageAdapter()
         binding.rv.adapter = adapter
@@ -49,6 +50,7 @@ class SetLanguageActivity : BaseActivity<ActivitySetLanguageBinding>() {
 
     private fun initData() {
         val list = listOf(
+            LanguageBean(this.getString(R.string.follow_system), getSystemLanguageDefault(this)),
             LanguageBean(LanguageBean.English, Locale.ENGLISH.language),
             LanguageBean(LanguageBean.简体中文, Locale.PRC.language),
             LanguageBean(LanguageBean.português, Locale("pt", "BR").language),
@@ -66,8 +68,14 @@ class SetLanguageActivity : BaseActivity<ActivitySetLanguageBinding>() {
             LanguageBean(LanguageBean.繁體中文, Locale("zh", "TW").language),
             LanguageBean(LanguageBean.Türk, Locale("tr", "TR").language),
         )
-        list.find { it.language == appLanguageSp }?.isSelect = true
+        if (ConstObject.haveSelectLanguage) {
+            list.findLast { it.language == appLanguageSp }?.isSelect = true
+        } else {
+            list.first().isSelect = true
+        }
         adapter.submitList(list)
+
+        ConstObject.haveSelectLanguage = true
     }
 
 }
\ No newline at end of file

app/src/main/java/com/base/pdfviewerscannerwhite/utils/LanguageUtils.kt

 package com.base.pdfviewerscannerwhite.utils
 
 import android.content.Context
+import java.util.Locale
 
 object LanguageUtils {
 
@@ -11,4 +12,30 @@ object LanguageUtils {
         return locale.language
     }
 
+    fun getSystemLanguageDefault(context: Context): String {
+        val supportLanguage = listOf(
+            Locale.ENGLISH.language,
+            Locale.PRC.language,
+            Locale("pt", "BR").language,
+            Locale("es").language,
+            Locale.FRENCH.language,
+            Locale("de").language,
+            Locale("th", "TH").language,
+            Locale("in", "ID").language,
+            Locale("ms", "MY").language,
+            Locale("vi", "VN").language,
+            Locale("ja", "JP").language,
+            Locale("it", "IT").language,
+            Locale("ko", "KR").language,
+            Locale("nl", "NL").language,
+            Locale("zh", "TW").language,
+            Locale("tr", "TR").language
+        )
+        var systemLanguage = getSystemLanguage(context)
+        if (!supportLanguage.contains(systemLanguage)) {
+            systemLanguage = Locale.ENGLISH.language
+        }
+        return systemLanguage
+    }
+
 }
\ No newline at end of file

app/src/main/res/layout/dialog_app_exit.xml

@@ -22,6 +22,7 @@
             android:layout_marginTop="28dp"
             android:text="Are you sure want to exit the app?"
             android:textColor="#333333"
+            android:textSize="18sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -38,9 +39,14 @@
             android:gravity="center_horizontal"
             tools:ignore="Autofill,HardcodedText,LabelFor,TextFields">
 
-            <View
+            <ImageView
                 android:layout_width="match_parent"
-                android:layout_height="30dp" />
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:scaleType="fitCenter"
+                android:src="@mipmap/zhanweitu"
+                tools:ignore="ContentDescription" />
+
         </FrameLayout>
 
         <LinearLayout

app/src/main/res/layout/dialog_storage_permission.xml

@@ -19,7 +19,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="24dp"
-        android:text="Authorization request"
+        android:text="@string/authorization_request"
         android:textColor="#333333"
         android:textSize="17sp"
         android:textStyle="bold"
@@ -31,7 +31,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="16dp"
         android:gravity="center"
-        android:text="To read and edit PDF files, we need your\npermission to obtain file management privileges"
+        android:text="@string/to_read_and_edit_pdf_files_we_need_your_permission_to_obtain_file_management_privileges"
         android:textColor="#666666"
         android:textSize="15sp"
         tools:ignore="HardcodedText" />
@@ -44,7 +44,7 @@
         android:layout_marginTop="20dp"
         android:background="@drawable/bg_00b8de_10"
         android:gravity="center"
-        android:text="Set"
+        android:text="@string/set"
         android:textColor="@color/white"
         android:textSize="18sp"
         tools:ignore="HardcodedText" />
@@ -56,7 +56,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_margin="10dp"
         android:padding="10dp"
-        android:text="Continue"
+        android:text="@string/_continue"
         android:textColor="#999999"
         android:textSize="18sp"
         tools:ignore="HardcodedText" />

app/src/main/res/values-ja/strings.xml

@@ -55,5 +55,6 @@
     <string name="name_z_a">名前 (Z-A)</string>
     <string name="language">言語</string>
     <string name="select_language">言語を選択してください</string>
+    <string name="follow_system">フォローシステム</string>
 
 </resources>
\ No newline at end of file

app/src/main/res/values/strings.xml

@@ -71,5 +71,9 @@
     <string name="friday">Friday</string>
     <string name="saturday">Saturday</string>
     <string name="exit">Exit</string>
+    <string name="follow_system">Follow System</string>
+    <string name="authorization_request">Authorization request</string>
+    <string name="to_read_and_edit_pdf_files_we_need_your_permission_to_obtain_file_management_privileges">To read and edit PDF files, we need your\npermission to obtain file management privileges</string>
+    <string name="_continue">Continue</string>
 
 </resources>
\ No newline at end of file