diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt index 8defcee..2f4d69e 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt @@ -88,7 +88,7 @@ class WithDrawActivity : AppViewsActivity(), On if (!hasBindBank) { WithdrawBindBankDialog(this@WithDrawActivity).setWithDrawCashNum(cashNum).show() } else { - WithdrawInfoConfirmDialog(context).setWithDrawCashNum(cashNum).show() + WithdrawInfoConfirmDialog(this@WithDrawActivity).setWithDrawCashNum(cashNum).show() } } diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawBindBankDialog.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawBindBankDialog.kt index a5e5a2a..fd82058 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawBindBankDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawBindBankDialog.kt @@ -2,11 +2,11 @@ package com.gamedog.vididin.features.withdraw +import android.app.Activity import android.content.Context import android.text.Editable import android.text.TextWatcher import androidx.core.view.isVisible -import com.ama.core.architecture.util.ResUtil import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog import com.gamedog.vididin.R @@ -14,7 +14,7 @@ import com.gamedog.vididin.core.login.login.AccountManager import com.gamedog.vididin.databinding.DialogWithdrawBindingBankBinding as ViewBinding -class WithdrawBindBankDialog(context: Context) : BindingDialog(context, ViewBinding::inflate) { +class WithdrawBindBankDialog(activity: Activity) : BindingDialog(activity, ViewBinding::inflate) { private var mWithdrawCashNum: Float = 0F @@ -38,7 +38,7 @@ class WithdrawBindBankDialog(context: Context) : BindingDialog(cont tvConfirm -> { saveBankAccount(mBinding.tvCpfEdit.text.toString().trim()) - WithdrawInfoConfirmDialog(context).setWithDrawCashNum(mWithdrawCashNum).show() + WithdrawInfoConfirmDialog(mActivity).setWithDrawCashNum(mWithdrawCashNum).show() dismiss() } } diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawFailDialog.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawFailDialog.kt index 84efccd..371fd5e 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawFailDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawFailDialog.kt @@ -1,14 +1,14 @@ package com.gamedog.vididin.features.withdraw -import android.content.Context +import android.app.Activity import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog import com.gamedog.vididin.databinding.DialogWithdrawFailBinding as ViewBinding import com.gamedog.vididin.router.Router -class WithdrawFailDialog(context: Context) : BindingDialog(context, ViewBinding::inflate) { +class WithdrawFailDialog(context: Activity) : BindingDialog(context, ViewBinding::inflate) { init { build() @@ -42,7 +42,7 @@ class WithdrawFailDialog(context: Context) : BindingDialog(context, private fun gotoFeedback() { - ownerActivity?.let { Router.Feedback.startActivity(it) } + Router.Feedback.startActivity(mActivity) } diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawInfoConfirmDialog.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawInfoConfirmDialog.kt index 778fdf9..c726b71 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawInfoConfirmDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawInfoConfirmDialog.kt @@ -1,6 +1,7 @@ package com.gamedog.vididin.features.withdraw +import android.app.Activity import android.content.Context import com.ama.core.architecture.util.ResUtil import com.ama.core.architecture.util.setOnClickBatch @@ -11,7 +12,7 @@ import com.gamedog.vididin.databinding.DialogWithdrawInfoConfirmBinding as ViewB import com.gamedog.vididin.router.Router -class WithdrawInfoConfirmDialog(context: Context) : BindingDialog(context, ViewBinding::inflate) { +class WithdrawInfoConfirmDialog(context: Activity) : BindingDialog(context, ViewBinding::inflate) { private var mWithdrawCashNum: Float = 0F @@ -38,7 +39,7 @@ class WithdrawInfoConfirmDialog(context: Context) : BindingDialog(c } tvActionApply -> { - WithdrawWatchAdDialog(context).show() + WithdrawWatchAdDialog(mActivity).show() dismiss() } } diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawSuccessDialog.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawSuccessDialog.kt index 279e5ce..ab169f8 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawSuccessDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawSuccessDialog.kt @@ -1,13 +1,14 @@ package com.gamedog.vididin.features.withdraw +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.DialogWithdrawSuccessBinding as ViewBinding -class WithdrawSuccessDialog(context: Context) : BindingDialog(context, ViewBinding::inflate) { +class WithdrawSuccessDialog(context: Activity) : BindingDialog(context, ViewBinding::inflate) { init { build() diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawWatchAdDialog.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawWatchAdDialog.kt index 603e2a9..863dc6f 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawWatchAdDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawWatchAdDialog.kt @@ -1,6 +1,7 @@ package com.gamedog.vididin.features.withdraw +import android.app.Activity import android.content.Context import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog @@ -10,7 +11,7 @@ import com.gamedog.vididin.router.Router import kotlin.random.Random -class WithdrawWatchAdDialog(context: Context) : BindingDialog(context, ViewBinding::inflate) { +class WithdrawWatchAdDialog(context: Activity) : BindingDialog(context, ViewBinding::inflate) { private var mWithdrawCashNum: Float = 0F @@ -48,8 +49,8 @@ class WithdrawWatchAdDialog(context: Context) : BindingDialog(conte // TODO - //ownerActivity?.let { Router.Withdraw.startActivity(it) } - WithdrawFailDialog(context).show() - WithdrawSuccessDialog(context).show() + WithdrawFailDialog(mActivity).show() + WithdrawSuccessDialog(mActivity).show() } diff --git a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyFailDialog.kt b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyFailDialog.kt index 03d3577..0bce0b6 100644 --- a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyFailDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyFailDialog.kt @@ -1,6 +1,7 @@ package com.gamedog.vididin.features.zero +import android.app.Activity import android.content.Context import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog @@ -8,7 +9,7 @@ import com.gamedog.vididin.databinding.DialogZeroBuyFailBinding as ViewBinding import com.gamedog.vididin.router.Router -class ZeroBuyFailDialog(context: Context) : BindingDialog(context, ViewBinding::inflate) { +class ZeroBuyFailDialog(context: Activity) : BindingDialog(context, ViewBinding::inflate) { init { build() diff --git a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyNotWinDialog.kt b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyNotWinDialog.kt index 62294da..9a177ea 100644 --- a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyNotWinDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyNotWinDialog.kt @@ -1,6 +1,7 @@ package com.gamedog.vididin.features.zero +import android.app.Activity import android.content.Context import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog @@ -8,7 +9,7 @@ import com.gamedog.vididin.databinding.DialogZeroBuyNotWinBinding as ViewBinding import com.gamedog.vididin.router.Router -class ZeroBuyNotWinDialog(context: Context) : BindingDialog(context, ViewBinding::inflate) { +class ZeroBuyNotWinDialog(context: Activity) : BindingDialog(context, ViewBinding::inflate) { init { build() diff --git a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyRulesDialog.kt b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyRulesDialog.kt index fb21b27..9402a2b 100644 --- a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyRulesDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyRulesDialog.kt @@ -1,6 +1,7 @@ package com.gamedog.vididin.features.zero +import android.app.Activity import android.content.Context import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog @@ -8,7 +9,7 @@ import com.gamedog.vididin.databinding.DialogZeroBuyRuleBinding as ViewBinding import com.gamedog.vididin.router.Router -class ZeroBuyRulesDialog(context: Context) : BindingDialog(context, ViewBinding::inflate) { +class ZeroBuyRulesDialog(context: Activity) : BindingDialog(context, ViewBinding::inflate) { init { build() diff --git a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyWinDialog.kt b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyWinDialog.kt index 295b106..fe5fa52 100644 --- a/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyWinDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/zero/ZeroBuyWinDialog.kt @@ -1,6 +1,7 @@ package com.gamedog.vididin.features.zero +import android.app.Activity import android.content.Context import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog @@ -8,7 +9,7 @@ import com.gamedog.vididin.databinding.DialogZeroBuyWinBinding as ViewBinding import com.gamedog.vididin.router.Router -class ZeroBuyWinDialog(context: Context) : BindingDialog(context, ViewBinding::inflate) { +class ZeroBuyWinDialog(context: Activity) : BindingDialog(context, ViewBinding::inflate) { init { build() 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 5cb50a3..abd9ba7 100644 --- a/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/main/BeginnerGiftDialog.kt @@ -8,7 +8,7 @@ import com.gamedog.vididin.databinding.DialogBeginnerGiftBinding import com.gamedog.vididin.router.Router -class BeginnerGiftDialog(context: Context) : BindingDialog(context, DialogBeginnerGiftBinding::inflate) { +class BeginnerGiftDialog(activity: Activity) : BindingDialog(activity, DialogBeginnerGiftBinding::inflate) { init { build() diff --git a/app/src/main/java/com/gamedog/vididin/main/WatchVideoDialog.kt b/app/src/main/java/com/gamedog/vididin/main/WatchVideoDialog.kt index 559516f..c9c77e8 100644 --- a/app/src/main/java/com/gamedog/vididin/main/WatchVideoDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/main/WatchVideoDialog.kt @@ -1,5 +1,6 @@ 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 @@ -7,7 +8,7 @@ import com.gamedog.vididin.databinding.DialogWatchVideoBinding import com.gamedog.vididin.main.fragments.task.RewardDetail -class WatchVideoDialog(context: Context) : BindingDialog(context, DialogWatchVideoBinding::inflate) { +class WatchVideoDialog(context: Activity) : BindingDialog(context, DialogWatchVideoBinding::inflate) { private lateinit var mDataList: List init { diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt index bf94770..8e7d948 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/TasksFragment.kt @@ -59,7 +59,7 @@ class TasksFragment : AppViewsFragment(), OnTab setOnClickBatch(ivGotoDailySign, llTaskBenefit, llTaskWatchVideo, llTaskGame, llTaskZerobuy, tvWatchVideo, tvWithdraw) { when(this) { ivGotoDailySign->{ - DailySignDialog(context).show() + DailySignDialog(requireActivity()).show() } llTaskBenefit->{ @@ -67,7 +67,7 @@ class TasksFragment : AppViewsFragment(), OnTab } llTaskWatchVideo->{ - WatchVideoDialog(requireContext()).show() + WatchVideoDialog(requireActivity()).show() } llTaskGame->{ @@ -79,7 +79,7 @@ class TasksFragment : AppViewsFragment(), OnTab } tvWatchVideo->{ - WatchVideoDialog(requireContext()).show() + WatchVideoDialog(requireActivity()).show() } tvWithdraw->{ diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt index 420129d..792bd2e 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/home/fragment/HomeItemFragment.kt @@ -60,7 +60,7 @@ class HomeItemFragment : AppViewsEmptyViewModelFragment() { Router.Benefit.startActivity(requireActivity()) }, PopMenuIconView.MenuItem(R.mipmap.home_menu_2) { - WatchVideoDialog(requireContext()).show() + WatchVideoDialog(requireActivity()).show() }, PopMenuIconView.MenuItem(R.mipmap.home_menu_3) { diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt index 75e3c74..ba10e8b 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignDialog.kt @@ -1,5 +1,6 @@ package com.gamedog.vididin.main.fragments.task +import android.app.Activity import android.content.Context import androidx.core.view.isVisible import com.ama.core.architecture.util.setOnClickBatch @@ -9,7 +10,7 @@ import com.gamedog.vididin.manager.TaskManager import com.gamedog.vididin.widget.DailySignItemView -class DailySignDialog(context: Context) : BindingDialog(context, DialogDailySignBinding::inflate) { +class DailySignDialog(context: Activity) : BindingDialog(context, DialogDailySignBinding::inflate) { private var mCurDayIndex: Int = 0 private var mConfigList: List? = emptyList() private var mSignItemViewList: MutableList = mutableListOf() @@ -57,7 +58,7 @@ class DailySignDialog(context: Context) : BindingDialog( private fun clickedNormalSign() { if (TaskManager.instance().executeDailySign(mCurDayIndex, false, false)) { - DailySignSuccessDialog(context).initData(mConfigList?.get(mCurDayIndex)?.value, true).show() + DailySignSuccessDialog(mActivity).initData(mConfigList?.get(mCurDayIndex)?.value, true).show() updateUI(mCurDayIndex) } } @@ -65,7 +66,7 @@ class DailySignDialog(context: Context) : BindingDialog( private fun clickedAdSingleBut() { startAdTask("signalAd", { if (TaskManager.instance().executeDailySign(mCurDayIndex, false, true)) { - DailySignSuccessDialog(context).initData(mConfigList?.get(mCurDayIndex)?.value, false).show() + DailySignSuccessDialog(mActivity).initData(mConfigList?.get(mCurDayIndex)?.value, false).show() updateUI(mCurDayIndex) } }) @@ -74,7 +75,7 @@ class DailySignDialog(context: Context) : BindingDialog( private fun clickedAdDoubleBut() { startAdTask("doubleAd", { if (TaskManager.instance().executeDailySign(mCurDayIndex, true, true)) { - DailySignSuccessDialog(context).initData((mConfigList?.get(mCurDayIndex)?.value)?.times( + DailySignSuccessDialog(mActivity).initData((mConfigList?.get(mCurDayIndex)?.value)?.times( 2 ), false).show() updateUI(mCurDayIndex) @@ -87,7 +88,7 @@ class DailySignDialog(context: Context) : BindingDialog( if (firstForgotSignDayIndex > 0) { startAdTask("complementAd", { if (TaskManager.instance().executeDailySign(firstForgotSignDayIndex, false, false)){ - DailySignSuccessDialog(context).initData(mConfigList?.get(firstForgotSignDayIndex)?.value, false).show() + DailySignSuccessDialog(mActivity).initData(mConfigList?.get(firstForgotSignDayIndex)?.value, false).show() updateUI(firstForgotSignDayIndex) } }) diff --git a/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignSuccessDialog.kt b/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignSuccessDialog.kt index 68efed3..6289b90 100644 --- a/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignSuccessDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/main/fragments/task/DailySignSuccessDialog.kt @@ -1,5 +1,6 @@ package com.gamedog.vididin.main.fragments.task +import android.app.Activity import android.content.Context import androidx.core.view.isVisible import com.ama.core.architecture.util.setOnClickBatch @@ -7,7 +8,7 @@ import com.ama.core.architecture.widget.BindingDialog import com.gamedog.vididin.databinding.DialogDailySignSuccessBinding as ViewBinding -class DailySignSuccessDialog(context: Context) : BindingDialog(context, ViewBinding::inflate) { +class DailySignSuccessDialog(context: Activity) : BindingDialog(context, ViewBinding::inflate) { init { build() diff --git a/core/architecture/src/main/java/com/ama/core/architecture/util/AndroidUtil.kt b/core/architecture/src/main/java/com/ama/core/architecture/util/AndroidUtil.kt new file mode 100644 index 0000000..fca2108 --- /dev/null +++ b/core/architecture/src/main/java/com/ama/core/architecture/util/AndroidUtil.kt @@ -0,0 +1,19 @@ +package com.ama.core.architecture.util + +import android.app.Activity +import android.content.Intent +import com.ama.core.architecture.BaseApp + +class AndroidUtil private constructor() { + + companion object { + + + + + + + } + + +} \ No newline at end of file diff --git a/core/architecture/src/main/java/com/ama/core/architecture/widget/BindingDialog.kt b/core/architecture/src/main/java/com/ama/core/architecture/widget/BindingDialog.kt index e21833a..60a41c1 100644 --- a/core/architecture/src/main/java/com/ama/core/architecture/widget/BindingDialog.kt +++ b/core/architecture/src/main/java/com/ama/core/architecture/widget/BindingDialog.kt @@ -1,7 +1,7 @@ package com.ama.core.architecture.widget +import android.app.Activity import android.app.Dialog -import android.content.Context import android.content.DialogInterface import android.graphics.Bitmap import android.graphics.Color @@ -31,9 +31,9 @@ import com.ama.core.architecture.util.ScreenUtils import com.ama.core.common.util.dp -open class BindingDialog(private val context: Context, +open class BindingDialog(protected val mActivity: Activity, private val inflate: (LayoutInflater) -> VB, - themeResId: Int = R.style.LDialog) : Dialog(context, themeResId), LifecycleEventObserver { + themeResId: Int = R.style.LDialog) : Dialog(mActivity, themeResId), LifecycleEventObserver { private val views = SparseArray() private var width = 0 private var height = 0 @@ -89,8 +89,8 @@ open class BindingDialog(private val context: Context, } fun init() { - if (context is ComponentActivity) { - context.lifecycle.addObserver(this) + if (mActivity is ComponentActivity) { + mActivity.lifecycle.addObserver(this) } setCanceledOnTouchOutside(true) window?.setBackgroundDrawableResource(R.color.transparent) @@ -193,7 +193,7 @@ open class BindingDialog(private val context: Context, } fun setBgColorRes(colorRes: Int): BindingDialog { - bgColor = ContextCompat.getColor(context, colorRes) + bgColor = ContextCompat.getColor(mActivity, colorRes) return setBg() }