修改启动页和其他ui

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

@@ -19,6 +19,7 @@ import com.ym.library.utils.Utils
 import com.ym.ddcy.R
 import com.ym.library.module.WateringTaskEntity
 import com.ym.library.net.GameApiClient
+import com.ym.library.utils.EventUtils
 
 class SpeedWaterTaskAdapter :
     BaseRecyclerAdapter<WateringTaskEntity, SpeedWaterTaskAdapter.WateringTaskHolder> {
@@ -54,11 +55,22 @@ class SpeedWaterTaskAdapter :
             holder.ivStatus.setOnClickListener {
                 if (Utils.isFastClick()) {
                     when (data.status) {
-                        0 ->
+
+                        0 ->{
+                            EventUtils.onEvent("renwu_undone_click_"+mList[position].id, "金币任务去完成点击")
                             listener.onItemClick(it, position, mList[position])
-                        1 -> Utils.showToast(mContext, "您已经领过了哦~")
+                        }
+
+
+                        1 -> {
+
+                            Utils.showToast(mContext, "您已经领过了哦~")
+                        }
                         //领取
-                        2 -> getDripTaskReceive(type, data)
+                        2 ->{
+
+                            getDripTaskReceive(type, data)
+                        }
                     }
                 }
             }

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

@@ -21,6 +21,7 @@ import com.ym.library.module.NewsEntity
 import com.ym.library.module.TaskCompleteEntity
 import com.ym.library.module.WateringTaskEntity
 import com.ym.library.net.GameApiClient
+import com.ym.library.utils.EventUtils
 
 /**
  *Craeted by ${junqi.li}
@@ -51,7 +52,7 @@ class WateringTaskAdpater :
         if (mList.size > 0) {
             val data = mList[position]
             holder.tvTitle.text = data.title
-            holder.tvCount.text = "+${data.awardCoins}"
+            holder.tvCount.text = "+${data.coins}"
             holder.imgcoin.setImageResource(R.mipmap.icon_popupwater_icon)
             if (data.description != null) {
                 holder.btnProgess.visibility = View.GONE
@@ -68,11 +69,19 @@ class WateringTaskAdpater :
             holder.ivStatus.setOnClickListener {
                 if (Utils.isFastClick()) {
                     when (data.status) {
-                       0 ->
+                       0 ->{
+                           EventUtils.onEvent("renwu_undone_click_"+mList[position].sid, "金币任务去完成点击")
                            listener.onItemClick(it, position, mList[position])
-                        1 -> Utils.showToast(mContext, "您已经领过了哦~")
+                       }
+                        1 -> {
+
+                            Utils.showToast(mContext, "您已经领过了哦~")
+                        }
                         //领取
-                        2 -> getDripTaskReceive(type, data)
+                        2 ->{
+                            EventUtils.onEvent("renwu_done_click_"+mList[position].sid, "金币任务领取点击")
+                            getDripTaskReceive(type, data)
+                        }
                     }
                 }
             }

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

@@ -32,7 +32,7 @@ object CashExchangeDialog : CashExchangeContract.View {
             return
         }
         this.context = context
-        EventUtils.onEvent("show_duihuan_cash", "兑换现金")
+        EventUtils.onEvent("show_duihuan_cash_dialog", "兑换现金")
         mPresenter = CashExchangePresenter(this)
         mPresenter?.getWithDrawList()
         RxBusUtil.getDefault().register(this)

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

@@ -550,6 +550,7 @@ object MainDialog {
             0,
             Gravity.CENTER
         )
+        EventUtils.onEvent("show_suipianbuzu_dialog", "碎片不足弹窗曝光")
         mDialogView.findViewById<TextView>(R.id.id_tv_num_puzzle)?.text = "${diffCardsNum}"
         mDialogView.findViewById<ImageView>(R.id.id_img_close_get_puzzle).setOnClickListener {
             mDialog.dismiss()
@@ -559,6 +560,7 @@ object MainDialog {
         }
         mDialogView.findViewById<ImageView>(R.id.id_img_sure).setOnClickListener {
             mDialog.dismiss()
+            EventUtils.onEvent("click_pintu_quhuode_video", "去获得视频按钮点击")
             onClickListener.onClick(it)
         }
         mDialog?.setCanceledOnTouchOutside(false)

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

@@ -70,7 +70,7 @@ object PuzzleDialog : PuzzleContract.View, OnRecycleItemClickListener<PuzzleEnti
             return
         }
         this.context = context
-        // EventUtils.onEvent("show_puzzle", "拼图展示")
+         EventUtils.onEvent("show_pintu_dialog", "拼图弹窗曝光")
         mPresenter = PuzzlePresenter(this)
         mPresenter?.getPuzzleData()
         RxBusUtil.getDefault().register(this)
@@ -105,6 +105,7 @@ object PuzzleDialog : PuzzleContract.View, OnRecycleItemClickListener<PuzzleEnti
         mDialogView?.findViewById<ImageView>(R.id.id_img_one_click_puzzle).setOnClickListener {
 
             // mListener.onCloseViewSuccess(true);
+            EventUtils.onEvent("click_pintu_yijian", "一键拼图按钮点击")
             mPresenter?.automatic()
             RxBusUtil.getDefault().unregister(this)
         }
@@ -319,7 +320,8 @@ object PuzzleDialog : PuzzleContract.View, OnRecycleItemClickListener<PuzzleEnti
     override fun onItemClick(view: View, position: Int, data: PuzzleEntity.PuzzleData) {
         // Utils.showToast(AppliContext.get(), "点击" + position)
         if (data.number == 0) {
-            Utils.showToast(AppliContext.get(), "看广告")
+           // Utils.showToast(AppliContext.get(), "看广告")
+            EventUtils.onEvent("click_pintu_suipian_video","碎片视频按钮点击")
             AdUtils.playRewardAd(
                 context as Activity,
                 "get_puzzle_click_dialog",

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

@@ -58,7 +58,7 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
         RxBusUtil.getDefault().register(this)
         mPresenter = WateringRewardPresenter(this)
         view = LayoutInflater.from(mContext).inflate(R.layout.layout_popup_drops, null)
-        EventUtils.onEvent("show_receive_coin_task_dialog", "领金币任务")
+        EventUtils.onEvent("show_renwu_dialog", "金币任务弹窗曝光")
         init(view)
         initView()
         mPresenter?.getOrchardSignTask()

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

@@ -142,7 +142,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
                 }
 
                 override fun onAdShow() {
-
+                    Utils.showToast(context, "看完视频可获得奖励")
                 }
 
                 override fun onAdVideoBarClick() {

app/src/main/res/layout/splash_layout.xml

@@ -28,11 +28,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="@color/white">
+        android:background="@color/white"
+        android:padding="@dimen/dp_30">
 
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:src="@drawable/logo" />
+            android:src="@drawable/duoduokaipingye" />
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file

library/build.gradle

@@ -67,7 +67,7 @@ dependencies {
     api ("com.bx:adsdk:1.3.3"){
         exclude group: 'com.google.code.gson'
     }
-    api 'com.ym.admodule:admodule:1.0.2.11'
+    api 'com.ym.admodule:admodule:1.0.2.14'
     api 'com.airbnb.android:lottie:3.1.0'
     /* api 'androidx.appcompat:appcompat:1.2.0-alpha02'
      api 'com.android.support:design:28.0.0'

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

@@ -11,6 +11,7 @@ import com.ym.library.module.StatusEntity
 import com.ym.library.net.BaseObserver
 import com.ym.library.net.GameApiClient
 import com.ym.library.net.RxSchedulers
+import com.ym.modulecommon.AppliContext
 import java.lang.Exception
 
 object AdUtils {
@@ -31,7 +32,9 @@ object AdUtils {
                     getVideoAcceleratorsReceive();
                 }
 
-                override fun onAdShow() {}
+                override fun onAdShow() {
+                    Utils.showToast(activity, "看完视频可获得奖励")
+                }
 
                 override fun onAdVideoBarClick() {}