[提交人]：王雪伟

[提交简述] ：多多花园1.0.1
[实现方案] ：修改bug

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

@@ -222,18 +222,19 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
     }
 
     private var isclick = false
+
     /**
      * 兑换现金
      */
     fun cashExchange() {
-        if(!isclick){
+        if (!isclick) {
             isclick = true
             MainLooper.get()?.post(Runnable {
                 CashExchangeDialog.showCashExchage(this, this)
             })
             MainLooper.get()?.postDelayed(Runnable {
                 isclick = false
-            },2000)
+            }, 2000)
         }
 
     }
@@ -571,6 +572,9 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
             .subscribe(object : BaseObserver<StatusEntity>() {
                 override fun onSuccess(result: StatusEntity?) {
                     Log.d("wxw", "同步解锁地块")
+                    if(type==1){
+                        getListLandNew(2);
+                    }
                 }
 
                 override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
@@ -580,9 +584,21 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
     }
 
     //看视频解锁地块
-    fun lookAdVideoUnLockLand(){
+    fun lookAdVideoUnLockLand() {
+        AdUtils.playRewardAd(
+            this@GameActivity,
+            "unlockLand",
+            object : IAdVideoListener {
+                override fun onAdClose() {
                     callUnity("Form_land", "lookAdVideoUnLockLandSuccess", "")
                 }
+
+                override fun onError(errorMsg: String?) {
+
+                }
+            })
+    }
+
     //加速剂
     fun getUseAccelerators(callback: IUnitySendMessageCallback?, id: Int) {
         GameApiClient.gameApi.getUseAccelerators(id).compose(RxSchedulers.observableIO2Main())
@@ -745,7 +761,11 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
                             .subscribe(object : BaseObserver<StatusEntity>() {
                                 override fun onSuccess(result: StatusEntity?) {
                                     Log.d("wxw", "看视频领取种子同步" + Utils.obj2Str(result))
-                                    callUnity("Form_land", "onVideoSeedReceiveSuccess", "" + (id - 1))
+                                    callUnity(
+                                        "Form_land",
+                                        "onVideoSeedReceiveSuccess",
+                                        "" + (id - 1)
+                                    )
                                 }
 
                                 override fun onFailure(
@@ -976,7 +996,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
         ).subscribe(object : BaseObserver<ExchangeEntity>() {
             override fun onSuccess(result: ExchangeEntity?) {
                 if (result != null) {
-                    callUnity("OrderView", "getOrderData", "")
+                    callUnity("reward_list_bg", "getTitleOrderListData", "")
                     MainDialog?.showWithDraw(
                         this@GameActivity,
                         result?.status ?: 0,
@@ -999,11 +1019,12 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
             }
         })
     }
-    fun showCloudDialog(speedtime:Int,sppedtimes:Int){
-        Log.d("wxw","雲朵加速");
+
+    fun showCloudDialog(speedtime: Int, sppedtimes: Int) {
+        Log.d("wxw", "雲朵加速");
         MainLooper.get()?.post(Runnable {
             // CashExchangeDialog.showCashExchage(this, this)
-            MainDialog.showDialogCloud(this,speedtime,sppedtimes, View.OnClickListener {
+            MainDialog.showDialogCloud(this, speedtime, sppedtimes, View.OnClickListener {
                 AdUtils.playRewardAd(
                     this@GameActivity,
                     "cloud_acceleration_click",
@@ -1039,7 +1060,8 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
             })
         })
     }
-    fun showWareHouseDialog(){
+
+    fun showWareHouseDialog() {
         MainLooper.get()?.post(Runnable {
             if (Utils.isFastClick2()) {
                 WareHouseDialog.showWareHouse(this)

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

@@ -179,12 +179,12 @@ public class NetConfig {
         public static final String URL_GAME_BUY_SEED = "app/v1/game/farm/buy_seed";//金币购买种子
         public static final String URL_GAME_CLOUD_SPEED = "app/v1/game/farm/cloud_speed";//云朵加速
         public static final String URL_GAME_HOME_INFO = "app/v1/game/farm/home_info";//首页信息
-               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/farm/list_land";//菜园地块列表
 
         public static final String URL_GAME_OPEN_BOX = "app/v1/game/farm/open_box";//开宝箱
         public static final String URL_GAME_ORDER_DATA = "app/v1/game/farm/order_data";//订单数据
         public static final String URL_GAME_ORDER_RECEIVE = "app/v1/game/farm/order_receive";//订单领取
-        public static final String URL_GAME_UNLOCK_LAND = "app/v1/game/farm/unlock_land";//解锁地块/种植种子/收获果实
+//        public static final String URL_GAME_UNLOCK_LAND = "app/v1/game/farm/unlock_land";//解锁地块/种植种子/收获果实
         public static final String URL_GAME_USE_ACCELERATORS = "app/v1/game/farm/use_accelerators";//加速剂加速
         public static final String URL_GAME_WAREHOUSE_DATA = "app/v1/game/farm/warehouseData";//仓库列表
         public static final String URL_GAME_TURNTABLE_LIST = "app/v1/game/farm/turntable_list";//转盘列表
@@ -199,8 +199,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/ddcy/withdraw_list";//兑换列表
+//       public static final String URL_GAME_DOWD = "app/v1/game/ddcy/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";
@@ -234,10 +234,10 @@ public class NetConfig {
         public static final String URL_GAME_WAREHOUSEDATA = "app/v1/game/ddcy/warehouseData";//仓库列表
 
         //=========================================花园=========================================
-//        public static final String URL_GAME_LIST_LAND = "app/v1/game/ddhy/list_land";//花园地块列表
-//        public static final String URL_GAME_UNLOCK_LAND = "app/v1/game/ddhy/unlock_land";//花园 解锁地块/种植种子/收获果实
-//        public static final String URL_GAME_ORDER_LIST = "app/v1/game/ddhy/list_order";//花园 订单列表
-//        public static final String URL_GAME_WITHDRAW_LIST = "app/v1/game/ddhy/withdraw_list";//兑换列表
-//        public static final String URL_GAME_DOWD = "app/v1/game/ddhy/do_wd";//兑换接口
+        public static final String URL_GAME_LIST_LAND = "app/v1/game/ddhy/list_land";//花园地块列表
+        public static final String URL_GAME_UNLOCK_LAND = "app/v1/game/ddhy/unlock_land";//花园 解锁地块/种植种子/收获果实
+        public static final String URL_GAME_ORDER_LIST = "app/v1/game/ddhy/list_order";//花园 订单列表
+        public static final String URL_GAME_WITHDRAW_LIST = "app/v1/game/ddhy/withdraw_list";//兑换列表
+        public static final String URL_GAME_DOWD = "app/v1/game/ddhy/do_wd";//兑换接口
     }
 }

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

@@ -28,6 +28,6 @@ object ADConfig{
   //    867 清理后激励视频广告位 after_cleaning_video
   //    868 Draw视频广告位 small_video_list_bigimage
   //=================================农场
-  val AD_REWARD_VIDIO = "common_video"//激励视频
-  val AD_IMG_FADE = "common_bigimage"//大图
+  val AD_REWARD_VIDIO = "video"//激励视频
+  val AD_IMG_FADE = "bigimage"//大图
 }
\ No newline at end of file