Commit 565b2889 authored by wanglei's avatar wanglei

...

parent 0d2f8013
...@@ -18,6 +18,7 @@ class MyApplication : Application() { ...@@ -18,6 +18,7 @@ class MyApplication : Application() {
companion object { companion object {
lateinit var context: MyApplication lateinit var context: MyApplication
var splashLanguage: String = Locale.ENGLISH.language
var mainLanguage: String = Locale.ENGLISH.language var mainLanguage: String = Locale.ENGLISH.language
var setLanguage: String = Locale.ENGLISH.language var setLanguage: String = Locale.ENGLISH.language
var feedbackLanguage: String = Locale.ENGLISH.language var feedbackLanguage: String = Locale.ENGLISH.language
...@@ -25,6 +26,10 @@ class MyApplication : Application() { ...@@ -25,6 +26,10 @@ class MyApplication : Application() {
var pdfLanguage: String = Locale.ENGLISH.language var pdfLanguage: String = Locale.ENGLISH.language
var pdfLoadingLanguage: String = Locale.ENGLISH.language var pdfLoadingLanguage: String = Locale.ENGLISH.language
var pdfMergeLanguage: String = Locale.ENGLISH.language var pdfMergeLanguage: String = Locale.ENGLISH.language
var pdfSelectLanguage: String = Locale.ENGLISH.language
var pdfSplitLanguage: String = Locale.ENGLISH.language
var wordLanguage: String = Locale.ENGLISH.language
@JvmField @JvmField
var PAUSED_VALUE = 0 var PAUSED_VALUE = 0
......
...@@ -13,6 +13,7 @@ import com.base.pdfviewerscannerwhite.bean.ConstObject.DO_UNLOCK_PDF ...@@ -13,6 +13,7 @@ import com.base.pdfviewerscannerwhite.bean.ConstObject.DO_UNLOCK_PDF
import com.base.pdfviewerscannerwhite.bean.DocumentBean import com.base.pdfviewerscannerwhite.bean.DocumentBean
import com.base.pdfviewerscannerwhite.databinding.ActivityPdfSelectBinding import com.base.pdfviewerscannerwhite.databinding.ActivityPdfSelectBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.helper.MyApplication
import com.base.pdfviewerscannerwhite.ui.main.DocumentAdapter import com.base.pdfviewerscannerwhite.ui.main.DocumentAdapter
import com.base.pdfviewerscannerwhite.ui.main.DocumentPresenter import com.base.pdfviewerscannerwhite.ui.main.DocumentPresenter
import com.base.pdfviewerscannerwhite.ui.main.DocumentView import com.base.pdfviewerscannerwhite.ui.main.DocumentView
...@@ -32,6 +33,13 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>(), DocumentView ...@@ -32,6 +33,13 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>(), DocumentView
ActivityPdfSelectBinding.inflate(layoutInflater) ActivityPdfSelectBinding.inflate(layoutInflater)
} }
override fun onResume() {
super.onResume()
updateAppLanguage(MyApplication.pdfSelectLanguage) {
MyApplication.pdfSelectLanguage = it
}
}
override fun initView() { override fun initView() {
doWhat = intent.extras?.getString("doWhat", "") ?: "" doWhat = intent.extras?.getString("doWhat", "") ?: ""
documentPresenter = DocumentPresenter(this, this, DocumentBean.TYPE_PDF, lifecycleScope) documentPresenter = DocumentPresenter(this, this, DocumentBean.TYPE_PDF, lifecycleScope)
...@@ -42,7 +50,6 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>(), DocumentView ...@@ -42,7 +50,6 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>(), DocumentView
DO_SPLIT_PDF -> { DO_SPLIT_PDF -> {
binding.tvBtnNext.visibility = View.GONE binding.tvBtnNext.visibility = View.GONE
binding.tvSelectTip.text = getString(R.string.select_a_project) binding.tvSelectTip.text = getString(R.string.select_a_project)
documentPresenter.initData() documentPresenter.initData()
} }
......
...@@ -7,6 +7,7 @@ import com.base.pdfviewerscannerwhite.bean.ConstObject ...@@ -7,6 +7,7 @@ import com.base.pdfviewerscannerwhite.bean.ConstObject
import com.base.pdfviewerscannerwhite.bean.PdfPageBean import com.base.pdfviewerscannerwhite.bean.PdfPageBean
import com.base.pdfviewerscannerwhite.databinding.ActivityPdfSplitBinding import com.base.pdfviewerscannerwhite.databinding.ActivityPdfSplitBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.helper.MyApplication
import com.base.pdfviewerscannerwhite.ui.view.DialogView.showDocumentRenameDialog import com.base.pdfviewerscannerwhite.ui.view.DialogView.showDocumentRenameDialog
class PdfSplitActivity : BaseActivity<ActivityPdfSplitBinding>(), PdfView { class PdfSplitActivity : BaseActivity<ActivityPdfSplitBinding>(), PdfView {
...@@ -20,6 +21,13 @@ class PdfSplitActivity : BaseActivity<ActivityPdfSplitBinding>(), PdfView { ...@@ -20,6 +21,13 @@ class PdfSplitActivity : BaseActivity<ActivityPdfSplitBinding>(), PdfView {
ActivityPdfSplitBinding.inflate(layoutInflater) ActivityPdfSplitBinding.inflate(layoutInflater)
} }
override fun onResume() {
super.onResume()
updateAppLanguage(MyApplication.pdfSplitLanguage) {
MyApplication.pdfSplitLanguage = it
}
}
override fun initView() { override fun initView() {
pdfPresenter = PdfPresenter(this, this) pdfPresenter = PdfPresenter(this, this)
path = intent.extras?.getString("path", "") ?: "" path = intent.extras?.getString("path", "") ?: ""
......
...@@ -17,6 +17,7 @@ import com.base.pdfviewerscannerwhite.R ...@@ -17,6 +17,7 @@ import com.base.pdfviewerscannerwhite.R
import com.base.pdfviewerscannerwhite.bean.DocumentBean import com.base.pdfviewerscannerwhite.bean.DocumentBean
import com.base.pdfviewerscannerwhite.databinding.ActivityWordBinding import com.base.pdfviewerscannerwhite.databinding.ActivityWordBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.helper.MyApplication
import com.base.pdfviewerscannerwhite.ui.view.DialogView.showDocumentMore import com.base.pdfviewerscannerwhite.ui.view.DialogView.showDocumentMore
import com.base.pdfviewerscannerwhite.utils.KeyBoardUtils.hideKeyboard import com.base.pdfviewerscannerwhite.utils.KeyBoardUtils.hideKeyboard
import com.base.pdfviewerscannerwhite.utils.KeyBoardUtils.showKeyBoard import com.base.pdfviewerscannerwhite.utils.KeyBoardUtils.showKeyBoard
...@@ -39,6 +40,12 @@ class WordActivity : BaseActivity<ActivityWordBinding>() { ...@@ -39,6 +40,12 @@ class WordActivity : BaseActivity<ActivityWordBinding>() {
private var totalPageNumber = 0 private var totalPageNumber = 0
private var currentPageNumber = 0 private var currentPageNumber = 0
override fun onResume() {
super.onResume()
updateAppLanguage(MyApplication.wordLanguage) {
MyApplication.wordLanguage = it
}
}
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
override fun initView() { override fun initView() {
...@@ -297,7 +304,7 @@ class WordActivity : BaseActivity<ActivityWordBinding>() { ...@@ -297,7 +304,7 @@ class WordActivity : BaseActivity<ActivityWordBinding>() {
LogEx.logDebug(TAG, "initData-fileType = $fileType") LogEx.logDebug(TAG, "initData-fileType = $fileType")
LogEx.logDebug(TAG, "initData-engine = $engine") LogEx.logDebug(TAG, "initData-engine = $engine")
val value =( pathOrUri ?: "") + "_/_" + System.currentTimeMillis() val value = (pathOrUri ?: "") + "_/_" + System.currentTimeMillis()
LogEx.logDebug(TAG, "value=$value") LogEx.logDebug(TAG, "value=$value")
SpStringUtils.addSpString(SpStringUtils.LAST_VIEW_KEY, value) SpStringUtils.addSpString(SpStringUtils.LAST_VIEW_KEY, value)
} }
......
...@@ -13,6 +13,7 @@ import com.base.pdfviewerscannerwhite.bean.ConstObject.haveSelectLanguage ...@@ -13,6 +13,7 @@ import com.base.pdfviewerscannerwhite.bean.ConstObject.haveSelectLanguage
import com.base.pdfviewerscannerwhite.bean.ConstObject.ifAgreePrivacy import com.base.pdfviewerscannerwhite.bean.ConstObject.ifAgreePrivacy
import com.base.pdfviewerscannerwhite.databinding.ActivitySplashBinding import com.base.pdfviewerscannerwhite.databinding.ActivitySplashBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.helper.MyApplication
import com.base.pdfviewerscannerwhite.service.StayNotificationService.Companion.startStayNotification import com.base.pdfviewerscannerwhite.service.StayNotificationService.Companion.startStayNotification
import com.base.pdfviewerscannerwhite.ui.main.MainActivity import com.base.pdfviewerscannerwhite.ui.main.MainActivity
import com.base.pdfviewerscannerwhite.ui.set.SetLanguageActivity import com.base.pdfviewerscannerwhite.ui.set.SetLanguageActivity
...@@ -113,6 +114,9 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(), SplashView { ...@@ -113,6 +114,9 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(), SplashView {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
updateAppLanguage(MyApplication.splashLanguage) {
MyApplication.splashLanguage = it
}
startProgressJob() startProgressJob()
splashPresenter.startJumpJob(lifecycleScope) splashPresenter.startJumpJob(lifecycleScope)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment