[李俊岐] 优化上报

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

@@ -106,10 +106,11 @@ class WelfareActivity : BaseActivity(), WelfareContract.View,
             //0未完成 1已领取 2可领取
             when (data.status) {
                 0 -> {
+                    EventUtils.onEvent("welfare_task_undone_click_${data.sid}")
                     if (data.opentype == NewsEntity.AD_TYPE_SDK) {
                         if (data.sid != null) {
-                            EventUtils.onEvent("welfare_task_undone_click_${data.sid}")
                             showAd(data.sid)
+                            EventUtils.onEvent("welfare_task_undone_click_total")
                         }
                     } else {
                         JumpUtils.adJump(data, this)
@@ -119,6 +120,9 @@ class WelfareActivity : BaseActivity(), WelfareContract.View,
                     Utils.showToast(this, "已领取")
                 }
                 2 -> {
+                    if (data.opentype == NewsEntity.AD_TYPE_SDK) {
+                        EventUtils.onEvent("welfare_task_done_click_total")
+                    }
                     EventUtils.onEvent("welfare_task_done_click_${data.sid}")
                     mPresenter?.getTaskReceiveList(data?.sid)
                 }

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

@@ -85,6 +85,9 @@ class WateringTaskAdpater :
                         }
                         //领取
                         2 ->{
+                            if (mList[position].opentype == 1) {
+                                EventUtils.onEvent("renwu_done_click_total")
+                            }
                             EventUtils.onEvent("renwu_done_click_"+mList[position].sid, "金币任务领取点击")
                             getDripTaskReceive(type, data)
                         }

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

@@ -126,8 +126,8 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
                     }
                 } else if (data.opentype == 1) {
                     if (data.sid != null) {
-                        EventUtils.onEvent("welfare_task_undone_click", "${data.sid}")
                         showAd(data.sid)
+                        EventUtils.onEvent("renwu_undone_click_total")
                     }
                  else {
                     JumpUtils.adJump(data, mContext)