Commit eb1076ae authored by wanglei's avatar wanglei

...

parent ed77af08
...@@ -97,10 +97,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView { ...@@ -97,10 +97,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView {
private var actionId: String = "" private var actionId: String = ""
override fun initView() { override fun initView() {
if (checkNeedRecreate(MyApplication.mainLanguage)) {
return
}
BarUtils.setStatusBarLightMode(this, !ConstObject.modeNight) BarUtils.setStatusBarLightMode(this, !ConstObject.modeNight)
if (ConstObject.modeNight) { if (ConstObject.modeNight) {
BarUtils.setStatusBarColor(this, Color.BLACK) BarUtils.setStatusBarColor(this, Color.BLACK)
...@@ -110,6 +106,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView { ...@@ -110,6 +106,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView {
// binding.root.updatePadding(top = BarUtils.getStatusBarHeight()) // binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
// AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES) // AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
if (checkNeedRecreate(MyApplication.mainLanguage)) {
return
}
mainPresenter = MainPresenter(this, this, lifecycleScope) mainPresenter = MainPresenter(this, this, lifecycleScope)
mainPresenter.initScannerLauncher(this) mainPresenter.initScannerLauncher(this)
...@@ -141,6 +141,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView { ...@@ -141,6 +141,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView {
lateinit var callback: OnBackPressedCallback lateinit var callback: OnBackPressedCallback
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
if (checkNeedRecreate(MyApplication.mainLanguage)) {
return
}
callback = object : OnBackPressedCallback(false) { callback = object : OnBackPressedCallback(false) {
override fun handleOnBackPressed() { override fun handleOnBackPressed() {
......
...@@ -95,9 +95,10 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -95,9 +95,10 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
delay(150) delay(150)
if (binding.progressBar.progress >= Random.nextInt(25, 40)) { if (binding.progressBar.progress >= Random.nextInt(25, 40)) {
binding.flLoading.visibility = View.GONE binding.flLoading.visibility = View.GONE
cancel() break
} }
} }
showGuide()
} }
} }
...@@ -150,6 +151,11 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -150,6 +151,11 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
SpStringUtils.addSpString(LAST_VIEW_KEY, "${path}_/_${System.currentTimeMillis()}") SpStringUtils.addSpString(LAST_VIEW_KEY, "${path}_/_${System.currentTimeMillis()}")
} }
showGuide()
AdmobNativeUtils.showNativeAd(this, binding.flAd, R.layout.layout_admob_document_in)
}
private fun showGuide() {
if (!haveGuideGesture) { if (!haveGuideGesture) {
binding.flGuideGesture.visibility = View.VISIBLE binding.flGuideGesture.visibility = View.VISIBLE
lifecycleScope.launch(Dispatchers.Main) { lifecycleScope.launch(Dispatchers.Main) {
...@@ -157,7 +163,6 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -157,7 +163,6 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
binding.flGuideGesture.visibility = View.GONE binding.flGuideGesture.visibility = View.GONE
} }
} }
AdmobNativeUtils.showNativeAd(this, binding.flAd, R.layout.layout_admob_document_in)
} }
override fun jumpPage(pageIndex: Int) { override fun jumpPage(pageIndex: Int) {
......
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