修改任务领取

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

@@ -10,6 +10,7 @@ import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.ym.game.module.WateringTaskEntity
+import com.ym.game.net.GameApiClient
 import com.ym.game.view.MainDialog
 import com.ym.library.base.BaseRecyclerAdapter
 import com.ym.library.net.BaseObserver
@@ -102,6 +103,7 @@ class WateringTaskAdpater :
 
     inner class WateringTaskHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val tvTitle: TextView = itemView.findViewById(R.id.tv_watering_item_title)
+
         //        val btnProgess: ProgressButton = itemView.findViewById(R.id.progess_watering_item)
         val btnProgess: ProgressBar = itemView.findViewById(R.id.progess_watering_item)
         val tvProgess: TextView = itemView.findViewById(R.id.tv_watering_item_progess)
@@ -112,28 +114,28 @@ class WateringTaskAdpater :
 
     // 领取水滴  type:1每日领水  2高额领水
     private fun getDripTaskReceive(type: Int, data: WateringTaskEntity) {
-//        OrchardApiClient.orchard.getDripTaskReceive(data.id, type).compose(
-//            RxSchedulers.observableIO2Main()
-//        ).subscribe(object : BaseObserver<Any>() {
-//            override fun onSuccess(result: Any?) {
-//                if (result != null) {
-//                    LogUtils.i("WateringTaskAdpater", "水滴领取" + result)
-//                    var adType = ""
-////                    if (type == 1) {
-////                        RxBusUtil.getDefault()
-////                            .send(RxBusConstant.RX_MAIN_WATER_DROP_UPDATE)
-////                        adType = "每日"
-////                    } else if (type == 2) {
-////                        RxBusUtil.getDefault()
-////                            .send(RxBusConstant.RX_MAIN_HIGH_WATER_DROP_UPDATE)
-////                        adType = "高额"
-////                    }
-//                   // MainDialog.showgetWaterDrop(mContext, 1,adType, data.awardNum)
-//                    RxBusUtil.getDefault().send(RxBusConstant.RX_MAIN_UPDATE_HOME_INFO)
-//                }
-//            }
-//
-//            override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {}
-//        })
+        GameApiClient.gameApi.getTaskReceive(data.id, type).compose(
+            RxSchedulers.observableIO2Main()
+        ).subscribe(object : BaseObserver<Any>() {
+            override fun onSuccess(result: Any?) {
+                if (result != null) {
+                    LogUtils.i("WateringTaskAdpater", "水滴领取" + result)
+                    var adType = ""
+                    if (type == 1) {
+                        RxBusUtil.getDefault()
+                            .send(RxBusConstant.RX_MAIN_WATER_DROP_UPDATE)
+                        adType = "每日"
+                    } else if (type == 2) {
+                        RxBusUtil.getDefault()
+                            .send(RxBusConstant.RX_MAIN_HIGH_WATER_DROP_UPDATE)
+                        adType = "高额"
+                    }
+                    MainDialog.showgetWaterDrop(mContext, 4, adType, data.awardNum, null)
+                    RxBusUtil.getDefault().send(RxBusConstant.RX_MAIN_UPDATE_HOME_INFO)
+                }
+            }
+
+            override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {}
+        })
     }
 }
\ No newline at end of file

app/src/main/java/com/ym/game/net/IGameApi.kt

@@ -143,4 +143,13 @@ interface IGameApi {
      */
     @POST(NetConfig.Game.URL_GAME_OPEN_BOX)
     fun getopenBox(): Observable<Response<FlyBoxEntity>>
+
+    /**
+     * 任务领取奖励
+     * @param
+     * @paramq
+     * @return
+     */
+    @POST(NetConfig.Game.URL_GAME_DAILY_TASK_RECEIVE)
+    fun getTaskReceive(@Query("id") id: Int, @Query("type") type: Int): Observable<Response<Any>>
 }
\ No newline at end of file

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

@@ -69,7 +69,6 @@ object MainDialog {
             )
 
         val ivGetDropBg = mDialogView?.findViewById<ImageView>(R.id.iv_get_drop_bg)
-
         val tvGetDropCount = mDialogView?.findViewById<TextView>(R.id.tv_get_drop_count)
         val layoutAd = mDialogView?.findViewById<FrameLayout>(R.id.layout_get_drop_ad)
         val llcontent2 = mDialogView?.findViewById<LinearLayout>(R.id.id_ll_content_2)
@@ -88,19 +87,19 @@ object MainDialog {
                     tvGetDropCount.text = "x${list?.seedList[0].num}"
                 } else if (list?.seedList?.size == 2) {
                     llcontent2.visibility = View.VISIBLE
-                    setImage(ivGetDropBg, list?.seedList[1].id)
+                    setImage(ivGetDropBg, list?.seedList[0].id)
+                    tvGetDropCount.text = "x${list?.seedList[0].num}"
                     setImage(ivGetDropBg2, list?.seedList[1].id)
-                    tvGetDropCount.text = "x${list?.seedList[1].num}"
                     tvGetDropCount2.text = "x${list?.seedList[1].num}"
 
                 } else if (list?.seedList?.size == 3) {
                     llcontent2.visibility = View.VISIBLE
                     llcontent3.visibility = View.VISIBLE
-                    setImage(ivGetDropBg, list?.seedList[2].id)
-                    setImage(ivGetDropBg2, list?.seedList[2].id)
+                    setImage(ivGetDropBg, list?.seedList[0].id)
+                    setImage(ivGetDropBg2, list?.seedList[1].id)
                     setImage(ivGetDropBg3, list?.seedList[2].id)
-                    tvGetDropCount.text = "x${list?.seedList[2].num}"
-                    tvGetDropCount2.text = "x${list?.seedList[2].num}"
+                    tvGetDropCount.text = "x${list?.seedList[0].num}"
+                    tvGetDropCount2.text = "x${list?.seedList[1].num}"
                     tvGetDropCount3.text = "x${list?.seedList[2].num}"
                 }
 
@@ -188,7 +187,7 @@ object MainDialog {
             )
 
         val tvmoneycount = mDialogView?.findViewById<TextView>(R.id.id_tv_moeny_count)
-        tvmoneycount.text = "${rewardCount}"
+        tvmoneycount.text = "${rewardCount / 100}"
 
 
         mDialogView.findViewById<TextView>(R.id.id_tv_get).setOnClickListener {
@@ -239,19 +238,19 @@ object MainDialog {
                     tvGetDropCount.text = "x${result.seedList[0].num}"
                 } else if (result.seedList?.size == 2) {
                     llcontent2.visibility = View.VISIBLE
-                    setImage(ivGetDropBg, result.seedList[1].id)
+                    setImage(ivGetDropBg, result.seedList[0].id)
                     setImage(ivGetDropBg2, result.seedList[1].id)
-                    tvGetDropCount.text = "x${result.seedList[1].num}"
+                    tvGetDropCount.text = "x${result.seedList[0].num}"
                     tvGetDropCount2.text = "x${result.seedList[1].num}"
 
                 } else if (result.seedList?.size == 3) {
                     llcontent2.visibility = View.VISIBLE
                     llcontent3.visibility = View.VISIBLE
-                    setImage(ivGetDropBg, result.seedList[2].id)
-                    setImage(ivGetDropBg2, result.seedList[2].id)
+                    setImage(ivGetDropBg, result.seedList[0].id)
+                    setImage(ivGetDropBg2, result.seedList[1].id)
                     setImage(ivGetDropBg3, result.seedList[2].id)
-                    tvGetDropCount.text = "x${result.seedList[2].num}"
-                    tvGetDropCount2.text = "x${result.seedList[2].num}"
+                    tvGetDropCount.text = "x${result.seedList[0].num}"
+                    tvGetDropCount2.text = "x${result.seedList[1].num}"
                     tvGetDropCount3.text = "x${result.seedList[2].num}"
                 }
 

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

@@ -214,7 +214,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
                 tvTime?.visibility = View.GONE
                 btnCountdown?.visibility = View.GONE
                 btnTurntableLottery?.visibility = View.VISIBLE
-                // btnTurntableLottery?.setImageResource(R.drawable.icon_main_turntable_free_draw_ad)
+               // btnTurntableLottery?.setImageResource(R.drawable.icon_main_turntable_free_draw_ad)
             } else if (data.countDownSecond != null && data.countDownSecond!! > 0) {
                 //倒计时
                 tvTime?.visibility = View.VISIBLE

library/src/main/java/com/ym/library/net/NetConfig.java

@@ -253,6 +253,7 @@ public class NetConfig {
 
         public static final String URL_GAME_INCR_SEED="app/v1/game/farm/incr_seed";//看视频获得种子
         public static final String URL_GAME_INCR_ACCELERATORS="app/v1/game/farm/incr_accelerators";//看视频获得加速剂
+        public static final String URL_GAME_DAILY_TASK_RECEIVE="app/v1/game/farm/daily_task_receive";//看视频获得加速剂
 
 
     }