Merge remote-tracking branch 'origin/develop_ddcy_1.0.3' into develop_ddcy_1.0.3

app/src/main/java/com/ym/game/GameActivity.kt

@@ -86,7 +86,8 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
         }
         openNotif()
 
-        EventUtils.loadNextCacheRewardVideoAd(this)
+        AdUtils.loadNextCacheRewardVideoAd(this)
+        AdUtils.loadFeedCacheAdToCache(this)
 
         AdManager.loadFeedAdToCache(ADConfig.AD_IMG_FADE,this, ZXADSizeConfig(
             Utils.px2dip(PhoneUtils.getScreenWidth(this).toFloat()) - 40, 280))

app/src/main/java/com/ym/game/activity/ClockInWithdrawActitivy.kt

@@ -79,11 +79,11 @@ class ClockInWithdrawActitivy : BaseActivity(), ClockInWithdrawContract.View,
         if (result != null) {
             MainDialog?.showWithDraw(
                 this,
-                result.status,
-                result.title,
-                result.reason,
-                result.buttonText,
-                result.buttonStatus,
+                result?.status?:0,
+                result?.title?:"",
+                result?.reason?:"",
+                result?.buttonText?:"",
+                result?.buttonStatus?:0,
                 null,
                 4,
                 null

app/src/main/java/com/ym/game/activity/WelfareActivity.kt

@@ -5,8 +5,6 @@ import android.text.Html
 import android.view.View
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.ym.admodule.config.AdManager
-import com.ym.admodule.listener.ZXADVideoListener
 import com.ym.ddcy.R
 import com.ym.game.adapter.WelfareDiamondAdapter
 import com.ym.game.adapter.WelfareTaskAdpater
@@ -19,8 +17,6 @@ import com.ym.library.listener.OnRecycleItemClickListener
 import com.ym.library.module.*
 import com.ym.library.net.BaseActivity
 import com.ym.library.utils.*
-import com.ym.library.utils.EventUtils.loadNextCacheRewardVideoAd
-import com.ym.library.utils.EventUtils.requestReport
 import kotlinx.android.synthetic.main.activity_welfare.*
 
 class WelfareActivity : BaseActivity(), WelfareContract.View,
@@ -165,21 +161,6 @@ class WelfareActivity : BaseActivity(), WelfareContract.View,
 
             }
         })
-
-        AdManager.playRewardAd(
-            ADConfig.AD_REWARD_VIDIO,
-            "welfare_task",
-            this, object : ZXADVideoListener {
-                override fun onSuccess() {}
-                override fun onError(s: String?) {}
-                override fun onAdShow() {}
-                override fun onAdVideoBarClick() {}
-                override fun onAdClose() {
-
-                    requestReport()
-                    loadNextCacheRewardVideoAd(this@WelfareActivity)
-                }
-            })
     }
 
     private var isPause = false

app/src/main/java/com/ym/game/adapter/CashExchangeAdapter.kt

@@ -100,11 +100,11 @@ class CashExchangeAdapter :
                 if (result != null) {
                     MainDialog?.showWithDraw(
                         mContext,
-                        result.status,
-                        result.title,
-                        result.reason,
-                        result.buttonText,
-                        result.buttonStatus,
+                        result?.status?:0,
+                        result?.title?:"",
+                        result?.reason?:"",
+                        result?.buttonText?:"",
+                        result?.buttonStatus?:0,
                         id,
                         type,
                         jine

app/src/main/java/com/ym/game/adapter/ClockInWithdrawAdpater.kt

@@ -166,6 +166,7 @@ class ClockInWithdrawAdpater :
 
                             holder?.ivRedPgStatus?.setImageResource(R.drawable.icon_clock_in_item_red_pg_coin)
 
+                            //完成任务 未领取
                             if (data.status == 1) {
                                 startAnimator(holder.layoutRedPg)
                             } else {
@@ -173,10 +174,15 @@ class ClockInWithdrawAdpater :
                             }
                             holder?.ivRightStatus.clearAnimation()
 
+                            holder?.tvProgress.text = "${data?.currentNum}/${data?.targetNum}"
+                            holder?.progressBar.max = data?.targetNum ?: 10
+                            holder?.progressBar.progress = data?.currentNum ?: 0
+
                         } else if (data.status == 6) {
                             //已完成打卡并已提现
                             holder?.layoutCenter.visibility = View.GONE
                             holder?.tvMoney?.visibility = View.GONE
+                            holder?.tvMoneyRedPg?.visibility = View.VISIBLE
                             holder?.tvComplete.visibility = View.VISIBLE
                             holder?.ivRightStatus.clearAnimation()
                             holder.ivRedPgStatus.clearAnimation()
@@ -189,6 +195,7 @@ class ClockInWithdrawAdpater :
                             holder?.tvMoney?.visibility = View.VISIBLE
                             holder?.tvComplete.visibility = View.GONE
                             holder?.layoutProgress.visibility = View.GONE
+                            holder?.tvMoneyRedPg?.visibility = View.VISIBLE
                             holder?.ivRightStatus.clearAnimation()
                             holder.ivRedPgStatus.clearAnimation()
                             holder?.ivRedPgStatus?.setImageResource(R.drawable.icon_clock_in_item_red_pg_coin_uncomplete)
@@ -233,7 +240,13 @@ class ClockInWithdrawAdpater :
                     }
                 }
 
-                holder?.layoutRedPg.setOnClickListener {
+                holder?.layoutRedPg?.setOnClickListener {
+                    if (data.status == 1 || data?.status == 8 || (data?.currentNum != null && data?.targetNum != null && data?.currentNum!! >= data?.targetNum!!)) {
+                        listener?.onItemClick(it, position, mList[position])
+                    }
+                }
+
+                holder?.ivRightStatus?.setOnClickListener {
                     if (data.status == 1 || data?.status == 8 || (data?.currentNum != null && data?.targetNum != null && data?.currentNum!! >= data?.targetNum!!)) {
                         listener?.onItemClick(it, position, mList[position])
                     }

app/src/main/java/com/ym/game/view/MainDialog.kt

@@ -79,7 +79,7 @@ object MainDialog {
         mDialog.setOnDismissListener(object : DialogInterface.OnDismissListener {
             override fun onDismiss(p0: DialogInterface?) {
                 onDestroy()
-                EventUtils.loadFeedCacheAdToCache(activity)
+                AdUtils.loadFeedCacheAdToCache(activity)
             }
 
         })
@@ -191,7 +191,7 @@ object MainDialog {
         mDialog.setOnDismissListener(object : DialogInterface.OnDismissListener {
             override fun onDismiss(p0: DialogInterface?) {
                 onDestroy()
-                EventUtils.loadFeedCacheAdToCache(context)
+                AdUtils.loadFeedCacheAdToCache(context)
             }
 
         })
@@ -326,7 +326,7 @@ object MainDialog {
         mDialog.setOnDismissListener(object : DialogInterface.OnDismissListener {
             override fun onDismiss(p0: DialogInterface?) {
                 onDestroy()
-                EventUtils.loadFeedCacheAdToCache(context)
+                AdUtils.loadFeedCacheAdToCache(context)
             }
 
         })
@@ -399,7 +399,7 @@ object MainDialog {
         mDialog.setOnDismissListener(object : DialogInterface.OnDismissListener {
             override fun onDismiss(p0: DialogInterface?) {
                 onDestroy()
-                EventUtils.loadFeedCacheAdToCache((context as Activity))
+                AdUtils.loadFeedCacheAdToCache((context as Activity))
             }
 
         })

app/src/main/java/com/ym/game/view/SiginDropsPopupwindow.kt

@@ -27,15 +27,13 @@ import com.ym.library.rxbus.RxBusConstant
 import com.ym.library.rxbus.RxBusUtil
 import com.ym.library.rxbus.Subscribe
 import com.ym.library.rxbus.ThreadMode
-import com.ym.library.utils.ADConfig
-import com.ym.library.utils.EventUtils
-import com.ym.library.utils.JumpUtils
-import com.ym.library.utils.LogUtils
 import com.ym.ddcy.R
+import com.ym.library.listener.IAdVideoListener
 import com.ym.library.module.SinginEntity
 import com.ym.library.module.StatusEntity
 import com.ym.library.module.WateringTaskEntity
 import com.ym.library.net.GameApiClient
+import com.ym.library.utils.*
 
 /**
  *Craeted by ${junqi.li}
@@ -130,25 +128,14 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
                     }
                     4 -> {
                         EventUtils.onEvent("click_receive_coin_task_video_btn", "领金币任务视频")
-                        AdManager.playRewardAd(
-                            ADConfig.AD_REWARD_VIDIO,
-                            "receive_coin_task",
-                            (mContext as Activity),
-                            object : ZXADVideoListener {
-                                override fun onAdClose() {
-                                    getVideoAcceleratorsReceive2();
-                                }
 
-                                override fun onAdShow() {
-                                }
+                        AdUtils.playRewardAd((mContext as Activity),"receive_coin_task",object : IAdVideoListener {
+                            override fun onAdClose() {
 
-                                override fun onAdVideoBarClick() {
                             }
 
                             override fun onError(errorMsg: String?) {
-                                }
 
-                                override fun onSuccess() {
                             }
                         })
                     }
@@ -227,21 +214,4 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
         this.animationStyle = R.style.main_photo_anim
         isClippingEnabled = false
     }
-
-    //看视频领上报
-    fun getVideoAcceleratorsReceive2() {
-        EventUtils.loadNextCacheRewardVideoAd(mContext!!)
-        GameApiClient.gameApi.adVideoReport()
-            .compose(RxSchedulers.observableIO2Main())
-            .subscribe(object : BaseObserver<StatusEntity>() {
-                override fun onSuccess(result: StatusEntity?) {
-                    Log.d("wxw", "看视频上报 Success")
-                    mPresenter?.getRrchardDailyTask()
-                }
-
-                override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
-                    Log.d("wxw", "看视频上报 error")
-                }
-            })
-    }
 }
\ No newline at end of file

app/src/main/java/com/ym/game/view/SpeedWaterPopupWindow.kt

@@ -25,13 +25,11 @@ import com.ym.library.rxbus.RxBusConstant
 import com.ym.library.rxbus.RxBusUtil
 import com.ym.library.rxbus.Subscribe
 import com.ym.library.rxbus.ThreadMode
-import com.ym.library.utils.ADConfig
-import com.ym.library.utils.EventUtils
-import com.ym.library.utils.JumpUtils
-import com.ym.library.utils.Utils
 import com.ym.ddcy.R
+import com.ym.library.listener.IAdVideoListener
 import com.ym.library.module.WateringTaskEntity
 import com.ym.library.net.GameApiClient
+import com.ym.library.utils.*
 
 class SpeedWaterPopupWindow : PopupWindow(), SpeedWaterContract.View,
     OnRecycleItemClickListener<WateringTaskEntity> {
@@ -101,25 +99,14 @@ class SpeedWaterPopupWindow : PopupWindow(), SpeedWaterContract.View,
                     }
                     4 -> {
                         EventUtils.onEvent("click_jiasuji_task_video_btn", "领加速剂任务视频")
-                        AdManager.playRewardAd(
-                            ADConfig.AD_REWARD_VIDIO,
-                            "accelerator_task",
-                            (mContext as Activity),
-                            object : ZXADVideoListener {
+                        AdUtils.playRewardAd((mContext as Activity),"accelerator_task",object :
+                            IAdVideoListener {
                             override fun onAdClose() {
-                                    getVideoAcceleratorsReceive2(data.id)
-                                }
-
-                                override fun onAdShow() {
-                                }
 
-                                override fun onAdVideoBarClick() {
                             }
 
                             override fun onError(errorMsg: String?) {
-                                }
 
-                                override fun onSuccess() {
                             }
                         })
                     }
@@ -179,23 +166,6 @@ class SpeedWaterPopupWindow : PopupWindow(), SpeedWaterContract.View,
         isClippingEnabled = false
     }
 
-    //看视频领上报
-    fun getVideoAcceleratorsReceive2(id:Int) {
-        EventUtils.loadNextCacheRewardVideoAd(mContext!!)
-        GameApiClient.gameApi.thirdParty(id)
-            .compose(RxSchedulers.observableIO2Main())
-            .subscribe(object : BaseObserver<Any>() {
-                override fun onSuccess(result: Any?) {
-                    Log.d("wxw", "看视频上报 Success")
-                      mPresenter?.getAcceleratorsTask()
-                }
-
-                override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
-                    Log.d("wxw", "看视频上报 error")
-                }
-            })
-    }
-
     override fun AcceleratorsTaskResult(result: List<WateringTaskEntity>) {
         speedadapter?.clear()
         speedadapter?.appendToList(result)

app/src/main/java/com/ym/game/view/TurntableDialog.kt

@@ -22,14 +22,12 @@ import com.ym.library.rxbus.RxBusConstant
 import com.ym.library.rxbus.RxBusUtil
 import com.ym.library.rxbus.Subscribe
 import com.ym.library.rxbus.ThreadMode
-import com.ym.library.utils.ADConfig
-import com.ym.library.utils.EventUtils
-import com.ym.library.utils.LogUtils
-import com.ym.library.utils.Utils
 import com.ym.ddcy.R
+import com.ym.library.listener.IAdVideoListener
 import com.ym.library.module.StatusEntity
 import com.ym.library.module.TurntableEntity
 import com.ym.library.net.GameApiClient
+import com.ym.library.utils.*
 
 
 /**
@@ -152,7 +150,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
                 }
 
                 override fun onError(errorMsg: String?) {
-                    getVideoAcceleratorsReceive3();
+//                    getVideoAcceleratorsReceive3();
                     reset()
                     btnTurntableLottery?.isEnabled = false
                     isStartAnim = true

library/src/main/java/com/ym/library/module/ExchangeEntity.kt

@@ -2,9 +2,9 @@ package com.ym.library.module
 
 class ExchangeEntity {
 
-    var status: Int = 0
-    var reason: String = ""
-    var buttonText: String = ""
-    var buttonStatus: Int = 0
-    var title: String = ""
+    var status: Int? = 0
+    var reason: String? = ""
+    var buttonText: String? = ""
+    var buttonStatus: Int? = 0
+    var title: String? = ""
 }
\ No newline at end of file

library/src/main/java/com/ym/library/utils/AdUtils.kt

@@ -15,7 +15,7 @@ import java.lang.Exception
 
 object AdUtils {
 
-    fun playRewardAd(activity: Activity,actionName:String,listener:IAdVideoListener) {
+    fun playRewardAd(activity: Activity, actionName: String, listener: IAdVideoListener) {
         AdManager.playRewardAd(
             ADConfig.AD_REWARD_VIDIO,
             actionName,
@@ -26,7 +26,7 @@ object AdUtils {
                 override fun onAdClose() {
                     listener?.onAdClose()
                     //预加载
-                    EventUtils.loadNextCacheRewardVideoAd(activity)
+                    loadNextCacheRewardVideoAd(activity)
                     //看视频上报
                     getVideoAcceleratorsReceive();
                 }
@@ -43,15 +43,34 @@ object AdUtils {
     }
 
 
-    fun showFeedAd(activity: Activity,actionName:String,view:FrameLayout) {
+    fun showFeedAd(activity: Activity, actionName: String, view: FrameLayout) {
         try {
             AdManager.showFeedAd(
                 ADConfig.AD_IMG_FADE,
                 actionName,
-                ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(activity).toFloat()) - 40, 280),
+                ZXADSizeConfig(
+                    Utils.px2dip(PhoneUtils.getScreenWidth(activity).toFloat()) - 40,
+                    280
+                ),
                 activity,
-                view)
-        } catch (e:Exception) {}
+                view
+            )
+        } catch (e: Exception) {
+        }
+    }
+
+    //预加载激励
+    fun loadNextCacheRewardVideoAd(activity: Activity) {
+        AdManager.loadNextCacheRewardVideoAd(ADConfig.AD_REWARD_VIDIO, activity)
+    }
+
+    //预加载信息流
+    fun loadFeedCacheAdToCache(activity: Activity) {
+        AdManager.loadFeedAdToCache(
+            ADConfig.AD_IMG_FADE, activity, ZXADSizeConfig(
+                Utils.px2dip(PhoneUtils.getScreenWidth(activity).toFloat()) - 40, 280
+            )
+        )
     }
 
     //看视频领上报

library/src/main/java/com/ym/library/utils/CenterDialog.kt

@@ -406,7 +406,7 @@ object CenterDialog : BaseDialog() {
 
         mDialog?.setOnCancelListener {
             listener.onCancel(it)
-            EventUtils.loadFeedCacheAdToCache(context)
+            AdUtils.loadFeedCacheAdToCache(context)
         }
 
         mDialog?.setCanceledOnTouchOutside(false)

library/src/main/java/com/ym/library/utils/EventUtils.kt

@@ -319,27 +319,4 @@ object EventUtils {
                 }
             })
     }
-
-    //预加载激励
-    public fun loadNextCacheRewardVideoAd(activity: Activity) {
-        AdManager.loadNextCacheRewardVideoAd(ADConfig.AD_REWARD_VIDIO,activity)
-    }
-
-    //预加载信息流
-    public fun loadFeedCacheAdToCache(activity: Activity) {
-        AdManager.loadFeedAdToCache(ADConfig.AD_IMG_FADE,activity, ZXADSizeConfig(
-            Utils.px2dip(PhoneUtils.getScreenWidth(activity).toFloat()) - 40, 280)
-        )
-    }
-
-    //看视频上报
-    public fun requestReport() {
-        GameApiClient.gameApi.adVideoReport()
-            .compose(RxSchedulers.observableIO2Main())
-            .subscribe(object : BaseObserver<StatusEntity>() {
-                override fun onSuccess(result: StatusEntity) {}
-                override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {}
-            })
-    }
-
 }
\ No newline at end of file

library/src/main/java/com/ym/library/utils/JumpUtils.java

@@ -8,6 +8,7 @@ import android.util.Log;
 import com.bird.angel.AdConfig;
 import com.ym.admodule.config.AdManager;
 import com.ym.admodule.listener.ZXADVideoListener;
+import com.ym.library.listener.IAdVideoListener;
 import com.ym.library.module.NewsEntity;
 import com.ym.library.module.ShaveListEntity;
 import com.ym.library.net.GameApiClient;
@@ -427,27 +428,12 @@ public class JumpUtils {
     }
 
     public static void showAd(Activity activity,NewsEntity data) {
-        AdManager.INSTANCE.playRewardAd(
-                "common_video",
-                "box_click",
-                activity, new ZXADVideoListener() {
+        AdUtils.INSTANCE.playRewardAd(activity, "box_click", new IAdVideoListener() {
             @Override
-                    public void onSuccess() { }
+            public void onAdClose() { }
 
             @Override
-                    public void onError(@Nullable String s) { }
-
-                    @Override
-                    public void onAdShow() { }
-
-                    @Override
-                    public void onAdVideoBarClick() { }
-
-                    @Override
-                    public void onAdClose() {
-                        EventUtils.INSTANCE.requestReport();
-                        EventUtils.INSTANCE.loadNextCacheRewardVideoAd(activity);
-                    }
+            public void onError(@Nullable String errorMsg) { }
         });
     }
 

userinfo/src/main/java/com/ym/userinfo/module/activity/SettingActivity.kt

@@ -105,7 +105,7 @@ class SettingActivity : BaseActivity() {
         super.onPause()
         MobclickAgent.onPause(this)
 
-        EventUtils.loadFeedCacheAdToCache(this)
+        AdUtils.loadFeedCacheAdToCache(this)
 
     }