diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e363798..3a0298b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,6 +28,8 @@ + + diff --git a/app/src/main/java/com/gamedog/vididin/di/ComponentModule.kt b/app/src/main/java/com/gamedog/vididin/di/ComponentModule.kt index 1c96418..953ee24 100644 --- a/app/src/main/java/com/gamedog/vididin/di/ComponentModule.kt +++ b/app/src/main/java/com/gamedog/vididin/di/ComponentModule.kt @@ -2,6 +2,10 @@ package com.gamedog.vididin.di import com.gamedog.vididin.features.benefit.BenefitRouter import com.gamedog.vididin.features.benefit.DefaultBenefitRouter +import com.gamedog.vididin.features.winrecords.DefaultWinRecordRouter +import com.gamedog.vididin.features.winrecords.WinRecordRouter +import com.gamedog.vididin.features.withdraw.DefaultWithdrawRouter +import com.gamedog.vididin.features.withdraw.WithdrawRouter import com.gamedog.vididin.features.zero.DefaultZeroBuyRouter import com.gamedog.vididin.features.zero.ZeroBuyRouter import dagger.Module @@ -26,4 +30,22 @@ object ZeroBuyModule { @Provides @Singleton fun provideRouter(): ZeroBuyRouter = DefaultZeroBuyRouter() +} + +@Module +@InstallIn(SingletonComponent::class) +object WithdrawModule { + + @Provides + @Singleton + fun provideRouter(): WithdrawRouter = DefaultWithdrawRouter() +} + +@Module +@InstallIn(SingletonComponent::class) +object WinRecordModule { + + @Provides + @Singleton + fun provideRouter(): WinRecordRouter = DefaultWinRecordRouter() } \ No newline at end of file diff --git a/app/src/main/java/com/gamedog/vididin/di/RouterEntryPoints.kt b/app/src/main/java/com/gamedog/vididin/di/RouterEntryPoints.kt index 24fcfa8..b447966 100644 --- a/app/src/main/java/com/gamedog/vididin/di/RouterEntryPoints.kt +++ b/app/src/main/java/com/gamedog/vididin/di/RouterEntryPoints.kt @@ -5,6 +5,8 @@ import com.gamedog.vididin.core.router.interfaces.LoginRouter import com.gamedog.vididin.core.router.interfaces.MineRouter import com.gamedog.vididin.core.router.interfaces.TaskRouter import com.gamedog.vididin.features.benefit.BenefitRouter +import com.gamedog.vididin.features.winrecords.WinRecordRouter +import com.gamedog.vididin.features.withdraw.WithdrawRouter import com.gamedog.vididin.features.zero.ZeroBuyRouter import dagger.hilt.EntryPoint import dagger.hilt.InstallIn @@ -22,6 +24,9 @@ interface RouterEntryPoint { fun benefitRouter(): BenefitRouter fun zeroBuyRouter(): ZeroBuyRouter + fun withdrawRouter(): WithdrawRouter + fun winRecordBuyRouter(): WinRecordRouter + } diff --git a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt index be41096..f144ad1 100644 --- a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyActivity.kt @@ -5,7 +5,9 @@ import android.content.Intent import android.view.LayoutInflater import androidx.activity.viewModels import com.ama.core.architecture.appBase.AppViewsActivity +import com.ama.core.architecture.util.setOnClickBatch import com.gamedog.vididin.main.interfaces.OnTabStyleListener +import com.gamedog.vididin.router.Router import dagger.hilt.android.AndroidEntryPoint import kotlin.getValue import com.gamedog.vididin.databinding.ActivityZerobuyBinding as ViewBinding @@ -20,23 +22,39 @@ class ZeroBuyActivity : AppViewsActivity(), OnT override fun inflateViewBinding(inflater: LayoutInflater) = ViewBinding.inflate(inflater) override fun ViewBinding.initViews() { - TODO("Not yet implemented") + binding.run { + setOnClickBatch(tvZeroGoldNum, tvZeroLotteryList) { + when (this) { + tvZeroGoldNum -> { + + } + tvZeroLotteryList -> { + gotoLotteryRecords() + } + } + } + } } override fun ViewBinding.initListeners() { - TODO("Not yet implemented") + //TODO("Not yet implemented") } override fun ViewBinding.initObservers() { - TODO("Not yet implemented") + //TODO("Not yet implemented") } override fun ViewBinding.onUiStateCollect(uiState: UiState) { - TODO("Not yet implemented") + //TODO("Not yet implemented") } override fun onTabIsDarkFont(isDarkFont: Boolean) { - TODO("Not yet implemented") + //TODO("Not yet implemented") + } + + + private fun gotoLotteryRecords() { + Router.WinRecord.startActivity(this) } diff --git a/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt b/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt index 37d1d1d..bbf01c7 100644 --- a/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt @@ -1,9 +1,11 @@ package com.gamedog.vididin.main +import android.app.Activity import android.content.Context import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog import com.gamedog.vididin.databinding.DialogBeginnerGiftBinding +import com.gamedog.vididin.router.Router class BeginnerGiftDialog(context: Context) : BindingDialog(context, DialogBeginnerGiftBinding::inflate) { @@ -32,7 +34,7 @@ class BeginnerGiftDialog(context: Context) : BindingDialog(), OnTab } llTaskZerobuy->{ - Router.Benefit.startActivity(requireActivity()) + Router.ZeroBuy.startActivity(requireActivity()) } } } @@ -149,7 +149,7 @@ class TasksFragment : AppViewsFragment(), OnTab } private fun gotoWithDraw() { - //TODO("Not yet implemented") + Router.Withdraw.startActivity(requireActivity()) } private fun gotoDiscord() { diff --git a/app/src/main/java/com/gamedog/vididin/router/Router.kt b/app/src/main/java/com/gamedog/vididin/router/Router.kt index 1606c6a..0ebbf62 100644 --- a/app/src/main/java/com/gamedog/vididin/router/Router.kt +++ b/app/src/main/java/com/gamedog/vididin/router/Router.kt @@ -7,6 +7,8 @@ import com.gamedog.vididin.core.router.interfaces.MineRouter import com.gamedog.vididin.core.router.interfaces.TaskRouter import com.gamedog.vididin.di.RouterEntryPoint import com.gamedog.vididin.features.benefit.BenefitRouter +import com.gamedog.vididin.features.winrecords.WinRecordRouter +import com.gamedog.vididin.features.withdraw.WithdrawRouter import com.gamedog.vididin.features.zero.ZeroBuyRouter import dagger.hilt.android.EntryPointAccessors import kotlin.getValue @@ -29,5 +31,7 @@ object Router : RouterContract { override val Benefit: BenefitRouter by lazy { routerEntryPoint.benefitRouter() } override val ZeroBuy: ZeroBuyRouter by lazy { routerEntryPoint.zeroBuyRouter() } + override val Withdraw: WithdrawRouter by lazy { routerEntryPoint.withdrawRouter() } + override val WinRecord: WinRecordRouter by lazy { routerEntryPoint.winRecordBuyRouter() } } diff --git a/app/src/main/java/com/gamedog/vididin/router/RouterContract.kt b/app/src/main/java/com/gamedog/vididin/router/RouterContract.kt index 56b1376..701905d 100644 --- a/app/src/main/java/com/gamedog/vididin/router/RouterContract.kt +++ b/app/src/main/java/com/gamedog/vididin/router/RouterContract.kt @@ -5,6 +5,8 @@ import com.gamedog.vididin.core.router.interfaces.LoginRouter import com.gamedog.vididin.core.router.interfaces.TaskRouter import com.gamedog.vididin.core.router.interfaces.MineRouter import com.gamedog.vididin.features.benefit.BenefitRouter +import com.gamedog.vididin.features.winrecords.WinRecordRouter +import com.gamedog.vididin.features.withdraw.WithdrawRouter import com.gamedog.vididin.features.zero.ZeroBuyRouter @@ -17,4 +19,7 @@ interface RouterContract { val Benefit: BenefitRouter val ZeroBuy: ZeroBuyRouter + val Withdraw: WithdrawRouter + val WinRecord: WinRecordRouter + } \ No newline at end of file diff --git a/app/src/main/java/com/gamedog/vididin/router/RouterInterface.kt b/app/src/main/java/com/gamedog/vididin/router/RouterInterface.kt new file mode 100644 index 0000000..51a8686 --- /dev/null +++ b/app/src/main/java/com/gamedog/vididin/router/RouterInterface.kt @@ -0,0 +1,4 @@ +package com.gamedog.vididin.router + +class RouterInterface { +} \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_zero_gold_num.xml b/app/src/main/res/drawable/bg_zero_gold_num.xml new file mode 100644 index 0000000..73f71c6 --- /dev/null +++ b/app/src/main/res/drawable/bg_zero_gold_num.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/zero_bg_4_items.xml b/app/src/main/res/drawable/zero_bg_4_items.xml new file mode 100644 index 0000000..55d22b3 --- /dev/null +++ b/app/src/main/res/drawable/zero_bg_4_items.xml @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/activity_zerobuy.xml b/app/src/main/res/layout/activity_zerobuy.xml index d84522d..86b32f7 100644 --- a/app/src/main/res/layout/activity_zerobuy.xml +++ b/app/src/main/res/layout/activity_zerobuy.xml @@ -1,47 +1,134 @@ - - - - + - + android:src="@mipmap/zero_bg_root" + android:scaleType="centerCrop" + /> - + - + android:layout_marginTop="200dp"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -50,6 +137,10 @@ - + + + + + diff --git a/app/src/main/res/mipmap-xxhdpi/zero_bg_but.webp b/app/src/main/res/mipmap-xxhdpi/zero_bg_but.webp new file mode 100644 index 0000000..4bbd681 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/zero_bg_but.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/zero_bg_item.webp b/app/src/main/res/mipmap-xxhdpi/zero_bg_item.webp new file mode 100644 index 0000000..909a35d Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/zero_bg_item.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/zero_bg_item_sub1.webp b/app/src/main/res/mipmap-xxhdpi/zero_bg_item_sub1.webp new file mode 100644 index 0000000..04d4e93 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/zero_bg_item_sub1.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/zero_bg_item_sub2.webp b/app/src/main/res/mipmap-xxhdpi/zero_bg_item_sub2.webp new file mode 100644 index 0000000..eabefe4 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/zero_bg_item_sub2.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/zero_bg_item_sub3.webp b/app/src/main/res/mipmap-xxhdpi/zero_bg_item_sub3.webp new file mode 100644 index 0000000..78ce2df Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/zero_bg_item_sub3.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/zero_bg_item_sub4.webp b/app/src/main/res/mipmap-xxhdpi/zero_bg_item_sub4.webp new file mode 100644 index 0000000..e234e37 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/zero_bg_item_sub4.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/zero_bg_menu.webp b/app/src/main/res/mipmap-xxhdpi/zero_bg_menu.webp new file mode 100644 index 0000000..54a5fb1 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/zero_bg_menu.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/zero_bg_root.webp b/app/src/main/res/mipmap-xxhdpi/zero_bg_root.webp new file mode 100644 index 0000000..19a95d0 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/zero_bg_root.webp differ