Commit 4feaa0aa authored by wanglei's avatar wanglei

...

parent 1daffc44
...@@ -48,6 +48,8 @@ class MyApplication : Application() { ...@@ -48,6 +48,8 @@ class MyApplication : Application() {
var pdfSelectLanguage: String = Locale.getDefault().language var pdfSelectLanguage: String = Locale.getDefault().language
var pdfSplitLanguage: String = Locale.getDefault().language var pdfSplitLanguage: String = Locale.getDefault().language
var wordLanguage: String = Locale.getDefault().language var wordLanguage: String = Locale.getDefault().language
var permissionLanguage: String = Locale.getDefault().language
var guideLanguage: String = Locale.getDefault().language
@JvmField @JvmField
var PAUSED_VALUE = 0 var PAUSED_VALUE = 0
......
...@@ -8,6 +8,7 @@ import androidx.viewpager2.adapter.FragmentStateAdapter ...@@ -8,6 +8,7 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
import androidx.viewpager2.widget.ViewPager2 import androidx.viewpager2.widget.ViewPager2
import com.base.pdfviewerscannerwhite.databinding.ActivityGuideBinding import com.base.pdfviewerscannerwhite.databinding.ActivityGuideBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.helper.MyApplication
import com.base.pdfviewerscannerwhite.ui.permission.PermissionActivity import com.base.pdfviewerscannerwhite.ui.permission.PermissionActivity
class GuideActivity : BaseActivity<ActivityGuideBinding>() { class GuideActivity : BaseActivity<ActivityGuideBinding>() {
...@@ -30,6 +31,11 @@ class GuideActivity : BaseActivity<ActivityGuideBinding>() { ...@@ -30,6 +31,11 @@ class GuideActivity : BaseActivity<ActivityGuideBinding>() {
override fun initView() { override fun initView() {
updateAppLanguage(MyApplication.guideLanguage) {
MyApplication.guideLanguage = it
}
binding.viewPager2.visibility = View.VISIBLE binding.viewPager2.visibility = View.VISIBLE
initViewPager2() initViewPager2()
......
...@@ -57,24 +57,30 @@ class GuidePageFragment( ...@@ -57,24 +57,30 @@ class GuidePageFragment(
} }
binding.tvBtn.setOnClickListener { binding.tvBtn.setOnClickListener {
val activity = requireActivity() as GuideActivity click()
when (page) { }
1 -> { binding.llClick.setOnClickListener {
activity.changePage(1) click()
} }
}
2 -> { private fun click() {
activity.changePage(2) val activity = requireActivity() as GuideActivity
} when (page) {
1 -> {
activity.changePage(1)
}
3 -> { 2 -> {
activity.changePage(2)
}
3 -> {
// AdmobInterstitialUtils.showInterstitialAd(activity) { // AdmobInterstitialUtils.showInterstitialAd(activity) {
startActivity(Intent(activity, PermissionActivity::class.java)) startActivity(Intent(activity, PermissionActivity::class.java))
requireActivity().finish() requireActivity().finish()
// } // }
}
} }
} }
} }
} }
\ No newline at end of file
...@@ -17,6 +17,7 @@ import com.base.pdfviewerscannerwhite.R ...@@ -17,6 +17,7 @@ import com.base.pdfviewerscannerwhite.R
import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils
import com.base.pdfviewerscannerwhite.databinding.ActivityPermissionBinding import com.base.pdfviewerscannerwhite.databinding.ActivityPermissionBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.helper.MyApplication
import com.base.pdfviewerscannerwhite.utils.BarUtils import com.base.pdfviewerscannerwhite.utils.BarUtils
import com.base.pdfviewerscannerwhite.utils.PermissionUtils.requestStoragePermission import com.base.pdfviewerscannerwhite.utils.PermissionUtils.requestStoragePermission
import kotlinx.coroutines.MainScope import kotlinx.coroutines.MainScope
...@@ -32,6 +33,10 @@ class PermissionActivity : BaseActivity<ActivityPermissionBinding>() { ...@@ -32,6 +33,10 @@ class PermissionActivity : BaseActivity<ActivityPermissionBinding>() {
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
override fun initView() { override fun initView() {
updateAppLanguage(MyApplication.permissionLanguage) {
MyApplication.permissionLanguage = it
}
BarUtils.setStatusBarLightMode(this, true) BarUtils.setStatusBarLightMode(this, true)
BarUtils.setStatusBarColor(this, Color.parseColor("#F4F5FA")) BarUtils.setStatusBarColor(this, Color.parseColor("#F4F5FA"))
binding.root.updatePadding(top = BarUtils.getStatusBarHeight()) binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
......
...@@ -5,15 +5,18 @@ ...@@ -5,15 +5,18 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".ui.guide.GuidePageFragment"> tools:context=".ui.guide.GuidePageFragment">
<FrameLayout
android:id="@+id/fl_ad"
android:layout_width="match_parent"
android:layout_height="110dp" />
<LinearLayout <LinearLayout
android:id="@+id/llClick"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@id/fl_ad"
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout
android:id="@+id/fl_ad"
android:layout_width="match_parent"
android:layout_height="110dp" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -89,14 +92,15 @@ ...@@ -89,14 +92,15 @@
android:id="@+id/tvBtn" android:id="@+id/tvBtn"
android:layout_width="250dp" android:layout_width="250dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="32dp"
android:background="@drawable/bg_00b8de_90" android:background="@drawable/bg_00b8de_90"
android:gravity="center" android:gravity="center"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="32dp"
android:text="@string/go_to_start" android:text="@string/go_to_start"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="18sp" /> android:textSize="18sp" />
</RelativeLayout> </RelativeLayout>
\ No newline at end of file
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