Merge remote-tracking branch 'origin/develop_cache' into develop_cache

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

@@ -59,7 +59,6 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
     fun init(mContext: Context?, mListener: IDialogViewCloseCallback) {
         this.mListener = mListener
         this.mContext = mContext
-        RxBusUtil.getDefault().register(this)
 //        ToponManager.initNativeAd((mContext as Activity), AdID.AD_DAILY_DRIP_BIGIMAGE)
 //        ToponManager.initNativeAd((mContext as Activity), AdID.AD_LUCKY_DAILY_WATER_VIDEO)
 //        ToponManager.initRewardAd((mContext as Activity), AdID.AD_LUCKY_WATER_HIGH_VIDEO)
@@ -98,8 +97,7 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
     }
 
 
-    @SuppressLint()
-    @Subscribe(code = RxBusConstant.RX_MAIN_WATER_DROP_UPDATE, threadMode = ThreadMode.MAIN)
+
     fun updateList() {
         mPresenter?.getRrchardDailyTask()
     }
@@ -221,7 +219,6 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
 
                                 override fun onAdClose() {
                                     getVideoAcceleratorsReceive2();
-                                    mPresenter?.getRrchardDailyTask()
                                 }
 
                                 override fun onVideoComplete() {
@@ -320,6 +317,7 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
             .subscribe(object : BaseObserver<StatusEntity>() {
                 override fun onSuccess(result: StatusEntity?) {
                     Log.d("wxw", "看视频上报 Success")
+                    mPresenter?.getRrchardDailyTask()
                 }
 
                 override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {

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

@@ -248,7 +248,6 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
                     btnTurntableLottery?.isEnabled = false
                     isStartAnim = true
                     isUpdate = true
-                    mPresenter?.getTurntableLotteryResult()
                 }
 
                 override fun onVideoComplete() {
@@ -431,6 +430,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
             .subscribe(object : BaseObserver<StatusEntity>() {
                 override fun onSuccess(result: StatusEntity?) {
                     Log.d("wxw", "看视频上报 Success")
+                    mPresenter?.getTurntableLotteryResult()
                 }
 
                 override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {