玉米版芭芭农场1.2.1上线代码

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

@@ -982,6 +982,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
         Log.e("MXL", "CLOSE")
         callUnity("TitleView", "getHomeInfo", "")
         callUnity("GameManager", "getCardList", "")
+        callUnity("cornprocess", "getCornProceessData", "")
     }
 
     fun getUserInfo() {
@@ -1081,7 +1082,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
         ).subscribe(object : BaseObserver<ExchangeEntity>() {
             override fun onSuccess(result: ExchangeEntity?) {
                 if (result != null) {
-                    callUnity("OrderView", "getOrderData", "")
+                    callUnity("cornprocess", "getCornProceessData", "")
                     MainDialog?.showWithDraw(
                         this@GameActivity,
                         result?.status ?: 0,
@@ -1339,4 +1340,39 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
             })
         })
     }
+
+    //获取首页玉米进度数据
+    fun getCornProceessData() {
+        GameApiClient.gameApi.getCornProcess()
+            .compose(RxSchedulers.observableIO2Main())
+            .subscribe(object : BaseObserver<CoinProcessEntity>() {
+                override fun onSuccess(result: CoinProcessEntity?) {
+                    if (result != null) {
+                        var json = Utils.obj2Str(result)
+                        callUnity("cornprocess", "onGetCornProcessResult", json)
+                    }
+
+                }
+
+                override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
+
+                }
+            })
+    }
+
+    fun harvestLookVideo() {
+        AdUtils.playRewardAd(
+            this@GameActivity,
+            "force_video_show",
+            object : IAdVideoListener {
+                override fun onAdClose() {
+
+                }
+
+                override fun onError(errorMsg: String?) {
+
+                }
+            })
+
+    }
 }
\ No newline at end of file

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

@@ -33,13 +33,14 @@ import com.ym.modulecommon.base.NoDoubleClickListener
 class CashExchangeAdapter :
     BaseRecyclerAdapter<WithDrawEntity2.WdList, CashExchangeAdapter.ViewHolder> {
     private var mContext: Activity? = null
-    private var dialog:Dialog?=null
+    private var dialog: Dialog? = null
+
     constructor(
         content: Activity?,
         mDialog: Dialog
     ) : super() {
         mContext = content
-        dialog=mDialog
+        dialog = mDialog
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
@@ -53,7 +54,7 @@ class CashExchangeAdapter :
         } else {
             holder.item_mark?.visibility = View.GONE
         }
-        if (holder.item_icon!=null&&bean.id!=null){
+        if (holder.item_icon != null && bean.id != null) {
             setImage(holder.item_icon!!, bean.id)
         }
         holder.item_cash?.text = bean.cashStr
@@ -61,36 +62,43 @@ class CashExchangeAdapter :
         holder.item_progress?.max = bean.targetNum!!
         holder.item_progress?.setProgress(bean.completeNum!!)
         holder.item_jindu?.text = "${bean.completeNum}/${bean.targetNum}"
-        if (position==1&&bean.type == 1){
+        if (position == 1 && bean.type == 1) {
             if (holder.item_duihuan != null) {
                 initShotAnim(holder.item_duihuan!!)
             }
         }
+        if (bean.ifUse == 1) {
+            holder.item_duihuan?.setImageResource(R.mipmap.icon_duihuan_check_gray)
+
+        } else {
+            holder.item_duihuan?.setImageResource(R.mipmap.icon_duihuan_check)
+
+        }
         holder.item_duihuan?.addClickScale()
-        holder.item_duihuan?.setOnClickListener (object :NoDoubleClickListener(){
+        holder.item_duihuan?.setOnClickListener(object : NoDoubleClickListener() {
             override fun onNoDoubleClick(view: View?) {
 
-                    duihuan(bean.id, bean.type!!, bean.cashStr)
-                    if (bean.type == 1) {
-                        EventUtils.onEvent("click_xinshou0.3", "新手0.3")
-                    } else if (bean.type == 4) {
-                        EventUtils.onEvent("click_fuli0.3", "福利0.3")
-                    } else {
-                        when (bean.id) {
-                            1 -> {
-                                EventUtils.onEvent("click_baicai", "白菜" + bean.cash)
-                            }
-                            2 -> {
-                                EventUtils.onEvent("click_fanqie", "番茄" + bean.cash)
-                            }
-                            3 -> {
-                                EventUtils.onEvent("click_nangua", "南瓜" + bean.cash)
-                            }
-                            4 -> {
-                                EventUtils.onEvent("click_luobo", "萝卜" + bean.cash)
-                            }
+                duihuan(bean.id, bean.type!!, bean.cashStr)
+                if (bean.type == 1) {
+                    EventUtils.onEvent("click_xinshou0.3", "新手0.3")
+                } else if (bean.type == 4) {
+                    EventUtils.onEvent("click_fuli0.3", "福利0.3")
+                } else {
+                    when (bean.id) {
+                        1 -> {
+                            EventUtils.onEvent("click_yumi"+bean.id, "玉米" + bean.cash)
+                        }
+                        2 -> {
+                            EventUtils.onEvent("click_yumi"+bean.id, "玉米" + bean.cash)
+                        }
+                        3 -> {
+                            EventUtils.onEvent("click_yumi"+bean.id, "玉米" + bean.cash)
+                        }
+                        4 -> {
+                            EventUtils.onEvent("click_yumi"+bean.id, "玉米" + bean.cash)
                         }
                     }
+                }
 
             }
 
@@ -112,11 +120,11 @@ class CashExchangeAdapter :
                 if (result != null) {
                     MainDialog?.showWithDraw(
                         mContext,
-                        result?.status?:0,
-                        result?.title?:"",
-                        result?.reason?:"",
-                        result?.buttonText?:"",
-                        result?.buttonStatus?:0,
+                        result?.status ?: 0,
+                        result?.title ?: "",
+                        result?.reason ?: "",
+                        result?.buttonText ?: "",
+                        result?.buttonStatus ?: 0,
                         id,
                         type,
                         jine,
@@ -161,42 +169,48 @@ class CashExchangeAdapter :
             item_mark = itemView.findViewById<ImageView>(R.id.id_img_mark)
             item_duihuan = itemView.findViewById<ImageView>(R.id.id_img_duihuan)
             item_progress = itemView.findViewById<ProgressBar>(R.id.progess_with_draw_item)
+            // item_tv_ifuse = itemView.findViewById<TextView>(R.id.id_tv_ifuse)
         }
     }
 
     fun setImage(img: ImageView?, id: Int) {
-        when (id) {
-            0 -> {
-                img?.setImageResource(R.mipmap.ic_zuanshi)
-            }
-            1 -> {
-                img?.setImageResource(R.mipmap.baicai_fruit)
-            }
-            2 -> {
-                img?.setImageResource(R.mipmap.fanqiei_fruit)
-            }
-            3 -> {
-                img?.setImageResource(R.mipmap.nangua_fruit)
-            }
-            4 -> {
-                img?.setImageResource(R.mipmap.luobo_fruit)
-            }
-            5 -> {
-                img?.setImageResource(R.mipmap.yumi_fruit)
-            }
-            6 -> {
-                img?.setImageResource(R.mipmap.qiezi_fruit)
-            }
-            7 -> {
-                img?.setImageResource(R.mipmap.xigua_fruit)
-            }
-            8 -> {
-                img?.setImageResource(R.mipmap.putao_fruit)
-            }
-            9 -> {
-                img?.setImageResource(R.mipmap.caomei_fruit)
-            }
+        if (id == 0) {
+            img?.setImageResource(R.mipmap.ic_zuanshi)
+        } else {
+            img?.setImageResource(R.mipmap.yumi_fruit)
         }
+//        when (id) {
+//            0 -> {
+//                img?.setImageResource(R.mipmap.ic_zuanshi)
+//            }
+//            1 -> {
+//                img?.setImageResource(R.mipmap.baicai_fruit)
+//            }
+//            2 -> {
+//                img?.setImageResource(R.mipmap.fanqiei_fruit)
+//            }
+//            3 -> {
+//                img?.setImageResource(R.mipmap.nangua_fruit)
+//            }
+//            4 -> {
+//                img?.setImageResource(R.mipmap.luobo_fruit)
+//            }
+//            5 -> {
+//                img?.setImageResource(R.mipmap.yumi_fruit)
+//            }
+//            6 -> {
+//                img?.setImageResource(R.mipmap.qiezi_fruit)
+//            }
+//            7 -> {
+//                img?.setImageResource(R.mipmap.xigua_fruit)
+//            }
+//            8 -> {
+//                img?.setImageResource(R.mipmap.putao_fruit)
+//            }
+//            9 -> {
+//                img?.setImageResource(R.mipmap.caomei_fruit)
+//            }
+//        }
     }
 
     /**
@@ -216,7 +230,8 @@ class CashExchangeAdapter :
             this.onTouchEvent(event)
         }
     }
-    var animatorSet :AnimatorSet?=null
+
+    var animatorSet: AnimatorSet? = null
     private fun initShotAnim(iv: ImageView) {
         animatorSet = AnimatorSet()
         val animatorX: ObjectAnimator = ObjectAnimator.ofFloat(iv, "scaleX", 1f, 0.8f, 1f)

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

@@ -30,66 +30,68 @@ class WareHouseAdapter : BaseRecyclerAdapter<FlyBoxEntity, WareHouseAdapter.View
             }
             //种子
             2 -> {
-                when (bean.id) {
-                    1 -> {
-                        holder.item_img?.setImageResource(R.mipmap.img_cabbage)
-                    }
-                    2 -> {
-                        holder.item_img?.setImageResource(R.mipmap.img_tomato)
-                    }
-                    3 -> {
-                        holder.item_img?.setImageResource(R.mipmap.img_pumpkin)
-                    }
-                    4 -> {
-                        holder.item_img?.setImageResource(R.mipmap.img_radish)
-                    }
-                    5 -> {
-                        holder.item_img?.setImageResource(R.mipmap.img_corn)
-                    }
-                    6 -> {
-                        holder.item_img?.setImageResource(R.mipmap.img_eggplant)
-                    }
-                    7 -> {
-                        holder.item_img?.setImageResource(R.mipmap.img_melon)
-                    }
-                    8 -> {
-                        holder.item_img?.setImageResource(R.mipmap.img_grape)
-                    }
-                    9 -> {
-                        holder.item_img?.setImageResource(R.mipmap.img_strawberry)
-                    }
-                }
+                holder.item_img?.setImageResource(R.mipmap.img_corn)
+//                when (bean.id) {
+//                    1 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.img_cabbage)
+//                    }
+//                    2 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.img_tomato)
+//                    }
+//                    3 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.img_pumpkin)
+//                    }
+//                    4 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.img_radish)
+//                    }
+//                    5 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.img_corn)
+//                    }
+//                    6 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.img_eggplant)
+//                    }
+//                    7 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.img_melon)
+//                    }
+//                    8 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.img_grape)
+//                    }
+//                    9 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.img_strawberry)
+//                    }
+//                }
             }
             //果实
             3 -> {
+                holder.item_img?.setImageResource(R.mipmap.yumi_fruit)
                 when (bean.id) {
-                    1 -> {
-                        holder.item_img?.setImageResource(R.mipmap.baicai_fruit)
-                    }
-                    2 -> {
-                        holder.item_img?.setImageResource(R.mipmap.fanqiei_fruit)
-                    }
-                    3 -> {
-                        holder.item_img?.setImageResource(R.mipmap.nangua_fruit)
-                    }
-                    4 -> {
-                        holder.item_img?.setImageResource(R.mipmap.luobo_fruit)
-                    }
-                    5 -> {
-                        holder.item_img?.setImageResource(R.mipmap.yumi_fruit)
-                    }
-                    6 -> {
-                        holder.item_img?.setImageResource(R.mipmap.qiezi_fruit)
-                    }
-                    7 -> {
-                        holder.item_img?.setImageResource(R.mipmap.xigua_fruit)
-                    }
-                    8 -> {
-                        holder.item_img?.setImageResource(R.mipmap.putao_fruit)
-                    }
-                    9 -> {
-                        holder.item_img?.setImageResource(R.mipmap.caomei_fruit)
-                    }
+//                    1 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.baicai_fruit)
+//                    }
+//                    2 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.fanqiei_fruit)
+//                    }
+//                    3 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.nangua_fruit)
+//                    }
+//                    4 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.luobo_fruit)
+//                    }
+//                    5 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.yumi_fruit)
+//                    }
+//                    6 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.qiezi_fruit)
+//                    }
+//                    7 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.xigua_fruit)
+//                    }
+//                    8 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.putao_fruit)
+//                    }
+//                    9 -> {
+//                        holder.item_img?.setImageResource(R.mipmap.caomei_fruit)
+//                    }
 
                 }
             }

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

@@ -80,7 +80,7 @@ class WateringTaskAdpater :
 //                holder.tvCount.text = "+${data.coins}"
 //            }
 
-            holder.imgcoin.setImageResource(R.mipmap.icon_popupwater_icon)
+            holder.imgcoin.setImageResource(R.mipmap.icon_speed_water)
             if (!TextUtils.isEmpty(data.description)) {
                 holder.btnProgess.visibility = View.GONE
                 holder.tvTitle.text = data.title+" (${data.current_nums}/${data.awardLimit})"
@@ -98,7 +98,7 @@ class WateringTaskAdpater :
                     isClick = true
                     when (data.status) {
                        0 ->{
-                           EventUtils.onEvent("renwu_undone_click_"+mList[position].sid, "金币任务去完成点击")
+                           EventUtils.onEvent("renwu_go_click_"+mList[position].sid, "金币任务去完成点击")
                            listener.onItemClick(it, position, mList[position])
                        }
                         1 -> {
@@ -172,7 +172,7 @@ class WateringTaskAdpater :
 
     // 领取水滴  type:1每日领水  2高额领水
      fun getDripTaskReceive(type: Int, sid:Int) {
-        GameApiClient.gameApi.getTaskComplete(sid).compose(
+        GameApiClient.gameApi.getTaskComplete2(sid,"speed_task_list").compose(
             RxSchedulers.observableIO2Main()
         ).subscribe(object : BaseObserver<TaskCompleteEntity>() {
             override fun onSuccess(result: TaskCompleteEntity?) {
@@ -181,7 +181,7 @@ class WateringTaskAdpater :
                         .send(RxBusConstant.RX_MAIN_WATER_DROP_UPDATE)
                     if (result != null) {
                         LogUtils.i("WaterTaskAdpater", "任务奖励领取" + result)
-                        MainDialog.showgetWaterDrop(mContext, 4, "task_coins", result.awardCoins!!, null)
+                        MainDialog.showgetWaterDrop(mContext, 5, "task_coins", result.awardNum!!, null)
                     }
 
             }

app/src/main/java/com/ym/game/application/BaseApplication.kt

@@ -16,6 +16,7 @@ import com.bx.adsdk.AdSdk
 import com.tencent.bugly.crashreport.CrashReport
 import com.umeng.commonsdk.UMConfigure
 import com.umeng.socialize.PlatformConfig
+import com.ym.admodule.BuildConfig
 import com.ym.admodule.config.AdManager
 import com.ym.library.MyConstant
 import com.ym.modulecommon.AppLibraryConfig
@@ -67,7 +68,8 @@ class BaseApplication : BaseApplication() {
         }
         LogUtils.d("BaseApplication","isDebug:${isDebug}")
         LogUtils.getConfig().logSwitch = isDebug
-        AppLibraryConfig.NetConfig.isDebug = isDebug
+        AppLibraryConfig.ActivityConfig.isProhibitScreenshot=false
+        //AppLibraryConfig.NetConfig.isDebug = isDebug
 //        Constant.appLs = "afcbef40e31631d3"//appls
         AdManager.init(this, "7025878009b4cca3")
 
@@ -87,7 +89,7 @@ class BaseApplication : BaseApplication() {
         // 设置是否为上报进程
         strategy.isUploadProcess = processName == null || processName == packageName
         //Bugly初始化
-        CrashReport.initCrashReport(this, "3bac59d22f", isDebug, strategy)
+        CrashReport.initCrashReport(this, "3bac59d22f", BuildConfig.DEBUG, strategy)
         //========== Bugly ==========
 
         //小满

app/src/main/java/com/ym/game/presenter/WateringRewardPresenter.kt

@@ -35,7 +35,7 @@ class WateringRewardPresenter : WateringRewardContract.Presenter {
 //
 //            override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {}
 //        })
-        GameApiClient.gameApi.getTaskListInfo("coin_task_list").compose(
+        GameApiClient.gameApi.getTaskListInfo("speed_task_list").compose(
             RxSchedulers.observableIO2Main()
         ).subscribe(object : BaseObserver<TaskListEntity>() {
             override fun onSuccess(result: TaskListEntity?) {

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

@@ -204,36 +204,37 @@ object MainDialog {
     }
 
     fun setImage(img: ImageView, id: Int) {
-        when (id) {
-            1 -> {
-                img.setImageResource(R.mipmap.img_cabbage)
-            }
-            2 -> {
-                img.setImageResource(R.mipmap.img_tomato)
-            }
-            3 -> {
-                img.setImageResource(R.mipmap.img_pumpkin)
-            }
-            4 -> {
-                img.setImageResource(R.mipmap.img_radish)
-            }
-            5 -> {
-                img.setImageResource(R.mipmap.img_corn)
-            }
-            6 -> {
-                img.setImageResource(R.mipmap.img_eggplant)
-            }
-            7 -> {
-                img.setImageResource(R.mipmap.img_melon)
-            }
-            8 -> {
-                img.setImageResource(R.mipmap.img_grape)
-            }
-            9 -> {
-                img.setImageResource(R.mipmap.img_strawberry)
-            }
-
-        }
+        img.setImageResource(R.mipmap.img_corn)
+//        when (id) {
+//            1 -> {
+//                img.setImageResource(R.mipmap.img_cabbage)
+//            }
+//            2 -> {
+//                img.setImageResource(R.mipmap.img_tomato)
+//            }
+//            3 -> {
+//                img.setImageResource(R.mipmap.img_pumpkin)
+//            }
+//            4 -> {
+//                img.setImageResource(R.mipmap.img_radish)
+//            }
+//            5 -> {
+//                img.setImageResource(R.mipmap.img_corn)
+//            }
+//            6 -> {
+//                img.setImageResource(R.mipmap.img_eggplant)
+//            }
+//            7 -> {
+//                img.setImageResource(R.mipmap.img_melon)
+//            }
+//            8 -> {
+//                img.setImageResource(R.mipmap.img_grape)
+//            }
+//            9 -> {
+//                img.setImageResource(R.mipmap.img_strawberry)
+//            }
+//
+//        }
     }
 
 
@@ -628,9 +629,9 @@ object MainDialog {
         mDialogView.findViewById<ImageView>(R.id.id_img_close_cloud_speed).setOnClickListener {
             mDialog.dismiss()
         }
-        if(type==1){
+        if (type == 1) {
             id_img_all_speed.setBackgroundResource(R.drawable.select_all_speed)
-        }else{
+        } else {
             id_img_all_speed.setImageResource(R.drawable.select_all_speed_no_look)
         }
         id_img_all_speed.setOnClickListener {
@@ -919,14 +920,14 @@ object MainDialog {
         // val layout_ad = mDialogView?.findViewById<FrameLayout>(R.id.layout_feed_ad)
         when (type) {
             1 -> {
-                EventUtils.onEvent("jiaoshui_show","浇水弹窗曝光")
+                EventUtils.onEvent("jiaoshui_show", "浇水弹窗曝光")
                 img_bg.setBackgroundResource(R.mipmap.icon_bg_one)
                 img_icon.setBackgroundResource(R.mipmap.icon_bg_jiasuji)
                 img_get.setBackgroundResource(R.drawable.select_get_one)
                 tv_jiasu_time.text = "浇水使作物提前 ${time} 分钟成熟"
             }
             2 -> {
-                EventUtils.onEvent("kill_show","杀虫剂弹窗曝光")
+                EventUtils.onEvent("kill_show", "杀虫剂弹窗曝光")
                 img_bg.setBackgroundResource(R.mipmap.icon_bg_two)
                 img_icon.setBackgroundResource(R.mipmap.icon_bg_shachongji)
                 img_get.setBackgroundResource(R.drawable.select_get_two)
@@ -937,10 +938,10 @@ object MainDialog {
         id_tv_num.text = "已拥有 ${Num}"
         tv_shengxu_num.text = "今天剩余${howmany}次"
         img_get.setOnClickListener {
-            if(type==1){
-                EventUtils.onEvent("jiaoshui_video_btn_click","浇水弹窗获得浇水次数按钮点击")
-            }else if(type==2){
-                EventUtils.onEvent("kill_video_btn_click","获得杀虫剂按钮点击")
+            if (type == 1) {
+                EventUtils.onEvent("jiaoshui_video_btn_click", "浇水弹窗获得浇水次数按钮点击")
+            } else if (type == 2) {
+                EventUtils.onEvent("kill_video_btn_click", "获得杀虫剂按钮点击")
             }
             adListener.onClick(it)
             //   EventUtils.onEvent("box_video_btn_click", "宝箱视频按钮点击")

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

@@ -57,10 +57,10 @@ 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_renwu_dialog", "金币任务弹窗曝光")
+        EventUtils.onEvent("renwu_show", "金币任务弹窗曝光")
         init(view)
         initView()
-        mPresenter?.getOrchardSignTask()
+       // mPresenter?.getOrchardSignTask()
         mPresenter?.getRrchardDailyTask()
         showAtLocation(
             view,

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

@@ -56,7 +56,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/dp_10"
                     android:layout_marginBottom="@dimen/dp_10"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:visibility="gone">
 
                     <ImageView
                         android:layout_width="wrap_content"

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

@@ -110,10 +110,15 @@
 
         <ImageView
             android:id="@+id/id_img_duihuan"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/dp_90"
+            android:layout_height="@dimen/dp_30"
             android:src="@mipmap/icon_duihuan_check" />
-
+<!--        <TextView-->
+<!--            android:id="@+id/id_tv_ifuse"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:text="已提现"-->
+<!--            android:visibility="gone"/>-->
     </LinearLayout>
 </LinearLayout>
 

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

@@ -121,7 +121,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="@dimen/dp_10"
                     android:gravity="center"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="wrap_content"

app/version.properties

 PACKAGE_NAME=com.ym.bbnc
-VERSION_CODE=13
-VERSION_NAME=1.2.0
\ No newline at end of file
+VERSION_CODE=14
+VERSION_NAME=1.2.1
\ No newline at end of file

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

+package com.ym.library.module
+
+class CoinProcessEntity {
+    var currentNum: Int = 0
+    var targetNum: Int = 0
+    var cashStr: String = ""
+    var wdText: String = ""
+}
\ No newline at end of file

library/src/main/java/com/ym/library/module/HomeInfoEntity.java

@@ -33,6 +33,24 @@ public class HomeInfoEntity {
     private int acceleratorsVideoNum;//看视频给加速剂的个数
     private int lotteryNum;//转盘剩余次数
     private int isPopup;//是否选过商品
+    private int lessForceNum;
+    private int forceNum;
+
+    public int getLessForceNum() {
+        return lessForceNum;
+    }
+
+    public void setLessForceNum(int lessForceNum) {
+        this.lessForceNum = lessForceNum;
+    }
+
+    public int getForceNum() {
+        return forceNum;
+    }
+
+    public void setForceNum(int forceNum) {
+        this.forceNum = forceNum;
+    }
 
     public int getSubClearBugVideoNum() {
         return subClearBugVideoNum;

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

@@ -14,5 +14,6 @@ class WithDrawEntity2 {
         var relatedUnit: String = ""
         var targetNum: Int = 0
         var completeNum: Int = 0
+        var ifUse:Int=0
     }
 }
\ No newline at end of file

library/src/main/java/com/ym/library/net/GameApiClient.kt

@@ -56,9 +56,9 @@ object GameApiClient {
         .addInterceptor(logInterceptor.apply {
             level =  if(BuildConfig.DEBUG)HttpLoggingInterceptor.Level.BODY else{HttpLoggingInterceptor.Level.NONE}
         })
-//        .addInterceptor(GameApiClient.logInterceptor.apply {
-//            level = HttpLoggingInterceptor.Level.BODY
-//        })
+        .addInterceptor(GameApiClient.logInterceptor.apply {
+            level = HttpLoggingInterceptor.Level.BODY
+        })
 //        .retryOnConnectionFailure(false)
        // .addInterceptor(DecryptInterceptor())
         .hostnameVerifier { hostname, session ->

library/src/main/java/com/ym/library/net/IGameApi.kt

@@ -297,6 +297,12 @@ interface IGameApi {
     @POST(NetConfig.Task.TASK_COMPLETE_TASK)
     fun getTaskComplete(@Query("id") sid: Int): Observable<Response<TaskCompleteEntity>>
 
+    /**
+     * 任务领取接口
+     */
+    @POST(NetConfig.Task.TASK_ACC_TASK_RECEIVE)
+    fun getTaskComplete2(@Query("sid") sid: Int,@Query("slotName") slotName: String): Observable<Response<TaskCompleteEntity>>
+
     /**
      * 任务页列表
      */
@@ -404,4 +410,13 @@ interface IGameApi {
      */
     @GET(NetConfig.Game.URL_GAME_LIST_SEED)
     fun getlistseed(): Observable<Response<List<SeedListEntity>>>
+
+    /**
+     * 首页玉米提现进度
+     * @param
+     * @param
+     * @return
+     */
+    @GET(NetConfig.Game.URL_GAME_CORN_WD_PROCESS)
+    fun getCornProcess(): Observable<Response<CoinProcessEntity>>
 }
\ No newline at end of file

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

@@ -97,6 +97,8 @@ public class NetConfig {
         public static final String URL_TASK_SIGNINDOUBLING = "app/v2/common/award/doublingAward";//任务页签到翻倍
         public static final String TASK_URL = "app/v2/novel/taskListWithStat";//任务列表
         public static final String TASK_COMPLETE_TASK = "app/v1/game/complete-task";//任务领取
+        public static final String TASK_ACC_TASK_RECEIVE= "app/v1/game/bbnc/acc_task_receive";//任务领取
+
         public static final String URL_TASK_COMMON = "app/v2/common/award";//任务页加金币
         public static final String URL_TASK_BUBBLELIST = "app/v1/step/bubbleListV2";//任务页悬浮金币
         public static final String URL_TASK_BEGINNEW = "app/v1/task/beginNewUserTask";//任务签到提醒
@@ -243,8 +245,8 @@ public class NetConfig {
         public static final String URL_GAME_FARM_RANK_RECEIVE = "app/v1/game/farm/rank_receive";//排行榜领取
         public static final String URL_GAME_THIRD_PARTY = "app/v1/game/third_party";//加速剂任务看视频
 
-        public static final String URL_GAME_WITHDRAW_LIST = "app/v1/game/ddcy/withdraw_list";//兑换列表
-        public static final String URL_GAME_DOWD = "app/v1/game/ddcy/do_wd";//兑换接口
+        public static final String URL_GAME_WITHDRAW_LIST = "app/v1/game/bbnc/corn_cash_list";//兑换列表
+        public static final String URL_GAME_DOWD = "app/v1/game/bbnc/corn_do_wd";//兑换接口
         public static final String URL_GAME_WD_HISTORY = "app/v1/game/ddcy/wd_history";//兑换记录
         public static final String URL_GAME_ACCELERATORS_TASK_RECEIVE = "app/v1/game/ddcy/accelerators_task_receiveV2";//加速剂任务领取
         public static final String URL_GAME_USER_GUIDE = "app/v1/game/ddcy/user_guide";
@@ -255,7 +257,7 @@ public class NetConfig {
 
         public static final String URL_GAME_CLOUD_CHECK = "app/v1/game/farm/cloud_check";//云朵加速判断
 
-      //  public static final String URL_GAME_OPEN_PLANT_BOX = "app/v1/game/farm/open_plant_box";//底部拆红包
+        //  public static final String URL_GAME_OPEN_PLANT_BOX = "app/v1/game/farm/open_plant_box";//底部拆红包
 
         public static final String URL_GAME_CLOCK_LIST = "app/v1/game/ddcy/clock_list";//打卡提现列表
         public static final String URL_GAME_DO_WD = "app/v1/game/ddcy/clock_wd";//打卡提现
@@ -272,10 +274,10 @@ public class NetConfig {
         public static final String URL_COLLECT_CARD_ADV_PUT_OR_ADD = "app/v1/collect-card/advPutOrAdd";//看广告单个图片获取或者拼图
         public static final String URL_COLLECT_CARD_ADD_CARD = "app/v1/collect-card/addCard";//收金币获得卡片
         public static final String URL_GAME_HOME_WD_LIST = "app/v1/game/ddcy/home_wd_list";//首页展示果实列表
-       // public static final String URL_CLOCK_BOX_RECEIVE = "app/v1/game/ddcy/clock_box_receive";//打卡普通打卡任务领取
+        // public static final String URL_CLOCK_BOX_RECEIVE = "app/v1/game/ddcy/clock_box_receive";//打卡普通打卡任务领取
 
         public static final String URL_GAME_VIDEO_TASK_COMPLETE = "app/v1/game/video_task_complete";//看领金币视频任务
-        public static final String URL_GAME_WAREHOUSEDATA = "app/v1/game/ddcy/warehouseData";//仓库列表
+        public static final String URL_GAME_WAREHOUSEDATA = "app/v1/game/bbnc/corn_warehouse";//仓库列表
         //=========================================菜园=========================================
 //        public static final String URL_GAME_LIST_LAND = "app/v1/game/farm/list_land";//菜园地块列表
         public static final String URL_GAME_LIST_LAND = "app/v1/game/ddhy/list_land_V2";//菜园地块列表
@@ -290,5 +292,7 @@ public class NetConfig {
         public static final String URL_GAME_ADD_PROP = "app/v1/game/bbnc/add_prop";
         //种子列表
         public static final String URL_GAME_LIST_SEED = "app/v1/game/bbnc/list_seed";
+        //首页玉米提现进度
+        public static final String URL_GAME_CORN_WD_PROCESS = "app/v1/game/bbnc/corn_wd_process";
     }
 }

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

@@ -97,6 +97,12 @@ object AdUtils {
                     if (actionName.equals("seed_video_show")) {
                         EventUtils.onEvent("seed_video_show", "种子购买视频曝光");
                     }
+                    if(actionName.equals("home_task")){
+                        EventUtils.onEvent("renwu_video_show","金币任务视频曝光")
+                    }
+                    if(actionName.equals("force_video_show")){
+                        EventUtils.onEvent("force_video_show","强弹视频曝光")
+                    }
                     Utils.showToast(activity, "看完视频可获得奖励")
                     // AdManager.loadNextCacheRewardVideoAd(ADConfig.AD_VIDEO, activity!!)
                     handler?.sendEmptyMessageDelayed(0, 2000)