[提交人]：王雪伟

[提交简述] ：多多花园1.0.1
[实现方案] ：替换列表接口

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

@@ -49,9 +49,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
 
     @SuppressLint("CheckResult")
     override fun onCreate(savedInstanceState: Bundle?) {
-        StatusBarUtils.transportStatus(this, resources.getColor(R.color.transparent))
-        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT // 禁用横屏
-        window.addFlags(WindowManager.LayoutParams.FLAG_SECURE) //禁止截屏
         super.onCreate(savedInstanceState)
         EventUtils.onEvent("tab_imp", "多多花园")
         if (SettingPreference.getIsShowGuide()) {
@@ -582,6 +579,10 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
             })
     }
 
+    //看视频解锁地块
+    fun lookAdVideoUnLockLand(){
+        callUnity("Form_land", "lookAdVideoUnLockLandSuccess", "")
+    }
     //加速剂
     fun getUseAccelerators(callback: IUnitySendMessageCallback?, id: Int) {
         GameApiClient.gameApi.getUseAccelerators(id).compose(RxSchedulers.observableIO2Main())
@@ -999,6 +1000,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
         })
     }
     fun showCloudDialog(speedtime:Int,sppedtimes:Int){
+        Log.d("wxw","雲朵加速");
         MainLooper.get()?.post(Runnable {
            // CashExchangeDialog.showCashExchage(this, this)
             MainDialog.showDialogCloud(this,speedtime,sppedtimes, View.OnClickListener {

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

@@ -53,16 +53,16 @@ class BaseApplication : BaseApplication() {
     private var backToFrontTime: Long = 0
     override fun onCreate() {
         super.onCreate()
-        NetConfig.setBase_Url(NetConfig.Environment.PRODUCT)// TODO 上线之后提成成  NetConfig.Environment.PRODUCT
-        NetConfig.BASE_FEED_URL="https://fsapi.ihuomao.com/"
-        NetConfig.BASE_AD_URL="https://bs.ihuomao.com/"
-        NetConfig.URL_REPORT_BASE="http://report.ihuomao.com/"
+        NetConfig.setBase_Url(NetConfig.Environment.DEV)// TODO 上线之后提成成  NetConfig.Environment.PRODUCT
+//        NetConfig.BASE_FEED_URL="https://fsapi.ihuomao.com/"
+//        NetConfig.BASE_AD_URL="https://bs.ihuomao.com/"
+//        NetConfig.URL_REPORT_BASE="http://report.ihuomao.com/"
 
 
 
         //TODO 上线去掉测试地址
-        //     NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
-//        Constant.appLs = "afcbef40e31631d3"//appls
+             NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
+//        Constant.appLs = "b59e7d03c0f91730"//appls
         AdManager.init(this,"b59e7d03c0f91730")
         LogUtils.getConfig().logSwitch = true
         UMConfigure.setLogEnabled(true)

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

@@ -37,6 +37,24 @@ public class LandListEntity {
     private LandConfigList[] growList;
     private int fruitNum;//水果数量
     private int acceleratorsNum;//加速剂数量
+    private int targetVideoNum;//解锁需看视频数量
+    private int currentVideoNum;//当前已看视频数量
+
+    public int getTargetVideoNum() {
+        return targetVideoNum;
+    }
+
+    public void setTargetVideoNum(int targetVideoNum) {
+        this.targetVideoNum = targetVideoNum;
+    }
+
+    public int getCurrentVideoNum() {
+        return currentVideoNum;
+    }
+
+    public void setCurrentVideoNum(int currentVideoNum) {
+        this.currentVideoNum = currentVideoNum;
+    }
 
     public LandConfigList[] getGrowList() {
         return growList;

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

@@ -337,7 +337,7 @@ interface IGameApi {
      * @paramq
      * @return
      */
-    @GET(NetConfig.Game.URL_GAME_HOME_WD_LIST)
+    @GET(NetConfig.Game.URL_GAME_ORDER_LIST)
     fun getHomeWList(): Observable<Response<List<HomeListEntity>>>
 
     /**

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

@@ -227,7 +227,7 @@ public class NetConfig {
         public static final String URL_COLLECT_CARD_OPEN = "app/v1/collect-card/open";//开宝箱
         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_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_GAME_VIDEO_TASK_COMPLETE = "app/v1/game/video_task_complete";//看领金币视频任务