Compare commits
No commits in common. "08a09d8cf3cfaf8cff089dde50b9d1e48374168f" and "e36722ced8c2a57293029c529f55887073ee732e" have entirely different histories.
08a09d8cf3
...
e36722ced8
|
|
@ -9,8 +9,7 @@ import androidx.activity.viewModels
|
||||||
import androidx.core.view.ViewCompat
|
import androidx.core.view.ViewCompat
|
||||||
import androidx.core.view.WindowInsetsCompat
|
import androidx.core.view.WindowInsetsCompat
|
||||||
import androidx.core.view.updatePadding
|
import androidx.core.view.updatePadding
|
||||||
import androidx.lifecycle.lifecycleScope
|
import com.ama.core.architecture.appBase.AppViewsActivity
|
||||||
import com.ama.core.architecture.appBase.AppViewsEmptyViewModelActivity
|
|
||||||
import com.ama.core.architecture.util.AndroidUtil
|
import com.ama.core.architecture.util.AndroidUtil
|
||||||
import com.ama.core.architecture.util.eventbus.NotifyMan
|
import com.ama.core.architecture.util.eventbus.NotifyMan
|
||||||
import com.gamedog.vididin.VidiConst
|
import com.gamedog.vididin.VidiConst
|
||||||
|
|
@ -18,18 +17,17 @@ import com.gamedog.vididin.VididinEvents
|
||||||
import com.gamedog.vididin.beans.WatchAdNotifyBean
|
import com.gamedog.vididin.beans.WatchAdNotifyBean
|
||||||
import com.gamedog.vididin.main.interfaces.OnTabStyleListener
|
import com.gamedog.vididin.main.interfaces.OnTabStyleListener
|
||||||
import com.gamedog.vididin.manager.WithdrawItemBean
|
import com.gamedog.vididin.manager.WithdrawItemBean
|
||||||
import com.remax.bill.ads.AdResult
|
|
||||||
import com.remax.bill.ads.ext.AdShowExt
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import kotlin.getValue
|
import kotlin.getValue
|
||||||
import com.vididin.real.money.game.databinding.ActivityWatchAdBinding as ViewBinding
|
import com.vididin.real.money.game.databinding.ActivityWatchAdBinding as ViewBinding
|
||||||
|
import com.gamedog.vididin.main.MainUiState as UiState
|
||||||
|
import com.gamedog.vididin.main.MainViewModel as ViewModel
|
||||||
|
|
||||||
|
|
||||||
@AndroidEntryPoint
|
@AndroidEntryPoint
|
||||||
class WatchAdActivity : AppViewsEmptyViewModelActivity<ViewBinding>(), OnTabStyleListener {
|
class WatchAdActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnTabStyleListener {
|
||||||
|
|
||||||
|
override val mViewModel: ViewModel by viewModels()
|
||||||
override fun inflateViewBinding(inflater: LayoutInflater) = ViewBinding.inflate(inflater)
|
override fun inflateViewBinding(inflater: LayoutInflater) = ViewBinding.inflate(inflater)
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -152,32 +150,12 @@ class WatchAdActivity : AppViewsEmptyViewModelActivity<ViewBinding>(), OnTabStyl
|
||||||
//TODO("Not yet implemented")
|
//TODO("Not yet implemented")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun ViewBinding.onUiStateCollect(uiState: UiState) {
|
||||||
override fun onTabIsDarkFont(isDarkFont: Boolean) {
|
|
||||||
//TODO("Not yet implemented")
|
//TODO("Not yet implemented")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onTabIsDarkFont(isDarkFont: Boolean) {
|
||||||
private fun showVideoAd(callback: () -> Unit) {
|
//TODO("Not yet implemented")
|
||||||
lifecycleScope.launch {
|
|
||||||
try {
|
|
||||||
when (val result = AdShowExt.showInterstitialAd(this@WatchAdActivity)) {
|
|
||||||
is AdResult.Success -> {
|
|
||||||
callback.invoke()
|
|
||||||
}
|
|
||||||
|
|
||||||
is AdResult.Failure -> {
|
|
||||||
callback.invoke()
|
|
||||||
}
|
|
||||||
|
|
||||||
AdResult.Loading -> {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (e: Exception) {
|
|
||||||
callback.invoke()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@ import androidx.viewpager2.widget.ViewPager2
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import androidx.activity.addCallback
|
import androidx.activity.addCallback
|
||||||
import androidx.activity.viewModels
|
import androidx.activity.viewModels
|
||||||
import androidx.lifecycle.lifecycleScope
|
|
||||||
import com.ama.core.architecture.appBase.AppViewsActivity
|
import com.ama.core.architecture.appBase.AppViewsActivity
|
||||||
import com.ama.core.architecture.appBase.OnFragmentBackgroundListener
|
import com.ama.core.architecture.appBase.OnFragmentBackgroundListener
|
||||||
import com.ama.core.architecture.ext.toast
|
import com.ama.core.architecture.ext.toast
|
||||||
|
|
@ -28,13 +27,11 @@ import com.gamedog.vididin.VidiConst
|
||||||
import com.gamedog.vididin.VididinEvents
|
import com.gamedog.vididin.VididinEvents
|
||||||
import com.gamedog.vididin.adapter.MainTabsAdapter
|
import com.gamedog.vididin.adapter.MainTabsAdapter
|
||||||
import com.gamedog.vididin.adapter.MainViewPagerAdapter
|
import com.gamedog.vididin.adapter.MainViewPagerAdapter
|
||||||
|
import com.gamedog.vididin.features.winrecords.WinRecordsActivity
|
||||||
import com.gamedog.vididin.main.fragments.task.DailySignSuccessDialog
|
import com.gamedog.vididin.main.fragments.task.DailySignSuccessDialog
|
||||||
import com.gamedog.vididin.main.interfaces.OnTabStyleListener
|
import com.gamedog.vididin.main.interfaces.OnTabStyleListener
|
||||||
import com.gamedog.vididin.manager.DateChangeReceiver
|
import com.gamedog.vididin.manager.DateChangeReceiver
|
||||||
import com.remax.bill.ads.AdResult
|
|
||||||
import com.remax.bill.ads.ext.AdShowExt
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
import kotlinx.coroutines.launch
|
|
||||||
import kotlin.getValue
|
import kotlin.getValue
|
||||||
import com.vididin.real.money.game.databinding.ActivityMainBinding as ViewBinding
|
import com.vididin.real.money.game.databinding.ActivityMainBinding as ViewBinding
|
||||||
import com.gamedog.vididin.main.MainUiState as UiState
|
import com.gamedog.vididin.main.MainUiState as UiState
|
||||||
|
|
@ -56,11 +53,22 @@ class MainActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnTabS
|
||||||
override fun inflateViewBinding(inflater: LayoutInflater) = ViewBinding.inflate(inflater)
|
override fun inflateViewBinding(inflater: LayoutInflater) = ViewBinding.inflate(inflater)
|
||||||
|
|
||||||
override fun ViewBinding.initWindowInsets() {
|
override fun ViewBinding.initWindowInsets() {
|
||||||
setImmerseRootView(adContainer)
|
ViewCompat.setOnApplyWindowInsetsListener(magicIndicator) { v, insets ->
|
||||||
|
val systemBars =
|
||||||
|
insets.getInsets(WindowInsetsCompat.Type.navigationBars() or WindowInsetsCompat.Type.displayCutout())
|
||||||
|
v.setPadding(
|
||||||
|
systemBars.left,
|
||||||
|
36,
|
||||||
|
systemBars.right,
|
||||||
|
systemBars.bottom + 36
|
||||||
|
)
|
||||||
|
insets
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
override fun ViewBinding.initViews() {
|
override fun ViewBinding.initViews() {
|
||||||
|
content.foreground.alpha = 0
|
||||||
navigatorAdapter = MainTabsAdapter(
|
navigatorAdapter = MainTabsAdapter(
|
||||||
this@MainActivity, viewPager2, fragmentStateAdapter, magicIndicator
|
this@MainActivity, viewPager2, fragmentStateAdapter, magicIndicator
|
||||||
)
|
)
|
||||||
|
|
@ -124,7 +132,7 @@ class MainActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnTabS
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun ViewBinding.initObservers() {
|
override fun ViewBinding.initObservers() {
|
||||||
loadBannerAd()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -151,26 +159,6 @@ class MainActivity : AppViewsActivity<ViewBinding, UiState, ViewModel>(), OnTabS
|
||||||
binding.viewPager2.setCurrentItem(itemIndex, false)
|
binding.viewPager2.setCurrentItem(itemIndex, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun loadBannerAd() {
|
|
||||||
lifecycleScope.launch {
|
|
||||||
try {
|
|
||||||
when (AdShowExt.showBannerAd(this@MainActivity, binding.adContainer)) {
|
|
||||||
is AdResult.Success<*> -> {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
is AdResult.Failure -> {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
AdResult.Loading -> {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e: Exception) {
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
internal fun startActivity(activity: Activity) {
|
internal fun startActivity(activity: Activity) {
|
||||||
|
|
|
||||||
|
|
@ -81,8 +81,10 @@ class HomeFragment : AppViewsFragment<ViewBinding, UiState, ViewModel>(), OnSwit
|
||||||
mWatchedVideoTotal ++
|
mWatchedVideoTotal ++
|
||||||
|
|
||||||
if (mWatchedVideoTotal % VIDEO_NUM_GAP_FOR_AD == 0) {
|
if (mWatchedVideoTotal % VIDEO_NUM_GAP_FOR_AD == 0) {
|
||||||
showInterstitialAd {
|
lifecycleScope.launch {
|
||||||
// TODO - need do anything for ad show
|
showInterstitialAd {
|
||||||
|
// TODO - need do anything for ad show
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -139,6 +141,20 @@ class HomeFragment : AppViewsFragment<ViewBinding, UiState, ViewModel>(), OnSwit
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun ViewBinding.onUiStateCollect(uiState: UiState) {
|
override fun ViewBinding.onUiStateCollect(uiState: UiState) {
|
||||||
|
/*val videoList = mutableListOf<YoutubeVideo>()
|
||||||
|
if (uiState.playLists == null) {
|
||||||
|
videoList.add(YoutubeVideo("TegalxCm1LA", "111", "bbbbb"))
|
||||||
|
videoList.add(YoutubeVideo("KA54UCs3E_4", "222", "bbbbb"))
|
||||||
|
videoList.add(YoutubeVideo("_bAxHM7O_9k", "333", "bbbbb"))
|
||||||
|
videoList.add(YoutubeVideo("6vAYPVTGs90", "444", "bbbbb"))
|
||||||
|
videoList.add(YoutubeVideo("bLAfi6cWcoI", "555", "bbbbb"))
|
||||||
|
videoList.add(YoutubeVideo("WX1MvqCzQ2k", "666", "bbbbb"))
|
||||||
|
videoList.add(YoutubeVideo("nkRPma2F4s4", "777", "bbbbb"))
|
||||||
|
videoList.add(YoutubeVideo("ssosMzYpQgc", "888", "bbbbb"))
|
||||||
|
videoList.add(YoutubeVideo("1sXHOCQcbwc", "999", "bbbbb"))
|
||||||
|
mViewPagerAdapter.submitList(videoList)
|
||||||
|
return
|
||||||
|
}*/
|
||||||
mViewPagerAdapter.submitList(uiState.playLists)
|
mViewPagerAdapter.submitList(uiState.playLists)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,17 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:id="@+id/drawerLayout"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
android:id="@+id/content"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:foreground="@color/main_content_foreground">
|
||||||
|
|
||||||
<androidx.viewpager2.widget.ViewPager2
|
<androidx.viewpager2.widget.ViewPager2
|
||||||
android:id="@+id/viewPager2"
|
android:id="@+id/viewPager2"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|
@ -24,13 +31,8 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingTop="30dp"
|
android:paddingTop="30dp"
|
||||||
app:layout_constraintBottom_toTopOf="@+id/ad_container" />
|
|
||||||
|
|
||||||
<net.lucode.hackware.magicindicator.MagicIndicator
|
|
||||||
android:id="@+id/ad_container"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent" />
|
app:layout_constraintBottom_toBottomOf="parent" />
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
</FrameLayout>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue