diff --git a/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt b/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt index a7229ff..de4b96c 100644 --- a/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt @@ -11,6 +11,7 @@ import androidx.core.view.updatePadding import androidx.lifecycle.lifecycleScope import com.ama.core.architecture.appBase.AppViewsEmptyViewModelActivity import com.ama.core.architecture.util.AndroidUtil +import com.ama.core.architecture.util.ResUtil import com.ama.core.architecture.util.eventbus.NotifyMan import com.gamedog.vididin.VidiConst import com.gamedog.vididin.VidiStatisticHelper @@ -197,6 +198,8 @@ class WatchAdActivity : AppViewsEmptyViewModelActivity(), OnTabStyl try { + AndroidUtil.adHintToast(ResUtil.getString(R.string.watch_full_reward_ad_hint)) + when(AdShowExt.showRewardedVideoAd(this@WatchAdActivity, VidiStatisticHelper.getShowFromStr(mWatchType), { rewardedData -> mRewardedDollarNum = rewardedData.rewardNum diff --git a/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt b/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt index afcb972..fe497b7 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt @@ -9,6 +9,7 @@ import com.ama.core.architecture.util.MD5Util import com.ama.core.architecture.util.NetUtil import com.ama.core.architecture.util.SpUtil import com.ama.core.architecture.util.eventbus.NotifyMan +import com.gamedog.statisticreporter.StatisticLogger import com.gamedog.statisticreporter.StatisticUtil import com.gamedog.statisticreporter.adjust.AdjustManager import com.gamedog.statisticreporter.adjust.SpHelper.Companion.KEY_USER_FROM_TYPE @@ -165,7 +166,10 @@ class WithdrawManager private constructor() { if (itemIndex >= 0 && itemIndex < mWithdrawItemList.size) { try { val subBean = mWithdrawItemList[itemIndex].subItemList[selectedSubIndex] + StatisticLogger.d("[addAdEarnForSubBean] hasEarnMoneyByAd:${subBean.hasEarnMoneyByAd}") subBean.hasEarnMoneyByAd += earnMoneyNum * 5 // dollar 2 bariz + StatisticLogger.d("[addAdEarnForSubBean] earnMoneyNum:$earnMoneyNum earnMoneyNum * 5:${earnMoneyNum * 5}") + StatisticLogger.d("[addAdEarnForSubBean] hasEarnMoneyByAd:${subBean.hasEarnMoneyByAd}") calculateSubBeanProgress(subBean) //传入 itembean 更新 selectedIndex为下一个 saveInfos2Sp(mWithdrawItemList) notifyProgressUpdated(subBean) diff --git a/app/src/main/res/layout/activity_watch_ad.xml b/app/src/main/res/layout/activity_watch_ad.xml index 3476111..319d2ba 100644 --- a/app/src/main/res/layout/activity_watch_ad.xml +++ b/app/src/main/res/layout/activity_watch_ad.xml @@ -17,6 +17,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="60dp" android:padding="10dp" + android:visibility="gone" android:layout_gravity="center" android:gravity="center" android:background="@mipmap/withdraw_watch_ad_cahs_bg" diff --git a/app/src/main/res/layout/dialog_withdraw_watch_ad.xml b/app/src/main/res/layout/dialog_withdraw_watch_ad.xml index 862ede0..49bf989 100644 --- a/app/src/main/res/layout/dialog_withdraw_watch_ad.xml +++ b/app/src/main/res/layout/dialog_withdraw_watch_ad.xml @@ -13,7 +13,6 @@ android:orientation="vertical" android:layout_gravity="end" android:src="@mipmap/icon_close_with_circle" - android:layout_marginEnd="30dp" android:layout_marginTop="10dp" /> 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 index 5754ba8..bba6738 100644 --- 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 @@ -112,6 +112,17 @@ class AndroidUtil private constructor() { } } + fun adHintToast(text: String){ + val layout: View = LayoutInflater.from(BaseApp.appContext()).inflate(R.layout.toast_ad_hint, null) + layout.findViewById(R.id.tv_watch_full_hint).text = text + Toast(BaseApp.appContext()).apply { + duration = Toast.LENGTH_LONG + setGravity(Gravity.CENTER or Gravity.CENTER_HORIZONTAL, 0, 10) + setView(layout) + show() + } + } + fun hideKeyboard(view: View?) { view?.let { v -> val imm = v.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager diff --git a/core/architecture/src/main/res/layout/toast_ad_hint.xml b/core/architecture/src/main/res/layout/toast_ad_hint.xml new file mode 100644 index 0000000..8e9548b --- /dev/null +++ b/core/architecture/src/main/res/layout/toast_ad_hint.xml @@ -0,0 +1,14 @@ + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-xxhdpi/withdraw_watch_ad_cahs_bg.webp b/core/architecture/src/main/res/mipmap-xxhdpi/withdraw_watch_ad_cahs_bg.webp similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/withdraw_watch_ad_cahs_bg.webp rename to core/architecture/src/main/res/mipmap-xxhdpi/withdraw_watch_ad_cahs_bg.webp