Skip to content

P
PDF Viewer Scanner White
Commit c281ff79 authored by wanglei's avatar wanglei
Browse files
Options

...

parent b9c9216b
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 32 deletions
app/src/main/java/com/base/pdfviewerscannerwhite/ui/guide/GuideActivity.kt
View file @ c281ff79
package com.base.pdfviewerscannerwhite.ui.guide
import android.content.Intent
import android.view.View
import androidx.activity.addCallback
import androidx.fragment.app.Fragment
import androidx.viewpager2.adapter.FragmentStateAdapter
import androidx.viewpager2.widget.ViewPager2
import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils
import com.base.pdfviewerscannerwhite.databinding.ActivityGuideBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.ui.guide.GuideDialog.showGuideDialog
import com.base.pdfviewerscannerwhite.ui.permission.PermissionActivity
class GuideActivity : BaseActivity<ActivityGuideBinding>() {
......@@ -28,14 +31,19 @@ class GuideActivity : BaseActivity<ActivityGuideBinding>() {
override fun initView() {
binding.viewPager2.visibility = View.VISIBLE
initViewPager2()
showGuideDialog(close = {
finishToMain()
}, view = {
binding.viewPager2.visibility = View.VISIBLE
})
// showGuideDialog(close = {
// finishToMain()
// }, view = {
//
// })
onBackPressedDispatcher.addCallback {
AdmobInterstitialUtils.showInterstitialAd(this@GuideActivity) {
startActivity(Intent(this@GuideActivity, PermissionActivity::class.java))
}
}
}
private fun initViewPager2() {
......
app/src/main/java/com/base/pdfviewerscannerwhite/ui/guide/GuidePageFragment.kt
View file @ c281ff79
package com.base.pdfviewerscannerwhite.ui.guide
import android.content.Intent
import android.view.View
import androidx.core.view.isEmpty
import com.base.pdfviewerscannerwhite.R
import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils
import com.base.pdfviewerscannerwhite.ads.admob.AdmobNativeUtils
import com.base.pdfviewerscannerwhite.databinding.FragmentGuidePageBinding
import com.base.pdfviewerscannerwhite.helper.BaseFragment
import com.base.pdfviewerscannerwhite.ui.permission.PermissionActivity
class GuidePageFragment(
val page: Int = 1
......@@ -17,7 +20,7 @@ class GuidePageFragment(
override fun onResume() {
super.onResume()
if (binding.flAd.isEmpty()){
if (binding.flAd.isEmpty()) {
AdmobNativeUtils.showNativeAd(requireActivity(), binding.flAd, R.layout.layout_admob_document_in)
}
}
......@@ -65,7 +68,9 @@ class GuidePageFragment(
}
3 -> {
activity.finishToMain()
AdmobInterstitialUtils.showInterstitialAd(activity) {
startActivity(Intent(activity, PermissionActivity::class.java))
}
}
}
}
......
app/src/main/java/com/base/pdfviewerscannerwhite/ui/main/DocumentAdapter.kt
View file @ c281ff79
......@@ -170,7 +170,7 @@ class DocumentAdapter(val activity: Activity) : BaseQuickAdapter<DocumentBean, D
* 引导
*/
private fun guideDemo(view: View, item: DocumentBean) {
var called = false
LogEx.logDebug(TAG, "guideDemo")
val isGuideDemo = AppPreferences.getInstance().getBoolean("isGuideDemo", false)
......@@ -183,15 +183,21 @@ class DocumentAdapter(val activity: Activity) : BaseQuickAdapter<DocumentBean, D
.setAlpha(150)
.setHighTargetCorner(20)
.setHighTargetPadding(10)
.setOverlayTarget(false)
.setOutsideTouchable(false)
.setAutoDismiss(true)
// .setOverlayTarget(true)
// .setOutsideTouchable(true)
// .setAutoDismiss(true)
builder.setOnVisibilityChangedListener(object : GuideBuilder.OnVisibilityChangedListener {
override fun onShown() {
AppPreferences.getInstance().put("isGuideDemo", true)
}
override fun onDismiss() {
LogEx.logDebug(TAG, "onDismiss")
// if (!called) {
// called = true
// itemClick?.invoke(item)
// }
itemClick?.invoke(item)
}
})
......@@ -202,8 +208,11 @@ class DocumentAdapter(val activity: Activity) : BaseQuickAdapter<DocumentBean, D
guide.setShouldCheckLocInWindow(false)
guide.show(activity)
component.click = OnClickListener {
// guide.dismiss()
// itemClick?.invoke(item)
// guide.dismiss()
// if (!called) {
// called = true
// itemClick?.invoke(item)
// }
}
}
......
app/src/main/java/com/base/pdfviewerscannerwhite/ui/main/MainActivity.kt
View file @ c281ff79
......@@ -276,9 +276,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView {
.setAlpha(150)
.setHighTargetCorner(20)
.setHighTargetPadding(10)
.setOverlayTarget(false)
.setOutsideTouchable(false)
.setAutoDismiss(true)
// .setOverlayTarget(false)
// .setOutsideTouchable(false)
// .setAutoDismiss(true)
builder.setOnVisibilityChangedListener(object : GuideBuilder.OnVisibilityChangedListener {
override fun onShown() {
AppPreferences.getInstance().put("isGuideScan", true)
......@@ -320,7 +320,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), MainView {
//权限 引导都完了 弹折叠
AdmobBannerUtils.showCollapsibleBannerAd(
this,
isGuideScan && flag,
isGuideDemo && isGuideScan && flag,
binding.flBanner
) {
}
......
app/src/main/java/com/base/pdfviewerscannerwhite/ui/permission/PermissionActivity.kt
View file @ c281ff79
......@@ -15,8 +15,6 @@ import androidx.core.view.updatePadding
import com.base.pdfviewerscannerwhite.R
import com.base.pdfviewerscannerwhite.databinding.ActivityPermissionBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.ui.guide.GuideActivity
import com.base.pdfviewerscannerwhite.utils.AppPreferences
import com.base.pdfviewerscannerwhite.utils.BarUtils
import com.base.pdfviewerscannerwhite.utils.PermissionUtils.requestStoragePermission
import kotlinx.coroutines.MainScope
......@@ -55,13 +53,16 @@ class PermissionActivity : BaseActivity<ActivityPermissionBinding>() {
override fun initListener() {
super.initListener()
onBackPressedDispatcher.addCallback {
val isGuide = AppPreferences.getInstance().getBoolean("isGuide", false)
if (!isGuide) {
AppPreferences.getInstance().put("isGuide", true)
startActivity(Intent(this@PermissionActivity, GuideActivity::class.java))
} else {
finishToMain()
}
finishToMain()
// val isGuide = AppPreferences.getInstance().getBoolean("isGuide", false)
// if (!isGuide) {
// AppPreferences.getInstance().put("isGuide", true)
// startActivity(Intent(this@PermissionActivity, GuideActivity::class.java))
// } else {
// finishToMain()
// }
}
binding.tvLater.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
......
app/src/main/java/com/base/pdfviewerscannerwhite/ui/set/SetLanguageActivity.kt
View file @ c281ff79
......@@ -11,6 +11,7 @@ import com.base.pdfviewerscannerwhite.bean.ConstObject.haveSelectLanguage
import com.base.pdfviewerscannerwhite.bean.LanguageBean
import com.base.pdfviewerscannerwhite.databinding.ActivitySetLanguageBinding
import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.ui.guide.GuideActivity
import com.base.pdfviewerscannerwhite.ui.permission.PermissionActivity
import com.base.pdfviewerscannerwhite.utils.LanguageUtils.getSystemLanguageDefault
import java.util.Locale
......@@ -39,7 +40,7 @@ class SetLanguageActivity : BaseActivity<ActivitySetLanguageBinding>() {
if (from == "Set") {
finish()
} else {
startActivity(Intent(this@SetLanguageActivity, PermissionActivity::class.java))
startActivity(Intent(this@SetLanguageActivity, GuideActivity::class.java))
finish()
}
}
......
app/src/main/java/com/base/pdfviewerscannerwhite/ui/splash/SplashActivity.kt
View file @ c281ff79
......@@ -20,6 +20,7 @@ import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.helper.EventUtils
import com.base.pdfviewerscannerwhite.helper.MyApplication
import com.base.pdfviewerscannerwhite.helper.WeatherUtils
import com.base.pdfviewerscannerwhite.ui.guide.GuideActivity
import com.base.pdfviewerscannerwhite.ui.main.MainActivity
import com.base.pdfviewerscannerwhite.ui.permission.PermissionActivity
import com.base.pdfviewerscannerwhite.ui.set.SetLanguageActivity
......@@ -238,7 +239,7 @@ class SplashActivity : BaseActivity<ActivitySplash2Binding>(), SplashView {
if (Locale.getDefault().language != Locale.ENGLISH.language) {
startActivity(Intent(this, SetLanguageActivity::class.java))
} else {
startActivity(Intent(this, PermissionActivity::class.java))
startActivity(Intent(this, GuideActivity::class.java))
}
finish()
}
......
app/src/main/java/com/base/pdfviewerscannerwhite/ui/view/guideview/Guide.java
View file @ c281ff79
......@@ -27,7 +27,7 @@ public class Guide implements View.OnKeyListener, View.OnTouchListener {
*/
private static final int SLIDE_THRESHOLD = 30;
private Configuration mConfiguration;
private MaskView mMaskView;
public MaskView mMaskView;
private Component[] mComponents;
// 根据locInwindow定位后，是否需要判断loc值非0
private boolean mShouldCheckLocInWindow = true;
......
app/src/main/java/com/base/pdfviewerscannerwhite/ui/view/guideview/LottieComponent.java
View file @ c281ff79
......@@ -19,7 +19,7 @@ public class LottieComponent implements Component {
public View getView(LayoutInflater inflater) {
LinearLayout ll = (LinearLayout) inflater.inflate(R.layout.layout_lottie_guide, null);
ll.setOnClickListener(click);
// ll.setOnClickListener(click);
return ll;
}
......
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